diff --git a/contrib/zoom/theme.php b/contrib/zoom/theme.php
index 24b10735..67df0160 100644
--- a/contrib/zoom/theme.php
+++ b/contrib/zoom/theme.php
@@ -9,7 +9,7 @@ class ZoomTheme extends Themelet {
 		global $config;
 		$default = $zoom_by_default ? "scale(img);" : "";
 		return <<<EOD
-<!-- rrcontent -->
+<!-- cancel border -->
 <script type="text/javascript">
 img = document.getElementById("main_image");
 
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index de7fc538..6ecc66c7 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -116,7 +116,7 @@ EOD;
 			</div>
 		";
 		if(!is_null($b)) {
-			if(strpos($b, "rrcontent")) {
+			if(strpos($b, "<!-- cancel border -->")) {
 				$html .= "<div class='blockbody' id='$i'>$b</div>";
 			}
 			else {
diff --git a/themes/default/themelet.class.php b/themes/default/themelet.class.php
index 71c832fe..5cb25716 100644
--- a/themes/default/themelet.class.php
+++ b/themes/default/themelet.class.php
@@ -110,7 +110,7 @@ class Themelet {
 		$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><!-- rrcontent -->";
+				"<br>&lt;&lt; $pages_html &gt;&gt;</p><!-- cancel border -->";
 	}
 }
 ?>
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index eef078b6..7a542994 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -222,7 +222,7 @@ EOD;
 			}
 			}
 		if(!is_null($b)) {
-			//if(strpos($b, "rrcontent")) {
+			//if(strpos($b, "<!-- cancel border -->")) {
 			if($salt =="main") {
 				$html .= "<div class='blockbody' id='$i'>$b</div>";
 			}
diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php
index 5e8c243f..1cf5ba19 100644
--- a/themes/warm/layout.class.php
+++ b/themes/warm/layout.class.php
@@ -128,7 +128,7 @@ EOD;
 			</div>
 		";
 		if(!is_null($b)) {
-			if(strpos($b, "rrcontent")) {
+			if(strpos($b, "<!-- cancel border -->")) {
 				$html .= "<div class='blockbody' id='$i'>$b</div>";
 			}
 			else {
diff --git a/themes/warm/themelet.class.php b/themes/warm/themelet.class.php
index 1c160108..ddbad7a8 100644
--- a/themes/warm/themelet.class.php
+++ b/themes/warm/themelet.class.php
@@ -111,7 +111,7 @@ class Themelet {
 		$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><!-- rrcontent -->";
+				"<br>&lt;&lt; $pages_html &gt;&gt;</p><!-- cancel border -->";
 	}
 }
 ?>