diff --git a/inc/config.php b/inc/config.php
index f11ee5f1..32308bd4 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -282,7 +282,8 @@
 		'file_url',
 		'json_response',
 		'user_flag',
-		'no_country'
+		'no_country',
+		'tag'
 	);
 
 	// Enable reCaptcha to make spam even harder. Rarely necessary.
@@ -735,6 +736,11 @@
 	$config['allowed_ext'][] = 'png';
 	// $config['allowed_ext'][] = 'svg';
 
+	// Allowed extensions for OP. Inherits from the above setting if set to false. Otherwise, it overrides both allowed_ext and
+	// allowed_ext_files (filetypes for downloadable files should be set in allowed_ext_files as well). This setting is useful
+	// for creating fileboards.
+	$config['allowed_ext_op'] = false;
+
 	// Allowed additional file extensions (not images; downloadable files).
 	// $config['allowed_ext_files'][] = 'txt';
 	// $config['allowed_ext_files'][] = 'zip';
@@ -1518,6 +1524,13 @@
 	// Allow OP to remove arbitrary posts in his thread
 	$config['user_moderation'] = false;
 
+	// File board. Like 4chan /f/
+	$config['file_board'] = false;
+
+	// Thread tags. Set to false to disable
+	// Example: array('A' => 'Chinese cartoons', 'M' => 'Music', 'P' => 'Pornography');
+	$config['allowed_tags'] = false;
+
 /*
  * ====================
  *  Public post search
diff --git a/inc/display.php b/inc/display.php
index 65525ab9..e7fb9320 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -453,7 +453,8 @@ class Thread {
 		
 		event('show-thread', $this);
 
-		$built = Element('post_thread.html', array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'hasnoko50' => $hasnoko50, 'isnoko50' => $isnoko50, 'mod' => $this->mod));
+		$file = ($index && $config['file_board']) ? 'post_thread_fileboard.html' : 'post_thread.html';
+		$built = Element($file, array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'hasnoko50' => $hasnoko50, 'isnoko50' => $isnoko50, 'mod' => $this->mod));
 		
 		return $built;
 	}
diff --git a/inc/functions.php b/inc/functions.php
index 5a52d602..aa91133f 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1358,6 +1358,10 @@ function index($page, $mod=false) {
 		$body .= $thread->build(true);
 	}
 
+	if ($config['file_board']) {
+		$body = Element('fileboard.html', array('body' => $body, 'mod' => $mod));
+	}
+
 	return array(
 		'board' => $board,
 		'body' => $body,
diff --git a/post.php b/post.php
index 2b903b1c..5081845f 100644
--- a/post.php
+++ b/post.php
@@ -312,7 +312,12 @@ if (isset($_POST['delete'])) {
 			$url_without_params = $post['file_url'];
 
 		$post['extension'] = strtolower(mb_substr($url_without_params, mb_strrpos($url_without_params, '.') + 1));
-		if (!in_array($post['extension'], $config['allowed_ext']) && !in_array($post['extension'], $config['allowed_ext_files']))
+
+		if ($post['op'] && $config['allowed_ext_op']) {
+			if (!in_array($post['extension'], $config['allowed_ext_op']))
+				error($config['error']['unknownext']);
+		}
+		else if (!in_array($post['extension'], $config['allowed_ext']) && !in_array($post['extension'], $config['allowed_ext_files']))
 			error($config['error']['unknownext']);
 
 		$post['file_tmp'] = tempnam($config['tmp'], 'url');
@@ -536,6 +541,10 @@ if (isset($_POST['delete'])) {
 		"\n<tinyboard flag alt>" . $flag_alt . "</tinyboard>";
 	}
 
+	if ($config['allowed_tags'] && $_POST['op'] && isset($_POST['tag']) && isset($config['allowed_tags'][$_POST['tag']])) {
+		$post['body'] .= "\n<tinyboard tag>" . $_POST['tag'] . "</tinyboard>";
+	}
+
         if ($config['proxy_save'] && isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		$proxy = preg_replace("/[^0-9a-fA-F.,: ]/", '', $_SERVER['HTTP_X_FORWARDED_FOR']);
 		$post['body'] .= "\n<tinyboard proxy>".$proxy."</tinyboard>";
@@ -565,7 +574,11 @@ if (isset($_POST['delete'])) {
 	if ($post['has_file']) {
 		$fnarray = array();
 		foreach ($post['files'] as $key => &$file) {
-			if (!in_array($file['extension'], $config['allowed_ext']) && !in_array($file['extension'], $config['allowed_ext_files']))
+			if ($post['op'] && $config['allowed_ext_op']) {
+				if (!in_array($file['extension'], $config['allowed_ext_op']))
+					error($config['error']['unknownext']);
+			}
+			elseif (!in_array($file['extension'], $config['allowed_ext']) && !in_array($file['extension'], $config['allowed_ext_files']))
 				error($config['error']['unknownext']);
 			
 			$file['is_an_image'] = !in_array($file['extension'], $config['allowed_ext_files']);
diff --git a/stylesheets/burichan.css b/stylesheets/burichan.css
index f1bbd8e6..6b1de235 100644
--- a/stylesheets/burichan.css
+++ b/stylesheets/burichan.css
@@ -36,7 +36,7 @@ div.banner {
 	font-weight: normal;
 }
 
-p.intro span.name {
+.intro span.name {
 	font-family: serif;
 	font-size: 12px;
 }
diff --git a/stylesheets/caffe.css b/stylesheets/caffe.css
index aee4d5ab..7ba7bd1c 100644
--- a/stylesheets/caffe.css
+++ b/stylesheets/caffe.css
@@ -353,7 +353,7 @@ width: 100%;
 #attention_bar:hover {
 background-color: rgba(88, 53, 41, 0.3);
 }
-p.intro a.email span.name {
+.intro a.email span.name {
 color: #8e6152;
 }
 a.post_no:hover {
diff --git a/stylesheets/confraria.css b/stylesheets/confraria.css
index 8769c6bb..3b60aaa6 100644
--- a/stylesheets/confraria.css
+++ b/stylesheets/confraria.css
@@ -55,11 +55,11 @@ form table tr th {
 	padding: 0px 5px;
 }
 
-p.intro span.name {
+.intro span.name {
 	color: #C5C8C6;
 }
 
-p.intro span.subject {
+.intro span.subject {
     color: #CC1105;
     font-weight: bold;
 }
@@ -90,11 +90,11 @@ div.post.reply.highlighted {
 	background: #4A4C4F;
 }
 
-p.intro a.email span.name {
+.intro a.email span.name {
 	color: rgb(129, 162, 190);
 }
 
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
 	color: rgb(95, 137, 172);
 }
 
diff --git a/stylesheets/dark.css b/stylesheets/dark.css
index beb12364..e21b264e 100644
--- a/stylesheets/dark.css
+++ b/stylesheets/dark.css
@@ -23,7 +23,7 @@ div.title, h1 {
 div.title p {
 	font-size: 10px;
 }
-a:link, a:visited, p.intro a.email span.name {
+a:link, a:visited, .intro a.email span.name {
 	color: #CCCCCC;
 	text-decoration: none;
 	font-family: sans-serif;
@@ -61,21 +61,21 @@ div.post.reply div.body a:link, div.post.reply div.body a:visited {
 div.post.reply div.body a:link:hover, div.post.reply div.body a:visited:hover {
 	color: #32DD72;
 }
-p.intro span.subject {
+.intro span.subject {
 	font-size: 12px;
 	font-family: sans-serif;
 	color: #446655;
 	font-weight: 800;
 }
-p.intro span.name {
+.intro span.name {
 	color: #32DD72;
 	font-weight: 800;
 }
-p.intro a.capcode, p.intro a.nametag {
+.intro a.capcode, p.intro a.nametag {
 	color: magenta;
 	margin-left: 0;
 }
-p.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.email:hover span.name {
+.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.email:hover span.name {
 	color: #32ddaf;
 }
 input[type="text"], textarea, select {
diff --git a/stylesheets/dark_roach.css b/stylesheets/dark_roach.css
index 7d123c6d..89e050d4 100644
--- a/stylesheets/dark_roach.css
+++ b/stylesheets/dark_roach.css
@@ -20,7 +20,7 @@ a, a:visited {
 	text-decoration: none;
 	color: #9999CC;
 }
-a:hover, p.intro a.post_no:hover {
+a:hover, .intro a.post_no:hover {
 	color: #996699
 }
 a.post_no {
@@ -28,19 +28,19 @@ a.post_no {
 	margin: 0;
 	padding: 0;
 }
-p.intro a.post_no {
+.intro a.post_no {
 	color: inherit;
 }
-p.intro a.post_no, p.intro a.email {
+.intro a.post_no, p.intro a.email {
 	margin: 0;
 }
-p.intro a.email span.name {
+.intro a.email span.name {
 	color: #666699;
 }
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
 	color: #663366;
 }
-p.intro label {
+.intro label {
 	display: inline;
 }
 h2 {
@@ -163,7 +163,7 @@ div.post.op {
 div.post.op hr {
 	border-color: #000000;
 }
-p.intro {
+.intro {
 	margin: 0.5em 0;
 	padding: 0;
 	padding-bottom: 0.2em;
@@ -172,19 +172,19 @@ input.delete {
 	float: left;
 	margin: 1px 6px 0 0;
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #336699;
 	font-weight: bold;
 }
-p.intro span.name {
+.intro span.name {
 	color: #336600;
 	font-weight: bold;
 }
-p.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
+.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
 	color: #CC0000;
 	margin-left: 0;
 }
-p.intro a {
+.intro a {
 	margin-left: 8px;
 }
 div.delete {
@@ -456,7 +456,7 @@ table.mod.config-editor input[type="text"] {
   background-color: #333333;
   opacity: 0.8;
 }
-p.intro.thread-hidden {
+.intro.thread-hidden {
 	margin: 0px;
 	padding: 0px;
 }
diff --git a/stylesheets/favela.css b/stylesheets/favela.css
index 6c9f6d58..52d24c76 100644
--- a/stylesheets/favela.css
+++ b/stylesheets/favela.css
@@ -46,7 +46,7 @@ form table tr th {
 	color: #FFF;
 }
 
-p.intro span.name {
+.intro span.name {
 	font-family: serif;
 }
 
@@ -81,7 +81,7 @@ div[id^="thread_"].highlighted {
 	background: #B5FFDD;
 }
 
-p.intro a.email span.name {
+.intro a.email span.name {
 	color: #345456;
 }
 
diff --git a/stylesheets/ferus.css b/stylesheets/ferus.css
index f84d86ca..2517d3b0 100644
--- a/stylesheets/ferus.css
+++ b/stylesheets/ferus.css
@@ -16,7 +16,7 @@ div.title, h1 {
 div.title p {
 	font-size: 13px;
 }
-a:link, a:visited, p.intro a.email span.name {
+a:link, a:visited, .intro a.email span.name {
 	color: #16C816;
 	text-decoration: underline;
 	font-family: monospace;
@@ -51,21 +51,21 @@ div.post.reply div.body a:link, div.post.reply div.body a:visited {
 div.post.reply div.body a:link:hover, div.post.reply div.body a:visited:hover {
 	color: #00FF00;
 }
-p.intro span.subject {
+.intro span.subject {
 	font-size: 12px;
 	font-family: monospace;
 	color: #446655;
 	font-weight: 800;
 }
-p.intro span.name {
+.intro span.name {
 	color: #008200;
 	font-weight: 900;
 }
-p.intro a.capcode, p.intro a.nametag {
+.intro a.capcode, p.intro a.nametag {
 	color: magenta;
 	margin-left: 0;
 }
-p.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.email:hover span.name {
+.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.email:hover span.name {
 	color: #00CC64;
 	font-family: monospace;
 }
diff --git a/stylesheets/futaba+vichan.css b/stylesheets/futaba+vichan.css
index f00dc9b7..16dff61b 100644
--- a/stylesheets/futaba+vichan.css
+++ b/stylesheets/futaba+vichan.css
@@ -15,7 +15,7 @@ div.title p {
 div.pages {
 	font-size: 13px !important;
 }
-a:link, a:visited, p.intro a.email span.name {
+a:link, a:visited, .intro a.email span.name {
 	color: #0000ff;
 	font-size: inherit;
 	text-decoration: inherit;
@@ -41,7 +41,7 @@ div.post.reply.highlighted {
 div.post.reply div.body a {
 	color: navy;
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #d00;
 }
 form table tr th {
diff --git a/stylesheets/futaba-light.css b/stylesheets/futaba-light.css
index fc67709f..19166adf 100644
--- a/stylesheets/futaba-light.css
+++ b/stylesheets/futaba-light.css
@@ -15,7 +15,7 @@ div.title p {
 div.pages {
 	font-size: 13px !important;
 }
-a:link, a:visited, p.intro a.email span.name {
+a:link, a:visited, .intro a.email span.name {
 	color: #A32615;
 	font-size: inherit;
 	text-decoration: inherit;
@@ -42,7 +42,7 @@ div.post.reply.highlighted {
 div.post.reply div.body a {
 	color: rgb(190, 79, 43);
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #AA4848;
 }
 form table tr th {
diff --git a/stylesheets/futaba.css b/stylesheets/futaba.css
index 02c38351..2b4fc1d2 100644
--- a/stylesheets/futaba.css
+++ b/stylesheets/futaba.css
@@ -10,7 +10,7 @@ div.title h1 {
 div.title p {
 	font-size: 10px;
 }
-a:link, a:visited, p.intro a.email span.name {
+a:link, a:visited, .intro a.email span.name {
 	color: #0000ff;
 }
 a:link:hover {
@@ -30,7 +30,7 @@ div.post.reply.highlighted {
 div.post.reply div.body a {
 	color: navy;
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #d00;
 }
 form table tr th {
diff --git a/stylesheets/gentoochan.css b/stylesheets/gentoochan.css
index b5075136..ae7ef2f3 100644
--- a/stylesheets/gentoochan.css
+++ b/stylesheets/gentoochan.css
@@ -2,7 +2,7 @@ body {
 	background: #0E0E0E url(data:image/gif;base64,R0lGODlhGAAMAKEEAOXl5ebm5vDw8PHx8SH+EUNyZWF0ZWQgd2l0aCBHSU1QACwAAAAAGAAMAAACRpQiY6cLa146MyY1EJQKjG81lNGRUPOIkgMJHtquBgIO7xwvpbrpduUSuXq8ntEC0bBEylYitdDAdM1ViaobkgKgZwyDLAAAOw==) repeat 0 0!important;
 	color: #000;
 }
-a:link, a:visited, p.intro a.email span.name {
+a:link, a:visited, .intro a.email span.name {
 	-webkit-transition: all ease-in 0.3s;
 	-moz-transition: all ease-in 0.3s;
 	color: rgba(0, 0, 0, 0.6);
@@ -33,7 +33,7 @@ div.post.reply.highlighted {
 div.post.reply p.body a {
 	color: navy;
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #000;
 }
 form table tr th {
diff --git a/stylesheets/jungle.css b/stylesheets/jungle.css
index 1765b3a9..86cb13b8 100644
--- a/stylesheets/jungle.css
+++ b/stylesheets/jungle.css
@@ -66,7 +66,7 @@ box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.35);
 div.post.reply div.body a {
 	color: #00E;
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #d00;
 }
 form table tr th {
@@ -118,7 +118,7 @@ table.modlog tr th {
 	background: #EA8;
 }
 
-p.intro span.name {
+.intro span.name {
 color: maroon;
 font-weight: 600;
 }
diff --git a/stylesheets/luna.css b/stylesheets/luna.css
index 7439f5ca..e2fd6528 100644
--- a/stylesheets/luna.css
+++ b/stylesheets/luna.css
@@ -22,7 +22,7 @@ a, a:selected {
 	text-decoration: bold;
 	color: #ffffff;
 }
-a:hover, p.intro a.post_no:hover {
+a:hover, .intro a.post_no:hover {
 	color: #ffffff;
 }
 a.post_no {
@@ -30,19 +30,19 @@ a.post_no {
 	margin: 0;
 	padding: 0;
 }
-p.intro a.post_no {
+.intro a.post_no {
 	color: inherit;
 }
-p.intro a.post_no, p.intro a.email {
+.intro a.post_no, p.intro a.email {
 	margin: 0;
 }
-p.intro a.email span.name {
+.intro a.email span.name {
 	color: #0091ff;
 }
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
 	color: #ffffff;
 }
-p.intro label {
+.intro label {
 	display: inline;
 }
 h2 {
@@ -165,7 +165,7 @@ div.post.op {
 div.post.op hr {
 	border-color: #040934;
 }
-p.intro {
+.intro {
 	margin: 0.5em 0;
 	padding: 0;
 	padding-bottom: 0.2em;
@@ -174,19 +174,19 @@ input.delete {
 	float: left;
 	margin: 1px 6px 0 0;
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #CCCCEE;
 	font-weight: bold;
 }
-p.intro span.name {
+.intro span.name {
 	color: #BBBBDD;
 	font-weight: bold;
 }
-p.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
+.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
 	color: #CCCCEE;
 	margin-left: 0;
 }
-p.intro a {
+.intro a {
 	margin-left: 8px;
 }
 div.delete {
diff --git a/stylesheets/miku.css b/stylesheets/miku.css
index 84e67933..7a8fb87e 100644
--- a/stylesheets/miku.css
+++ b/stylesheets/miku.css
@@ -19,11 +19,11 @@ a.post_no {
 	color: #000033;
 }
 
-p.intro a.email span.name {
+.intro a.email span.name {
 	color: #0093AB;
 }
 
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
 	color: #DD0000;
 }
 
@@ -43,12 +43,12 @@ div.post.op hr {
 	border-color: #B7C9D5;
 }
 
-p.intro span.subject {
+.intro span.subject {
 	color: #117743;
 	font-weight: 800;
 }
 
-p.intro span.name {
+.intro span.name {
 	color: #117743;
 	font-weight: 800;
 }
diff --git a/stylesheets/nigrachan.css b/stylesheets/nigrachan.css
index 6d0a94fa..28ab3eb3 100644
--- a/stylesheets/nigrachan.css
+++ b/stylesheets/nigrachan.css
@@ -52,7 +52,7 @@ input[type="text"], input[type="password"], textarea, input[type="submit"], inpu
 	border: 1px solid #202020;
 }
 
-p.intro span.name {
+.intro span.name {
 	font-size: 11pt;
 	color: #505050;
 	font-weight: bold;
@@ -88,16 +88,16 @@ div.post.reply.highlighted {
 	background: #111111;
 }
 
-p.intro a.email span.name {
+.intro a.email span.name {
 	color: #FFFFFF;
 }
 
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
 	color: #A0A0A0;
 	text-decoration: underline;
 }
 
-p.intro span.subject {
+.intro span.subject {
     color: #606060;
 }
 
diff --git a/stylesheets/notsuba.css b/stylesheets/notsuba.css
index ef9e1057..8ecb6b21 100644
--- a/stylesheets/notsuba.css
+++ b/stylesheets/notsuba.css
@@ -20,11 +20,11 @@ a.post_no {
 color: #000033;
 }
 
-p.intro a.email span.name {
+.intro a.email span.name {
 color: #608673;
 }
 
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
 color: #DD0000;
 }
 
@@ -44,12 +44,12 @@ div.post.op hr {
 border-color: #608673;
 }
 
-p.intro span.subject {
+.intro span.subject {
 color: #8a2e2e;
 font-weight: 800;
 }
 
-p.intro span.name {
+.intro span.name {
 color: #117743;
 font-weight: 800;
 }
diff --git a/stylesheets/novo_jungle.css b/stylesheets/novo_jungle.css
index 70501d0a..8c313723 100644
--- a/stylesheets/novo_jungle.css
+++ b/stylesheets/novo_jungle.css
@@ -65,7 +65,7 @@ form[name="postcontrols"] {
 	margin: 20px auto;
 }
 
-p.intro span.name {
+.intro span.name {
 	color: #800000;
 	font-weight: 800;
 }
@@ -104,11 +104,11 @@ div.post.reply.highlighted {
 	background-image: url('img/jungle_td_dark.png');;
 }
 
-p.intro a.email span.name {
+.intro a.email span.name {
 	color: #0000EE;
 }
 
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
 	color: #00990B;
 }
 
diff --git a/stylesheets/piwnichan.css b/stylesheets/piwnichan.css
index 2c1ea49a..7780226e 100644
--- a/stylesheets/piwnichan.css
+++ b/stylesheets/piwnichan.css
@@ -41,7 +41,7 @@ a.email span.name {
         color: #5A8C99 !important; 
 }
 
-p.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
+.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
 color: #6E0877;
 }
 
@@ -157,7 +157,7 @@ div.banner, .replymode, .catalogmode {
         font-weight:800;
 }
  
-p.intro span.subject {
+.intro span.subject {
 color: #4D2C80;
 font-weight: bold;
 }
diff --git a/stylesheets/ricechan.css b/stylesheets/ricechan.css
index 79b6d145..f01fc9bf 100644
--- a/stylesheets/ricechan.css
+++ b/stylesheets/ricechan.css
@@ -190,7 +190,7 @@ blockquote {
 .de-refmap {
 	color: #4C505E !important;
 }
-p.intro a.email span.name {
+.intro a.email span.name {
 	text-decoration: underline;
 }
 .quote {
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 80b124f8..5ae23cd6 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -13,7 +13,7 @@ a,a:visited {
   color: #34345C;
 }
 
-a:hover,p.intro a.post_no:hover {
+a:hover,.intro a.post_no:hover {
   color: #ff0000;
 }
 
@@ -23,27 +23,27 @@ a.post_no {
   padding: 0;
 }
 
-p.intro a.post_no {
+.intro a.post_no {
   color: inherit;
 }
 
-p.intro a.post_no,p.intro a.email,p.intro a.post_anchor {
+.intro a.post_no,p.intro a.email,p.intro a.post_anchor {
   margin: 0;
 }
 
-p.intro a.email span.name {
+.intro a.email span.name {
   color: #34345C;
 }
 
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
   color: #ff0000;
 }
 
-p.intro label {
+.intro label {
   display: inline;
 }
 
-p.intro time,p.intro a.ip-link,p.intro a.capcode {
+.intro time,p.intro a.ip-link,p.intro a.capcode {
   direction: ltr;
   unicode-bidi: embed;
 }
@@ -219,7 +219,7 @@ div.post.op hr {
   border-color: #D9BFB7;
 }
 
-p.intro {
+.intro {
   margin: 0.5em 0;
   padding: 0;
   padding-bottom: 0.2em;
@@ -230,22 +230,22 @@ input.delete {
   margin: 1px 6px 0 0;
 }
 
-p.intro span.subject {
+.intro span.subject {
   color: #0F0C5D;
   font-weight: bold;
 }
 
-p.intro span.name {
+.intro span.name {
   color: #117743;
   font-weight: bold;
 }
 
-p.intro span.capcode,p.intro a.capcode,p.intro a.nametag {
+.intro span.capcode,p.intro a.capcode,p.intro a.nametag {
   color: #F00000;
   margin-left: 0;
 }
 
-p.intro a {
+.intro a {
   margin-left: 8px;
 }
 
@@ -604,7 +604,7 @@ table.mod.config-editor input[type="text"] {
   background-color: rgba(100%,100%,100%,0.2);
 }
 
-p.intro.thread-hidden {
+.intro.thread-hidden {
   margin: 0;
   padding: 0;
 }
@@ -931,7 +931,7 @@ span.pln {
 
 
 @media screen and (min-width: 768px) {
-  p.intro {
+  .intro {
     clear: none;
   }
 
@@ -1051,3 +1051,12 @@ span.pln {
   margin-left: 10px;
   margin-right: 10px;
 }
+
+/* Fileboard */
+table.fileboard th, table.fileboard td {
+  padding: 2px;
+  text-align: center;
+}
+table.fileboard .intro a {
+  margin-left: 0px;
+}
diff --git a/stylesheets/szalet.css b/stylesheets/szalet.css
index e4deb8ee..77a216a6 100644
--- a/stylesheets/szalet.css
+++ b/stylesheets/szalet.css
@@ -20,7 +20,7 @@ background-repeat:  repeat;
 background-color: #200000;
 }
 
-p.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
+.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
 color: #26899C;
 }
 
@@ -154,7 +154,7 @@ div.banner, .replymode, .catalogmode {
         font-weight:800;
 }
  
-p.intro span.subject {
+.intro span.subject {
 color: #771018;
 font-weight: bold;
 }
diff --git a/stylesheets/terminal2.css b/stylesheets/terminal2.css
index f7463553..a951bc16 100644
--- a/stylesheets/terminal2.css
+++ b/stylesheets/terminal2.css
@@ -16,7 +16,7 @@ div.title, h1 {
 div.title p {
 	font-size: 10px;
 }
-a:link, a:visited, p.intro a.email span.name {
+a:link, a:visited, .intro a.email span.name {
 	color: #00FF00;
 	text-decoration: underline;
 	font-family: sans-serif;
@@ -50,21 +50,21 @@ div.post.reply div.body a:link, div.post.reply div.body a:visited {
 div.post.reply div.body a:link:hover, div.post.reply div.body a:visited:hover {
 	color: #00FF00;
 }
-p.intro span.subject {
+.intro span.subject {
 	font-size: 12px;
 	font-family: sans-serif;
 	color: #446655;
 	font-weight: 800;
 }
-p.intro span.name {
+.intro span.name {
 	color: #00FF00;
 	font-weight: 800;
 }
-p.intro a.capcode, p.intro a.nametag {
+.intro a.capcode, p.intro a.nametag {
 	color: #00FF00;
 	margin-left: 0;
 }
-p.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.email:hover span.name {
+.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.email:hover span.name {
 	color: #00FF00;
 }
 input[type="text"], textarea, select {
diff --git a/stylesheets/testorange.css b/stylesheets/testorange.css
index cd2161b6..44ebd697 100644
--- a/stylesheets/testorange.css
+++ b/stylesheets/testorange.css
@@ -202,7 +202,7 @@ div.boardlist.bottom {
   background-color: rgba(0%, 0%, 0%, 0.45);
 }
 
-p.intro span.subject {
+.intro span.subject {
     color:#ee8100;
 }
 
diff --git a/stylesheets/v8ch.css b/stylesheets/v8ch.css
index bd8e68ab..eafed531 100644
--- a/stylesheets/v8ch.css
+++ b/stylesheets/v8ch.css
@@ -136,7 +136,7 @@ form table tr th{
   background: #fec !important;
 }
  
-p.intro.thread-hidden{
+.intro.thread-hidden{
   padding-bottom: 1em !important;
 }
  
diff --git a/stylesheets/wasabi.css b/stylesheets/wasabi.css
index f898d731..87a81bdd 100644
--- a/stylesheets/wasabi.css
+++ b/stylesheets/wasabi.css
@@ -27,16 +27,16 @@ a.post_no {
 	margin: 0;
 	padding: 0;
 }
-p.intro a.post_no, p.intro a.email {
+.intro a.post_no, p.intro a.email {
 	margin: 0;
 }
-p.intro a.email span.name {
+.intro a.email span.name {
 	color: #34345C;
 }
-p.intro a.email:hover span.name {
+.intro a.email:hover span.name {
 	color: #ff0000;
 }
-p.intro label {
+.intro label {
 	display: inline;
 }
 h2 {
@@ -155,7 +155,7 @@ div.post.op {
 div.post.op hr {
 	border-color: #D9BFB7;
 }
-p.intro {
+.intro {
 	margin: 0.5em 0;
 	padding: 0;
 	padding-bottom: 0.2em;
@@ -164,19 +164,19 @@ input.delete {
 	float: left;
 	margin: 1px 6px 0 0;
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #0F0C5D;
 	font-weight: bold;
 }
-p.intro span.name {
+.intro span.name {
 	color: #117743;
 	font-weight: bold;
 }
-p.intro a.capcode, p.intro a.nametag {
+.intro a.capcode, p.intro a.nametag {
 	color: #F00000;
 	margin-left: 0;
 }
-p.intro a {
+.intro a {
 	margin-left: 8px;
 }
 div.delete {
diff --git a/stylesheets/yotsuba.css b/stylesheets/yotsuba.css
index 8997b696..5324d1a7 100644
--- a/stylesheets/yotsuba.css
+++ b/stylesheets/yotsuba.css
@@ -2,7 +2,7 @@ body {
 	background: #ffe url('img/fade-yotsuba.png') repeat-x 50% 0%;
 	color: #800000;
 }
-a:link, a:visited, p.intro a.email span.name {
+a:link, a:visited, .intro a.email span.name {
 	color: #0000ff;
 }
 a:link:hover {
@@ -22,7 +22,7 @@ div.post.reply.highlighted {
 div.post.reply div.body a {
 	color: navy;
 }
-p.intro span.subject {
+.intro span.subject {
 	color: #d00;
 }
 form table tr th {
diff --git a/templates/fileboard.html b/templates/fileboard.html
new file mode 100644
index 00000000..a970cecb
--- /dev/null
+++ b/templates/fileboard.html
@@ -0,0 +1,15 @@
+<table class='fileboard'>
+  <tr>
+    <th>&nbsp; <!-- checkbox -->
+    <th>{% trans %}No.{% endtrans %}
+    <th>{% trans %}Name{% endtrans %}
+    <th>{% trans %}File{% endtrans %}
+    <th>{% trans %}Tag{% endtrans %}
+    <th>{% trans %}Subject{% endtrans %}
+    <th>{% trans %}Size{% endtrans %}
+    <th>{% trans %}Date{% endtrans %}
+    <th>{% trans %}Replies{% endtrans %}
+    <th>&nbsp; <!-- reply -->
+  </tr>
+  {{ body }}
+</table>
diff --git a/templates/post_form.html b/templates/post_form.html
index d2e644b3..ea3ac765 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -92,6 +92,18 @@
 				</td>
 			</tr>
 		{% endif %}
+		{% if config.allowed_tags and not id %}
+			<tr>
+				<th>{% trans %}Tag{% endtrans %}</th>
+				<td>
+					<select name="tag">
+						{% for id, tag in config.allowed_tags %}
+							<option value="{{ id }}">{{ tag }}</option>
+						{% endfor %}
+					</select>
+				</td>
+			</tr>
+		{% endif %}
 		<tr id="upload">
 			<th>
 				{% trans %}File{% endtrans %}
diff --git a/templates/post_thread_fileboard.html b/templates/post_thread_fileboard.html
new file mode 100644
index 00000000..983bfe17
--- /dev/null
+++ b/templates/post_thread_fileboard.html
@@ -0,0 +1,42 @@
+{% filter remove_whitespace %}
+{# tabs and new lines will be ignored #}
+
+{# we are intentionally breaking the thread_ID convention: the jses need to handle this case differently #}
+<tr id="filethread_{{ post.id }}" class="intro" data-board="{{ board.uri }}">
+
+<td><input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
+<td><a class="post_no" onclick="citeReply({{ post.id }})" href="{{ post.link('q') }}">{{ post.id }}</a>
+<td>{% include 'post/name.html' %}
+    {% include 'post/flag.html' %}
+<td>[<a href="{{ config.uri_img }}{{ post.files[0].file }}">{{ post.files[0].filename|e|bidi_cleanup }}</a>]
+<td>{% if post.modifiers['tag'] %}[{{ post.modifiers['tag'] }}]{% endif %}
+<td>{% include 'post/subject.html' %}
+	{% if post.sticky %}
+		{% if config.font_awesome %}
+			<i class="fa fa-thumb-tack"></i>
+		{% else %}
+			<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
+		{% endif %}
+	{% endif %}
+	{% if post.locked %}
+		{% if config.font_awesome %}
+			<i class="fa fa-lock"></i>
+		{% else %}
+			<img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
+		{% endif %}
+	{% endif %}
+	{% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
+		{% if config.font_awesome %}
+			<i class="fa fa-anchor"></i>
+		{% else %}
+			<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
+		{% endif %}
+	{% endif %}
+<td>{{ post.files[0].size|filesize }}
+<td>{% include 'post/time.html' %}
+<td>{{ post.omitted }}
+<td>{% include 'post/post_controls.html' %}
+    <a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post) }}">[{% trans %}Reply{% endtrans %}]</a>
+
+</tr>
+{% endfilter %}