diff --git a/themes/danbooru/default.php b/themes/danbooru/layout.class.php
similarity index 94%
rename from themes/danbooru/default.php
rename to themes/danbooru/layout.class.php
index ba925df5..7ae05a60 100644
--- a/themes/danbooru/default.php
+++ b/themes/danbooru/layout.class.php
@@ -59,12 +59,17 @@ class Layout {
 		$left_block_html = "";
 		$main_block_html = "";
 
+		$firstmain = true;
 		foreach($page->blocks as $block) {
 			switch($block->section) {
 				case "left":
 					$left_block_html .= $this->block_to_html($block, true);
 					break;
 				case "main":
+					if($firstmain) {
+						$firstmain = false;
+						$block->header = "&nbsp;";
+					}
 					$main_block_html .= $this->block_to_html($block, false);
 					break;
 				default:
@@ -106,7 +111,7 @@ class Layout {
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
 	<head>
-		<title>{$this->title}</title>
+		<title>{$page->title}</title>
 		<link rel="stylesheet" href="$data_href/themes/$theme_name/style.css" type="text/css">
 $header_html
 		<script src='$data_href/themes/$theme_name/sidebar.js' type='text/javascript'></script>
diff --git a/themes/danbooru/page.class.php b/themes/danbooru/page.class.php
new file mode 100644
index 00000000..07d2fc45
--- /dev/null
+++ b/themes/danbooru/page.class.php
@@ -0,0 +1,6 @@
+<?php
+
+class Page extends GenericPage {
+	// no changes from default
+}
+?>
diff --git a/themes/danbooru/style.css b/themes/danbooru/style.css
index 83e07afa..586bcd17 100644
--- a/themes/danbooru/style.css
+++ b/themes/danbooru/style.css
@@ -111,8 +111,11 @@ A:hover {text-decoration: underline;}
 	overflow: hidden;
 }
 
-.more:after {
-	content: " >>>";
+.tag_count {
+	color: #AAA;
+}
+.more {
+	content: "More ť";
 }
 
 
@@ -214,7 +217,7 @@ ul.flat-list li {
     text-align:left;
 	list-style-type: none;
 	font-weight: bold;
-	margin: 0 1em 0 0;
+	margin: 0 1.3em 0 0;
 }
 
 ul.flat-list li a {
diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php
new file mode 100644
index 00000000..f01e4c5f
--- /dev/null
+++ b/themes/danbooru/themelet.class.php
@@ -0,0 +1,11 @@
+<?php
+
+class Themelet {
+	public function display_error($page, $title, $message) {
+		$page->set_title($title);
+		$page->set_heading($title);
+		$page->add_side_block(new NavBlock());
+		$page->add_main_block(new Block("Error", $message));
+	}
+}
+?>
