diff --git a/ext/blocks/info.php b/ext/blocks/info.php
index 2bf68f2b..d5c34b9c 100644
--- a/ext/blocks/info.php
+++ b/ext/blocks/info.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 class BlocksInfo extends ExtensionInfo
 {
diff --git a/ext/blocks/main.php b/ext/blocks/main.php
index 3e3a02ec..cc2a560f 100644
--- a/ext/blocks/main.php
+++ b/ext/blocks/main.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 class Blocks extends Extension
 {
diff --git a/ext/blocks/test.php b/ext/blocks/test.php
index fc92f69a..73c8e07b 100644
--- a/ext/blocks/test.php
+++ b/ext/blocks/test.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 class BlocksTest extends ShimmiePHPUnitTestCase
 {
     public function testBlocks()
diff --git a/ext/blocks/theme.php b/ext/blocks/theme.php
index 32f7d870..bb99cef1 100644
--- a/ext/blocks/theme.php
+++ b/ext/blocks/theme.php
@@ -1,43 +1,45 @@
-<?php
+<?php declare(strict_types=1);
+use function MicroHTML\{TABLE,TR,TH,TD,INPUT,TEXTAREA,rawHTML,SELECT,OPTION};
+
 class BlocksTheme extends Themelet
 {
     public function display_blocks($blocks)
     {
         global $page;
 
-        $html = "<table class='form' style='width: 100%;'>";
+        $html = TABLE(["class"=>"form", "style"=>"width: 100%;"]);
         foreach ($blocks as $block) {
-            $html .= make_form(make_link("blocks/update"));
-            $html .= "<input type='hidden' name='id' value='".html_escape($block['id'])."'>";
-            $html .= "<tr>";
-            $html .= "<th>Title</th><td><input type='text' name='title' value='".html_escape($block['title'])."'></td>";
-            $html .= "<th>Area</th><td><input type='text' name='area' value='".html_escape($block['area'])."'></td>";
-            $html .= "<th>Priority</th><td><input type='text' name='priority' value='".html_escape($block['priority'])."'></td>";
-            $html .= "<th>Pages</th><td><input type='text' name='pages' value='".html_escape($block['pages'])."'></td>";
-            $html .= "<th>Delete</th><td><input type='checkbox' name='delete'></td>";
-            $html .= "<td><input type='submit' value='Save'></td>";
-            $html .= "</tr>";
-            $html .= "<tr>";
-            $html .= "<td colspan='11'><textarea rows='5' name='content'>".html_escape($block['content'])."</textarea></td>";
-            $html .= "</tr>\n";
-            $html .= "<tr>";
-            $html .= "<td colspan='11'>&nbsp;</td>";
-            $html .= "</tr>\n";
-            $html .= "</form>\n";
+            $form = SHM_FORM(make_link("blocks/update"));
+            $form->appendChild(TR(
+                INPUT(["type"=>"hidden", "name"=>"id", "value"=>$block['id']]),
+                TH("Title"), TD(INPUT(["type"=>"text", "name"=>"title", "value"=>$block['title']])),
+                TH("Area"), TD(INPUT(["type"=>"text", "name"=>"area", "value"=>$block['area']])),
+                TH("Priority"), TD(INPUT(["type"=>"text", "name"=>"priority", "value"=>$block['priority']])),
+                TH("Pages"), TD(INPUT(["type"=>"text", "name"=>"pages", "value"=>$block['pages']])),
+                TH("Delete"), TD(INPUT(["type"=>"checkbox", "name"=>"delete"])),
+                TD(INPUT(["type"=>"submit", "value"=>"Save"]))
+            ));
+            $form->appendChild(TR(
+                TD(["colspan"=>"11"], TEXTAREA(["rows"=>"5", "name"=>"content"], $block['content']))
+            ));
+            $form->appendChild(TR(
+                TD(["colspan"=>"11"], rawHTML("&nbsp;"))
+            ));
+            $html->appendChild($form);
         }
-        $html .= make_form(make_link("blocks/add"));
-        $html .= "<tr>";
-        $html .= "<th>Title</th><td><input type='text' name='title' value=''></td>";
-        $html .= "<th>Area</th><td><select name='area'><option>left<option>main</select></td>";
-        $html .= "<th>Priority</th><td><input type='text' name='priority' value='50'></td>";
-        $html .= "<th>Pages</th><td><input type='text' name='pages' value='post/list*'></td>";
-        $html .= "<td colspan='3'><input type='submit' value='Add'></td>";
-        $html .= "</tr>";
-        $html .= "<tr>";
-        $html .= "<td colspan='11'><textarea rows='5' name='content'></textarea></td>";
-        $html .= "</tr>\n";
-        $html .= "</form>";
-        $html .= "</table>";
+
+        $form = SHM_FORM(make_link("blocks/add"));
+        $form->appendChild(TR(
+            TH("Title"), TD(INPUT(["type"=>"text", "name"=>"title", "value"=>""])),
+            TH("Area"), TD(SELECT(["name"=>"area"], OPTION("left"), OPTION("main")),
+            TH("Priority"), TD(INPUT(["type"=>"text", "name"=>"priority", "value"=>'50'])),
+            TH("Pages"), TD(INPUT(["type"=>"text", "name"=>"pages", "value"=>'post/list*'])),
+            TD(["colspan"=>'3'], INPUT(["type"=>"submit", "value"=>"Add"]))
+        )));
+        $form->appendChild(TR(
+            TD(["colspan"=>"11"], TEXTAREA(["rows"=>"5", "name"=>"content"]))
+        ));
+        $html->appendChild($form);
 
         $page->set_title("Blocks");
         $page->set_heading("Blocks");