diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php
index 523bdb22..a1d27860 100644
--- a/themes/futaba/layout.class.php
+++ b/themes/futaba/layout.class.php
@@ -75,6 +75,7 @@ $header_html
 			<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.
+			<br>Futaba theme based on 4chan's layout and CSS :3
 			$debug
 			$contact
 		</div>
diff --git a/themes/futaba/style.css b/themes/futaba/style.css
index 62557e34..0c7e14c9 100644
--- a/themes/futaba/style.css
+++ b/themes/futaba/style.css
@@ -17,6 +17,9 @@ BODY {
 H1 {
 	text-align: center;
 }
+#subtitle {
+	display: none;
+}
 
 #footer {
 	clear: both;
@@ -72,7 +75,7 @@ HR {border: none; border-top: 1px solid #D9BFB7; height: 0px; clear: both;}
 	background: #FFFFEE;
 	border-width: 0px;
 }
-.reply {
+.reply, .paginator {
 	margin-bottom: 2px;
 	font-size: 10pt;
 	padding: 0px 5px;
diff --git a/themes/futaba/themelet.class.php b/themes/futaba/themelet.class.php
index db77cfa0..009d8324 100644
--- a/themes/futaba/themelet.class.php
+++ b/themes/futaba/themelet.class.php
@@ -38,7 +38,7 @@ class Themelet {
 
 	private function gen_page_link($base_url, $query, $page, $name) {
 		$link = make_link("$base_url/$page", $query);
-	    return "<a href='$link'>$name</a>";
+	    return "[<a href='$link'>$name</a>]";
 	}
 	
 	private function gen_page_link_block($base_url, $query, $page, $current_page, $name) {
@@ -70,10 +70,11 @@ class Themelet {
 		foreach(range($start, $end) as $i) {
 			$pages[] = $this->gen_page_link_block($base_url, $query, $i, $current_page, $i);
 		}
-		$pages_html = implode(" | ", $pages);
+		$pages_html = implode(" ", $pages);
 
-		return "<p class='paginator'>$first_html | $prev_html | $random_html | $next_html | $last_html".
-				"<br>&lt;&lt; $pages_html &gt;&gt;</p>";
+		//return "<p class='paginator'>$first_html | $prev_html | $random_html | $next_html | $last_html".
+		//		"<br>&lt;&lt; $pages_html &gt;&gt;</p>";
+		return "<p class='paginator'>$prev_html $pages_html $next_html";
 	}
 }
 ?>
diff --git a/themes/futaba/view.theme.php b/themes/futaba/view.theme.php
new file mode 100644
index 00000000..bed8feab
--- /dev/null
+++ b/themes/futaba/view.theme.php
@@ -0,0 +1,22 @@
+<?php
+
+class CustomViewTheme extends ViewTheme {
+	public function display_page($page, $image, $editor_parts) {
+		$page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list()));
+		$page->set_heading(html_escape($image->get_tag_list()));
+		$page->add_block(new Block("Navigation", $this->build_navigation($image->id), "left", 0));
+		$page->add_block(new Block(null, $this->build_info($image, $editor_parts), "main", 10));
+	}
+	
+	protected function build_navigation($image_id) {
+		$h_search = "
+			<p><form action='".make_link()."' method='GET'>
+				<input id='search_input' name='search' type='text'
+						value='Search' autocomplete='off'>
+				<input type='submit' value='Find' style='display: none;'>
+			</form>
+			<div id='search_completions'></div>";
+		return $h_search;
+	}
+}
+?>