diff --git a/core/basethemelet.class.php b/core/basethemelet.class.php
index 83632d08..27b5d818 100644
--- a/core/basethemelet.class.php
+++ b/core/basethemelet.class.php
@@ -44,7 +44,6 @@ class BaseThemelet {
 		$h_thumb_link = $image->get_thumb_link();
 		$h_tip = html_escape($image->get_tooltip());
 		$h_tags = strtolower($image->get_tag_list());
-		$base = get_base_href();
 		$ext = strtolower($image->ext);
 		
 		// If the file doesn't support thumbnail generation, show it at max size.
@@ -55,7 +54,13 @@ class BaseThemelet {
 			$tsize = get_thumbnail_size($image->width, $image->height);
 		}
 
-		return "<a href='$h_view_link' class='thumb shm-thumb shm-thumb-link' data-tags='$h_tags' data-post-id='$i_id'>".
+		$custom_classes = "";
+		if(class_exists("Relationships")){
+			if($image->parent_id !== NULL){	$custom_classes .= "shm-thumb-has_parent ";	}
+			if($image->has_children == TRUE){ $custom_classes .= "shm-thumb-has_child "; }
+		}
+
+		return "<a href='$h_view_link' class='thumb shm-thumb shm-thumb-link {$custom_classes}' data-tags='$h_tags' data-post-id='$i_id'>".
 		       "<img id='thumb_$i_id' title='$h_tip' alt='$h_tip' height='{$tsize[1]}' width='{$tsize[0]}' src='$h_thumb_link'>".
 			   "</a>\n";
 	}
diff --git a/ext/relatationships/style.css b/ext/relatationships/style.css
new file mode 100644
index 00000000..cb7e5633
--- /dev/null
+++ b/ext/relatationships/style.css
@@ -0,0 +1,15 @@
+.thumb IMG {
+	border-width: 2px !important;
+}
+
+.shm-thumb-has_child img {
+	border-color: lime !important;
+}
+
+.shm-thumb-has_parent img {
+	border-color: #cc0 !important;
+}
+
+.shm-thumb-has_child.shm-thumb-has_parent img {
+	border-color: lime #cc0 #cc0 lime !important;
+}
diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php
index db9b4116..3fbbb24f 100644
--- a/themes/danbooru/themelet.class.php
+++ b/themes/danbooru/themelet.class.php
@@ -1,26 +1,5 @@
 <?php
 class Themelet extends BaseThemelet {
-	public function build_thumb_html(Image $image) {
-		global $config;
-		$h_view_link = make_link("post/view/{$image->id}");
-		$h_thumb_link = $image->get_thumb_link();
-		$h_tip = html_escape($image->get_tooltip());
-		$i_id = int_escape($image->id);
-		$h_tags = strtolower($image->get_tag_list());
-
-		// If file is flash or svg then sets thumbnail to max size.
-		if($image->ext == 'swf' || $image->ext == 'svg') {
-			$tsize = get_thumbnail_size($config->get_int('thumb_width'), $config->get_int('thumb_height'));
-		}
-		else{
-			$tsize = get_thumbnail_size($image->width, $image->height);
-		}
-
-		return "<a href='$h_view_link' class='shm-thumb shm-thumb-link' data-tags='$h_tags' data-post-id='$i_id'><img title='$h_tip' alt='$h_tip' ".
-				"width='{$tsize[0]}' height='{$tsize[1]}' src='$h_thumb_link' /></a>";
-	}
-
-
 	public function display_paginator(Page $page, $base, $query, $page_number, $total_pages) {
 		if($total_pages == 0) $total_pages = 1;
 		$body = $this->build_paginator($page_number, $total_pages, $base, $query);
diff --git a/themes/danbooru2/themelet.class.php b/themes/danbooru2/themelet.class.php
index db9b4116..3fbbb24f 100644
--- a/themes/danbooru2/themelet.class.php
+++ b/themes/danbooru2/themelet.class.php
@@ -1,26 +1,5 @@
 <?php
 class Themelet extends BaseThemelet {
-	public function build_thumb_html(Image $image) {
-		global $config;
-		$h_view_link = make_link("post/view/{$image->id}");
-		$h_thumb_link = $image->get_thumb_link();
-		$h_tip = html_escape($image->get_tooltip());
-		$i_id = int_escape($image->id);
-		$h_tags = strtolower($image->get_tag_list());
-
-		// If file is flash or svg then sets thumbnail to max size.
-		if($image->ext == 'swf' || $image->ext == 'svg') {
-			$tsize = get_thumbnail_size($config->get_int('thumb_width'), $config->get_int('thumb_height'));
-		}
-		else{
-			$tsize = get_thumbnail_size($image->width, $image->height);
-		}
-
-		return "<a href='$h_view_link' class='shm-thumb shm-thumb-link' data-tags='$h_tags' data-post-id='$i_id'><img title='$h_tip' alt='$h_tip' ".
-				"width='{$tsize[0]}' height='{$tsize[1]}' src='$h_thumb_link' /></a>";
-	}
-
-
 	public function display_paginator(Page $page, $base, $query, $page_number, $total_pages) {
 		if($total_pages == 0) $total_pages = 1;
 		$body = $this->build_paginator($page_number, $total_pages, $base, $query);
diff --git a/themes/futaba/themelet.class.php b/themes/futaba/themelet.class.php
index 5fc79d3c..3db6c45e 100644
--- a/themes/futaba/themelet.class.php
+++ b/themes/futaba/themelet.class.php
@@ -1,30 +1,5 @@
 <?php
 class Themelet extends BaseThemelet {
-	/**
-	 * Generic thumbnail code; returns HTML rather than adding
-	 * a block since thumbs tend to go inside blocks...
-	 */
-	public function build_thumb_html(Image $image) {
-		global $config;
-		$h_view_link = make_link("post/view/{$image->id}");
-		$h_thumb_link = $image->get_thumb_link();
-		$h_tip = html_escape($image->get_tooltip());
-		$i_id = int_escape($image->id);
-		$h_tags = strtolower($image->get_tag_list());
-
-		// If file is flash or svg then sets thumbnail to max size.
-		if($image->ext == 'swf' || $image->ext == 'svg') {
-			$tsize = get_thumbnail_size($config->get_int('thumb_width'), $config->get_int('thumb_height'));
-		}
-		else {
-			$tsize = get_thumbnail_size($image->width, $image->height);
-		}
-
-		return "<a href='$h_view_link' class='thumb shm-thumb shm-thumb-link' data-tags='$h_tags' data-post-id='$i_id'><img title='$h_tip' alt='$h_tip' ".
-				"width='{$tsize[0]}' height='{$tsize[1]}' src='$h_thumb_link' /></a>";
-	}
-
-
 	/**
 	 * Add a generic paginator
 	 */
diff --git a/themes/lite/themelet.class.php b/themes/lite/themelet.class.php
index 8788d9a2..3eadf464 100644
--- a/themes/lite/themelet.class.php
+++ b/themes/lite/themelet.class.php
@@ -1,34 +1,5 @@
 <?php
 class Themelet extends BaseThemelet {
-	/**
-	 * Generic thumbnail code; returns HTML rather than adding
-	 * a block since thumbs tend to go inside blocks...
-	 */
-	public function build_thumb_html(Image $image) {
-		global $config;
-		$i_id = (int) $image->id;
-		$h_view_link = make_link('post/view/'.$i_id);
-		$h_thumb_link = $image->get_thumb_link();
-		$h_tip = html_escape($image->get_tooltip());
-		$h_tags = strtolower($image->get_tag_list());
-		$base = get_base_href();
-
-		// If file is flash or svg then sets thumbnail to max size.
-		if($image->ext === 'swf' || $image->ext === 'svg'){
-			$tsize = get_thumbnail_size($config->get_int('thumb_width'), $config->get_int('thumb_height'));
-		}
-		else{
-			$tsize = get_thumbnail_size($image->width, $image->height);
-		}
-
-		return '<center class="shm-thumb" data-tags="'.$h_tags.'" data-post-id="'.$i_id.'"><div class="thumbblock">'.
-		       '<a href="'.$h_view_link.'" class="thumb shm-thumb-link">'.
-		       '<img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" class="lazy" data-original="'.$h_thumb_link.'" src="'.$base.'/lib/static/grey.gif">'.
-		       '<noscript><img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" src="'.$h_thumb_link.'"></noscript>'.
-			   "</a></div></center>\n";
-	}
-
-
 	/**
 	 * Put something in a rounded rectangle box; specific to the default theme
 	 */
@@ -40,7 +11,6 @@ class Themelet extends BaseThemelet {
 		";
 	}
 
-
 	/**
 	 * Add a generic paginator
 	 */