diff --git a/ext/setup/theme.php b/ext/setup/theme.php
index bebf977a..0baa14ca 100644
--- a/ext/setup/theme.php
+++ b/ext/setup/theme.php
@@ -94,11 +94,10 @@ class SetupTheme extends Themelet
     {
         $h = $block->header;
         $b = $block->body;
-        $i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
         $html = "
 			<section class='setupblock'>
-				<b class='shm-toggler' data-toggle-sel='#$i'>$h</b>
-				<br><div id='$i'>$b</div>
+				<b>$h</b>
+				<br>$b
 			</section>
 		";
         return $html;
diff --git a/themes/lite/setup.theme.php b/themes/lite/setup.theme.php
index 5aa3824e..b1e90085 100644
--- a/themes/lite/setup.theme.php
+++ b/themes/lite/setup.theme.php
@@ -4,43 +4,11 @@ declare(strict_types=1);
 
 namespace Shimmie2;
 
-/**
- * Class CustomSetupTheme
- *
- * A customised version of the Setup theme.
- *
- */
 class CustomSetupTheme extends SetupTheme
 {
     protected function sb_to_html(SetupBlock $block): string
     {
-        $h = $block->header;
-        $b = $block->body;
-        $i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
-        $html = "
-			<script type='text/javascript'>
-			document.addEventListener('DOMContentLoaded', () => {
-				$(\"#$i-toggle\").click(function() {
-					$(\"#$i\").slideToggle(\"slow\", function() {
-						if($(\"#$i\").is(\":hidden\")) {
-							shm_cookie_set(\"$i-hidden\", 'true');
-						}
-						else {
-							shm_cookie_set(\"$i-hidden\", 'false');
-						}
-					});
-				});
-				if(shm_cookie_get(\"$i-hidden\") == 'true') {
-					$(\"#$i\").hide();
-				}
-			});
-			</script>
-			<div class='setupblock'>
-				<b id='$i-toggle'>$h</b>
-				<br><div id='$i'>$b</div>
-			</div>
-		";
-
+        $html = parent::sb_to_html($block);
         return "<div class='tframe'>$html</div>";
     }
 }
diff --git a/themes/lite/themelet.class.php b/themes/lite/themelet.class.php
index 923c50d6..fd293a38 100644
--- a/themes/lite/themelet.class.php
+++ b/themes/lite/themelet.class.php
@@ -8,9 +8,6 @@ use MicroHTML\HTMLElement;
 
 use function MicroHTML\{A,DIV,SPAN,joinHTML};
 
-/**
- * Class Themelet
- */
 class Themelet extends BaseThemelet
 {
     public function display_paginator(Page $page, string $base, ?string $query, int $page_number, int $total_pages, bool $show_random = false)
diff --git a/themes/lite/user_config.theme.php b/themes/lite/user_config.theme.php
index 2ad74f78..46d74818 100644
--- a/themes/lite/user_config.theme.php
+++ b/themes/lite/user_config.theme.php
@@ -4,43 +4,11 @@ declare(strict_types=1);
 
 namespace Shimmie2;
 
-/**
- * Class CustomSetupTheme
- *
- * A customised version of the Setup theme.
- *
- */
 class CustomUserConfigTheme extends UserConfigTheme
 {
     protected function sb_to_html(SetupBlock $block): string
     {
-        $h = $block->header;
-        $b = $block->body;
-        $i = preg_replace('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
-        $html = "
-			<script type='text/javascript'>
-			document.addEventListener('DOMContentLoaded', () => {
-				$(\"#$i-toggle\").click(function() {
-					$(\"#$i\").slideToggle(\"slow\", function() {
-						if($(\"#$i\").is(\":hidden\")) {
-							shm_cookie_set(\"$i-hidden\", 'true');
-						}
-						else {
-							shm_cookie_set(\"$i-hidden\", 'false');
-						}
-					});
-				});
-				if(shm_cookie_get(\"$i-hidden\") == 'true') {
-					$(\"#$i\").hide();
-				}
-			});
-			</script>
-			<div class='setupblock'>
-				<b id='$i-toggle'>$h</b>
-				<br><div id='$i'>$b</div>
-			</div>
-		";
-
+        $html = parent::sb_to_html($block);
         return "<div class='tframe'>$html</div>";
     }
 }