diff --git a/README.txt b/README.txt
index 30e22af2..f25c4e40 100644
--- a/README.txt
+++ b/README.txt
@@ -107,6 +107,10 @@ ui-* cookies are for the client-side scripts only; in some configurations
 shm-* CSS classes are for javascript to hook into; if you're customising
 themes, be careful with these, and avoid styling them
 
+- shm-thumb = outermost element of a thumbnail
+   - data-tags
+   - data-post-id
+
 http://shimmie.shishnet.org/doc/
 
 Please tell me if those docs are lacking in any way, so that they can be
diff --git a/core/basethemelet.class.php b/core/basethemelet.class.php
index ef9b3a42..70e01ab1 100644
--- a/core/basethemelet.class.php
+++ b/core/basethemelet.class.php
@@ -54,9 +54,9 @@ class BaseThemelet {
 			$tsize = get_thumbnail_size($image->width, $image->height);
 		}
 
-		return '<a href="'.$h_view_link.'" class="thumb" data-tags="'.$h_tags.'">'.
-		       '<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>'.
+		return "<a href='$h_view_link' class='thumb shm-thumb' 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]}' 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>\n";
 	}
 
diff --git a/ext/index/script.js b/ext/index/script.js
index c220d53b..4a3663bf 100644
--- a/ext/index/script.js
+++ b/ext/index/script.js
@@ -1,16 +1,10 @@
 $(function() {
 	var blocked_tags = ($.cookie("ui-blocked-tags") || "").split(" ");
-	var themecheck = $(".thumb[data-tags]").parent().attr('class');
 	var needs_refresh = false;
 	for(i=0; i<blocked_tags.length; i++) {
 		var tag = blocked_tags[i];
 		if(tag) {
-			if(themecheck == "thumbblock") {
-				$(".thumb[data-tags~='"+tag+"']").parent().hide();
-				$(".thumb[data-tags~='"+tag+"']").parent().height(0); //required for lite theme
-			}else{
-				$(".thumb[data-tags~='"+tag+"']").hide();
-			}
+			$(".shm-thumb[data-tags~='"+tag+"']").hide();
 			needs_refresh = true;
 		}
 	}
diff --git a/ext/mass_tagger/script.js b/ext/mass_tagger/script.js
index 91ae12f5..6b8ae791 100644
--- a/ext/mass_tagger/script.js
+++ b/ext/mass_tagger/script.js
@@ -1,17 +1,3 @@
-function find_thumb_link_containers () {
-    
-    var post_link = "a[href*='/post/view/']";
-    var has_thumb_img = ":has(img[src*='/thumb/'])";
-    var list = $( post_link + has_thumb_img ).parent();
-
-	if (list) { return list; }
-	
-    has_thumb_img = ":has(img[src*='_thumbs/'])";
-    list = $( post_link + has_thumb_img ).parent();
-	
-	return list;
-}
-
 function toggle_tag( button, id ) {
     id += ":";
     var list = $('#mass_tagger_ids');
@@ -37,21 +23,18 @@ function remove_mass_tag_id( button, list, id, string ) {
 }
 
 function activate_mass_tagger ( image_link ) {
-    
-    find_thumb_link_containers().each(
+    $(".shm-thumb").each(
         function ( index, block ) {
             add_mass_tag_button( block, image_link );
         }
     );
-    $('#mass_tagger_controls').attr( 'style', 'display:block' );
-    $('#mass_tagger_activate').attr( 'style', 'display:none' );
-    
+    $('#mass_tagger_controls').show();
+    $('#mass_tagger_activate').hide();
     return false;
 }
 
 function add_mass_tag_button ( block, image_link ) {
-    
-    var id = get_image_id( block );
+    var id = $(block).data("post-id");
     
     var button = create_mass_tag_button( id, image_link );
     $(block).append( button );
@@ -59,13 +42,6 @@ function add_mass_tag_button ( block, image_link ) {
     return;
 }
 
-function get_image_id ( block ) {
-    var link = $(block).children(":first").attr('href');
-    var id = link.split('/').pop();
-    
-    return id;
-}
-
 function create_mass_tag_button ( id, image_link ) {
     var img = $('<img />');
     img.attr( "src", image_link+'/ext/mass_tagger/toggle.gif' );
diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php
index 7880429f..6ef57ee8 100644
--- a/themes/danbooru/themelet.class.php
+++ b/themes/danbooru/themelet.class.php
@@ -5,6 +5,8 @@ class Themelet extends BaseThemelet {
 		$h_view_link = make_link("post/view/{$image->id}", $query);
 		$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') {
@@ -14,7 +16,7 @@ class Themelet extends BaseThemelet {
 			$tsize = get_thumbnail_size($image->width, $image->height);
 		}
 
-		return "<a href='$h_view_link'><img title='$h_tip' alt='$h_tip' ".
+		return "<a href='$h_view_link' class='shm-thumb' 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>";
 	}
 
diff --git a/themes/futaba/themelet.class.php b/themes/futaba/themelet.class.php
index 7d4955e6..cfff9d50 100644
--- a/themes/futaba/themelet.class.php
+++ b/themes/futaba/themelet.class.php
@@ -9,6 +9,8 @@ class Themelet extends BaseThemelet {
 		$h_view_link = make_link("post/view/{$image->id}", $query);
 		$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') {
@@ -18,7 +20,7 @@ class Themelet extends BaseThemelet {
 			$tsize = get_thumbnail_size($image->width, $image->height);
 		}
 
-		return "<a class='thumb' href='$h_view_link'><img title='$h_tip' alt='$h_tip' ".
+		return "<a href='$h_view_link' class='thumb shm-thumb' 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>";
 	}
 
diff --git a/themes/lite/themelet.class.php b/themes/lite/themelet.class.php
index 3633860b..c61c9e4a 100644
--- a/themes/lite/themelet.class.php
+++ b/themes/lite/themelet.class.php
@@ -21,8 +21,8 @@ class Themelet extends BaseThemelet {
 			$tsize = get_thumbnail_size($image->width, $image->height);
 		}
 
-		return '<center><div class="thumbblock">'.
-		       '<a href="'.$h_view_link.'" class="thumb" data-tags="'.$h_tags.'">'.
+		return '<center class="shm-thumb" data-tags="'.$h_tags.'" data-post-id="'.$i_id.'"><div class="thumbblock">'.
+		       '<a href="'.$h_view_link.'" class="thumb">'.
 		       '<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";