diff --git a/core/util.inc.php b/core/util.inc.php
index 30ab0863..f5cda1bc 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -118,8 +118,8 @@ function build_thumb_html($image, $query=null) {
 	$h_tip = html_escape($image->get_tooltip());
 	$h_thumb_link = $image->get_thumb_link();
 	$tsize = get_thumbnail_size($image->width, $image->height);
-	return "<a href='$h_view_link'><img title='$h_tip' alt='$h_tip'
-			width='{$tsize[0]}' height='{$tsize[1]}' src='$h_thumb_link' /></a>\n";
+	return "<a href='$h_view_link'><img title='$h_tip' alt='$h_tip' ".
+			"width='{$tsize[0]}' height='{$tsize[1]}' src='$h_thumb_link' /></a>";
 }
 
 
diff --git a/themes/danbooru/index.theme.php b/themes/danbooru/index.theme.php
index 05ca6e7e..15e0bbf2 100644
--- a/themes/danbooru/index.theme.php
+++ b/themes/danbooru/index.theme.php
@@ -47,5 +47,13 @@ class CustomIndexTheme extends IndexTheme {
 
 		return $h_search;
 	}
+
+	protected function build_table($images, $query) {
+		$table = "";
+		foreach($images as $image) {
+			$table .= "\t<span class=\"thumb\">" . build_thumb_html($image, $query) . "</span>\n";
+		}
+		return $table;
+	}
 }
 ?>
diff --git a/themes/danbooru/style.css b/themes/danbooru/style.css
index b44497fb..2813f706 100644
--- a/themes/danbooru/style.css
+++ b/themes/danbooru/style.css
@@ -122,26 +122,45 @@ A:hover {text-decoration: underline;}
 .withleft {
 	margin-left: 160px;
 }
+
+/*Shuugo: more danboorish*/
+div#paginator {
+	display: block;
+	padding: 2em 0 1em 0;
+	font-size: 1em;
+	text-align: center;
+	font-weight: bold;
+	clear: both;
+}
 .paginator {
 	margin: 16px;
 	text-align: center;
 }
-.paginator B {
+div#paginator B {
 	padding: 4px 8px 4px 8px;
 	margin: 3px;
 }
-.paginator A {
+div#paginator A {
 	padding: 4px 8px 4px 8px;
 	margin: 3px;
 	border: 1px solid #EEE;
 }
-.paginator A:hover {
+div#paginator A:hover {
 	border: 1px solid #EEE;
 	background: blue;
 	color: white;
 }
 
 
+span.thumb {
+	height: 220px;
+	width: 220px;
+	display: inline-block;
+	float: left;
+	text-align: center;
+	vertical-align: center;
+}
+
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php
index 3dc3b483..1f9860ab 100644
--- a/themes/danbooru/themelet.class.php
+++ b/themes/danbooru/themelet.class.php
@@ -55,7 +55,7 @@ class Themelet {
 		if(strlen($last_html) > 0) $ndots = "...";
 		else $ndots = "";
 
-		return "<p class='paginator'>$prev_html $first_html $pdots $pages_html $ndots $last_html $next_html</p>";
+		return "<div id='paginator'>$prev_html $first_html $pdots $pages_html $ndots $last_html $next_html</div>";
 	}
 }
 ?>