diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index 65c6df3a..7d35fbc6 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -111,9 +111,9 @@ class CommentListTheme extends Themelet {
 		$this->show_anon_id = false;
 		$html = "";
 		foreach($comments as $comment) {
-			$html .= $this->comment_to_html($comment, true);
+			$html .= $this->comment_to_html($comment, true)."<hr>";
 		}
-		$html .= "<p><a class='more' href='".make_link("comment/list")."'>Full List</a>";
+		$html .= "<a class='more' href='".make_link("comment/list")."'>Full List</a>";
 		$page->add_block(new Block("Comments", $html, "left"));
 	}
 
@@ -126,7 +126,7 @@ class CommentListTheme extends Themelet {
 		$this->show_anon_id = true;
 		$html = "";
 		foreach($comments as $comment) {
-			$html .= $this->comment_to_html($comment);
+			$html .= $this->comment_to_html($comment)."<hr>";
 		}
 		if($postbox) {
 			$html .= $this->build_postbox($image->id);
@@ -191,8 +191,10 @@ class CommentListTheme extends Themelet {
 
 		if($trim) {
 			return '
+			<div class="comment">
 				'.$h_userlink.': '.$h_comment.'
 				<a href="'.make_link('post/view/'.$i_image_id.'#c'.$i_comment_id).'">&gt;&gt;&gt;</a>
+			</div>
 			';
 		}
 		else {
diff --git a/themes/default/comment.theme.php b/themes/default/comment.theme.php
deleted file mode 100644
index 4c6f95dc..00000000
--- a/themes/default/comment.theme.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class CustomCommentListTheme extends CommentListTheme {
-	protected function comment_to_html($comment, $trim=false) {
-		return $this->rr(parent::comment_to_html($comment, $trim));
-	}
-
-	protected function build_postbox($image_id) {
-		return $this->rr(parent::build_postbox($image_id));
-	}
-
-	protected function rr($html) {
-		return "
-			<!-- cancel border -->
-			<div class='brr'>$html</div>
-		";
-	}
-}
-?>
diff --git a/themes/default/style.css b/themes/default/style.css
index e714dc1e..74a53e7a 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -25,11 +25,11 @@ SECTION>H3 {
 	background: #CCC;
 	border: 1px solid #BBB;
 }
-SECTION>.blockbody, .thumb {
+SECTION>.blockbody {
 	background: #DDD;
 	border: 1px solid #CCC;
 }
-SECTION>.blockbody, SECTION>H3, H1, FOOTER, .thumb {
+SECTION>.blockbody, H1, SECTION>H3, FOOTER{
 	margin: 8px;
 	padding: 8px;
 	border-radius: 12px; /* standard, webkit, opera */
@@ -161,10 +161,27 @@ ARTICLE TABLE {
 	margin-top: 32px;
 }
 
-.thumbblock {
-	width: 220px;
+.thumb {
+	width: 226px;
 	display: inline-block;
 	zoom: 1; /* ie6 */
 	*display: inline; /* ie6 */
 	text-align: center;
+	margin: 8px;
+}
+.thumb IMG {
+	border: 1px solid #CCC;
+	background: #DDD;
+	padding: 8px;
+	border-radius: 12px; /* standard, webkit, opera */
+	-moz-border-radius: 12px; /* mozilla haven't committed yet */
+	box-shadow: 2px 2px 6px rgba(0,0,0,0.6); /* standard, opera */
+	-webkit-box-shadow: 2px 2px 6px rgba(0,0,0,0.6); /* webkit haven't committed yet */
+	-moz-box-shadow: 2px 2px 6px rgba(0,0,0,0.6); /* mozilla haven't committed yet */
+}
+
+#Imagesmain .blockbody {
+	background: none;
+	border: none;
+	box-shadow: none;
 }
diff --git a/themes/default/themelet.class.php b/themes/default/themelet.class.php
index c4860c99..3e4ddfdd 100644
--- a/themes/default/themelet.class.php
+++ b/themes/default/themelet.class.php
@@ -59,16 +59,9 @@ class Themelet {
 		else{
 		$tsize = get_thumbnail_size($image->width, $image->height); }
 
-		return '
-			<!-- cancel border -->
-			<div class="thumbblock">
-			<div class="thumb">
-				<a href="'.$h_view_link.'" style="position: relative; display: block; height: '.$tsize[1].'px; width: '.$tsize[0].'px;">
-					<img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" src="'.$h_thumb_link.'">
-				</a>
-			</div>
-			</div>
-		';
+		return '<a href="'.$h_view_link.'" class="thumb">'.
+		       '<img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" src="'.$h_thumb_link.'">'.
+			   '</a>';
 	}