diff --git a/themes/danbooru/default.php b/themes/danbooru/default.php
new file mode 100644
index 00000000..993455ee
--- /dev/null
+++ b/themes/danbooru/default.php
@@ -0,0 +1,177 @@
+<?php
+/**
+* Name: Danbooru Theme
+* Author: Bzchan <bzchan@animemahou.com>
+* Link: http://trac.shishnet.org/shimmie2/
+* License: GPLv2
+* Description: This is a simple theme changing the css to make shimme
+*              look more like danbooru as well as adding a custom links
+*              bar and title to the top of every page.
+*/
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+Danbooru Theme - Notes (Bzchan)
+
+Files: default.php, sidebar.js, style.css
+
+How to use a theme
+- Copy the danbooru folder with all its contained files into the "themes"
+  directory in your shimmie installation.
+- Log into your shimmie and change the Theme in the Board Config to your
+  desired theme.
+
+Changes in this theme include
+- Adding and editing various elements in the style.css file.
+- $site_name and $front_name retreival from config added.
+- $custom_link and $title_link preparation just before html is outputed.
+- Altered outputed html to include the custom links and removed heading
+  from being displayed (subheading is still displayed) 
+- Note that only the sidebar has been left aligned. Could not properly
+  left align the main block because blocks without headers currently do
+  not have ids on there div elements. (this was a problem because
+  paginator block must be centered and everything else left aligned)
+  
+Tips
+- You can change custom links to point to whatever pages you want as well as adding
+  more custom links.
+- The main title link points to the Front Page set in your Board Config options.
+- The text of the main title is the Title set in your Board Config options.
+- Themes make no changes to your database or main code files so you can switch
+  back and forward to other themes all you like.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+global $config;
+$theme_name = $config->get_string('theme');
+$base_href = $config->get_string('base_href');
+$data_href = $config->get_string('data_href');
+$contact_link = $config->get_string('contact_link');
+
+function block_to_html($block, $hidable=false) {
+	$h = $block->header;
+	$b = $block->body;
+	$html = "";
+	if($hidable) {
+		$i = str_replace(' ', '_', $h);
+		if(!is_null($h)) $html .= "\n<h3 id='$i-toggle' onclick=\"toggle('$i')\">$h</h3>\n";
+		if(!is_null($b)) $html .= "<div id='$i'>$b</div>\n";
+	}
+	else {
+		$i = str_replace(' ', '_', $h);
+		if(!is_null($h)) $html .= "\n<h3>$h</h3>\n";
+		if(!is_null($b)) $html .= "<div>$b</div>\n"; 
+	}
+	return $html;
+}
+
+$header_html = "";
+foreach($this->headers as $line) {
+	$header_html .= "\t\t$line\n";
+}
+
+$sideblock_html = "";
+foreach($this->sideblocks as $block) {
+	$sideblock_html .= block_to_html($block, true);
+}
+
+$mainblock_html = "";
+foreach($this->mainblocks as $block) {
+	$mainblock_html .= block_to_html($block, false);
+}
+
+$scripts = glob("scripts/*.js");
+$script_html = "";
+foreach($scripts as $script) {
+	$script_html .= "\t\t<script src='$data_href/$script' type='text/javascript'></script>\n";
+}
+
+if($config->get_bool('debug_enabled')) {
+	if(function_exists('memory_get_usage')) {
+		$i_mem = sprintf("%5.2f", ((memory_get_usage()+512)/1024)/1024);
+	}
+	else {
+		$i_mem = "???";
+	}
+	if(function_exists('getrusage')) {
+		$ru = getrusage();
+		$i_utime = sprintf("%5.2f", ($ru["ru_utime.tv_sec"]*1e6+$ru["ru_utime.tv_usec"])/1000000);
+		$i_stime = sprintf("%5.2f", ($ru["ru_stime.tv_sec"]*1e6+$ru["ru_stime.tv_usec"])/1000000);
+	}
+	else {
+		$i_utime = "???";
+		$i_stime = "???";
+	}
+	$i_files = count(get_included_files());
+	global $_execs;
+	$debug = "<br>Took $i_utime + $i_stime seconds and {$i_mem}MB of RAM";
+	$debug .= "; Used $i_files files and $_execs queries";
+}
+else {
+	$debug = "";
+}
+
+global $config;
+$version = $config->get_string('version');
+
+$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
+
+if(empty($this->subheading)) {
+	$subheading = "";
+}
+else {
+	$subheading = "<div id='subtitle'>{$this->subheading}</div>";
+}
+
+$site_name = $config->get_string('title'); // bzchan: change from normal default to get title for top of page
+$front_page = $config->get_string('front_page'); // bzchan: change from normal default to get front page for top of page
+
+// bzchan: CUSTOM LINKS are prepared here, change these to whatever you like
+$custom_links = "";
+$custom_links .= "<li><a href='".make_link('user')."'>My Account</a></li>";
+$custom_links .= "<li><a href='".make_link('index')."'>Posts</a></li>";
+$custom_links .= "<li><a href='".make_link('comment/list')."'>Comments</a></li>";
+$custom_links .= "<li><a href='".make_link('tags')."'>Tags</a></li>";
+
+
+// bzchan: failed attempt to add heading after title_link (failure was it looked bad)
+//if($this->heading==$site_name)$this->heading = '';
+//$title_link = "<h1><a href='".make_link($front_page)."'>$site_name</a>/$this->heading</h1>";
+
+// bzchan: prepare main title link
+$title_link = "<h1><a href='".make_link($front_page)."'>$site_name</a></h1>";
+
+print <<<EOD
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+	<head>
+		<title>{$this->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>
+$script_html
+	</head>
+
+	<body>
+		<div id="header">
+		$title_link
+		<ul class="flat-list">
+			$custom_links
+		</ul>
+		</div>
+		$subheading
+		
+		<div id="nav">$sideblock_html</div>
+		<div id="body">$mainblock_html</div>
+
+		<div id="footer">
+			<hr>
+			Images &copy; their respective owners,
+			<a href="http://trac.shishnet.org/shimmie2/">$version</a> &copy; 
+			<a href="http://www.shishnet.org/">Shish</a> 2007,
+			based on the <a href="http://trac.shishnet.org/shimmie2/wiki/DanbooruRipoff">Danbooru</a> concept.
+			$debug
+			$contact
+		</div>
+	</body>
+</html>
+EOD;
+?>
diff --git a/themes/danbooru/sidebar.js b/themes/danbooru/sidebar.js
new file mode 100644
index 00000000..585f8ca8
--- /dev/null
+++ b/themes/danbooru/sidebar.js
@@ -0,0 +1,83 @@
+/*
+ * This script shamelessly stolen from wakachan.org d(^_^)b
+ */
+
+var cookie_name="shimmie_sidebar";
+var default_sections=["upload", "edit_tags"];
+
+function toggle(id) 
+{
+	var e=document.getElementById(id);
+	if(!e) return;
+	if(e.style.display)
+	{
+		remove_section(id);
+		e.style.display="";
+
+		var e2 = document.getElementById(id+"-toggle");
+		if(e2) {
+			e2.style.color = "#000";
+		}
+	}
+	else
+	{
+		add_section(id);
+		e.style.display="none"; 
+		
+		var e2 = document.getElementById(id+"-toggle");
+		if(e2) {
+			e2.style.color = "#AAA";
+		}
+	}
+}
+
+function add_section(id)
+{
+	var sections=get_sections();
+	for(var i=0;i<sections.length;i++) if(sections[i]==id) return;
+	sections.push(id);
+	set_sections(sections);	
+}
+
+function remove_section(id)
+{
+	var sections=get_sections();
+	var new_sections=new Array();
+	for(var i=0;i<sections.length;i++) if(sections[i]!=id) new_sections.push(sections[i]);
+	set_sections(new_sections);	
+}
+
+function get_sections()
+{
+	var cookie=get_cookie(cookie_name);
+	if(cookie) return cookie.split(/,/);
+	else return default_sections;
+}
+
+function set_sections(sections) { set_cookie(cookie_name,sections.join(","),365); }
+
+function get_cookie(name)
+{
+	with(document.cookie)
+	{
+		var index=indexOf(name+"=");
+		if(index==-1) return '';
+		index=indexOf("=",index)+1;
+		var endstr=indexOf(";",index);
+		if(endstr==-1) endstr=length;
+		return unescape(substring(index,endstr));
+	}
+};
+
+function set_cookie(name,value,days)
+{
+	if(days)
+	{
+		var date=new Date();
+		date.setTime(date.getTime()+(days*24*60*60*1000));
+		var expires="; expires="+date.toGMTString();
+	}
+	else expires="";
+	document.cookie=name+"="+value+expires+"; path=/";
+}
+
diff --git a/themes/danbooru/style.css b/themes/danbooru/style.css
new file mode 100644
index 00000000..83e07afa
--- /dev/null
+++ b/themes/danbooru/style.css
@@ -0,0 +1,224 @@
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*                  things common to all pages                    *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* bzchan: BODY tags font changed, margin set */
+BODY {
+	background-color:#FFFFFF;
+	font: 80% verdana, sans-serif;
+	padding: 1em 3em;
+	text-align:center;
+}
+
+/* bzchan: All H* tags tweaked */
+H1, H3 {
+	
+	text-align: center;
+}
+H1 {
+	font-size: 2em;
+	margin-top: 0px;
+	margin-bottom: 0px;
+	padding: 2px;
+}
+H1 A {
+	color: black;
+}
+H3 {
+	font-size: 1.2em;
+	margin-top: 0.5em;
+	margin-bottom: 0px;
+	padding: 1px;	
+}
+h4 {
+	font-size: 1.4em;
+}
+h5 {
+	font-size: 1.2em;
+}
+
+THEAD {
+	background: #DEDEDE;
+	font-weight: bold;
+}
+TD {
+	vertical-align: top;
+	text-align: center;
+}
+/* bzchan: subtitle black border removed */
+#subtitle {
+	width: 256px;
+	font-size: 0.75em;
+	margin: auto;
+	text-align: center;
+	border-top: none;
+}
+#body SELECT {width: 150px;}
+/*
+TD INPUT {width: 100%;}
+TD SELECT {width: 100%;}
+*/
+
+#footer {
+	clear: both;
+	padding-top: 8px;
+	font-size: 0.7em;
+	text-align: center;
+}
+
+*[onclick] {cursor: pointer;}
+IMG {border: none;}
+FORM {margin: 0px;}
+A {text-decoration: none;}
+A:hover {text-decoration: underline;}
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*             the navigation bar, and all it's blocks            *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* bzchan: nav made to be left blocked */
+#nav {
+	width: 150px;
+	float: left;
+	text-align:left;
+
+}
+#nav TABLE {
+	width: 150px;
+}
+#nav TD {
+	vertical-align: middle;
+}
+#nav INPUT {
+	width: 100%;
+	padding: 0px;
+}
+#nav SELECT {
+	width: 100%;
+	padding: 0px;
+}
+/* bzchan: nav H3 made to be left blocked */
+#nav H3 {
+	text-align: left;
+}
+
+#comments P {
+	text-align: left;
+	width: 150px;
+	max-width: 150px;
+	overflow: hidden;
+}
+
+.more:after {
+	content: " >>>";
+}
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*                 the main part of each page                     *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#body {
+	margin-left: 160px;
+	text-align: center;
+}
+#body TABLE {
+	width: 90%;
+	margin: auto;
+}
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*                     specific page types                        *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#pagelist {
+	margin-top: 32px;
+}
+
+#tagmap A {
+	padding: 8px 4px 8px 4px;
+}
+
+#image_comments {
+	text-align: left;
+}
+
+.setupblock {
+	border: 1px solid #AAA;
+	padding: 8px;
+	margin: 16px;
+	width: 350px;
+}
+
+.helpable {
+	border-bottom: 1px dashed gray;
+}
+
+.ok {
+	background: #AFA;
+}
+.bad {
+	background: #FAA;
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*                     bzchan added                               *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+div#header {text-align: left;}
+div#header H1{text-align: left;}
+
+* {
+	font-family: verdana,sans-serif;
+	margin: 0;
+	padding: 0;
+}
+
+a:link {
+	color: #006FFA;
+	text-decoration: none;
+}
+
+a:visited {
+	color: #006FFA;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #33CFFF;
+	text-decoration: none;
+}
+
+a:active {
+	color: #006FFA;
+	text-decoration: none;
+}
+
+ul.flat-list {
+	display: inline;
+	margin:0 0 0 0;
+	padding:0 0 0 0;
+}
+
+ul.flat-list * {
+	display: inline;
+	text-align:left;
+}
+
+ul.flat-list li {
+    text-align:left;
+	list-style-type: none;
+	font-weight: bold;
+	margin: 0 1em 0 0;
+}
+
+ul.flat-list li a {
+	font-weight: normal;
+}
+
+