diff --git a/ext/setup/theme.php b/ext/setup/theme.php
index e8b304c8..64b0903c 100644
--- a/ext/setup/theme.php
+++ b/ext/setup/theme.php
@@ -87,7 +87,17 @@ class SetupTheme extends Themelet {
 	}
 
 	protected function sb_to_html(SetupBlock $block) {
-		return "<div class='setupblock'><b>{$block->header}</b><br>{$block->body}</div>\n";
+		$h = $block->header;
+		$b = $block->body;
+		$i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
+		$html = "
+			<div class='setupblock brr'>
+				<b class='shm-toggler' data-toggle-id='$i'>$h</b>
+				<br><div id='$i'>$b</div>
+			</div>
+			<!-- cancel border -->
+		";
+		return $html;
 	}
 }
 ?>
diff --git a/themes/default/setup.theme.php b/themes/default/setup.theme.php
deleted file mode 100644
index ffd82027..00000000
--- a/themes/default/setup.theme.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * A customised version of the Setup theme
- */
-class CustomSetupTheme extends SetupTheme {
-	protected function sb_to_html(SetupBlock $block) {
-		$h = $block->header;
-		$b = $block->body;
-		$i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
-		$html = "
-			<script type='text/javascript'><!--
-			$(document).ready(function() {
-				$(\"#$i-toggle\").click(function() {
-					$(\"#$i\").slideToggle(\"slow\", function() {
-						if($(\"#$i\").is(\":hidden\")) {
-							$.cookie(\"$i-hidden\", 'true', {path: '/'});
-						}
-						else {
-							$.cookie(\"$i-hidden\", 'false', {path: '/'});
-						}
-					});
-				});
-				if($.cookie(\"$i-hidden\") == 'true') {
-					$(\"#$i\").hide();
-				}
-			});
-			//--></script>
-			<div class='setupblock brr'>
-				<b id='$i-toggle'>$h</b>
-				<br><div id='$i'>$b</div>
-			</div>
-			<!-- cancel border -->
-		";
-
-		return $html;
-	}
-}
-?>