diff --git a/block-templates/404.html b/block-templates/404.html
index af6efcf..059f0fd 100644
--- a/block-templates/404.html
+++ b/block-templates/404.html
@@ -1,6 +1,6 @@
 <!-- wp:oik-sb/sb-debug-block /-->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -10,14 +10,14 @@
   <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"404","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"404","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"query-pagination","theme":"thisis","tagName":"section","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"query-pagination","tagName":"section","layout":{"inherit":true}} /-->
 
 
-<!-- wp:template-part {"slug":"latest-posts","theme":"thisis","tagName":"section","backgroundColor":"very-light-gray"} /-->
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"latest-posts","tagName":"section","backgroundColor":"very-light-gray"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
 
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/archive-demo.html b/block-templates/archive-demo.html
index 71642e8..e175a3c 100644
--- a/block-templates/archive-demo.html
+++ b/block-templates/archive-demo.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">archive.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:query-title {"type":"archive","textColor":"darker-gray"} /-->
 
@@ -50,8 +50,8 @@
     <!-- /wp:query --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/archive.html b/block-templates/archive.html
index 176934f..8283a40 100644
--- a/block-templates/archive.html
+++ b/block-templates/archive.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">archive.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:query-title {"type":"archive","textColor":"darker-gray"} /-->
 
@@ -46,7 +46,7 @@
     <!-- /wp:query-pagination -->
     <!-- /wp:query --></div>
 <!-- /wp:group -->
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/attachment.html b/block-templates/attachment.html
index 78cb56c..2bc134e 100644
--- a/block-templates/attachment.html
+++ b/block-templates/attachment.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">attachment.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"attachment-image","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"attachment-image"} /-->
 
 <!-- wp:group {"layout":{"inherit":true}} -->
 <div class="wp-block-group"><!-- wp:post-title {"backgroundColor":"vivid-cyan-blue","textColor":"background"} /-->
@@ -20,5 +20,5 @@ <h3>Description</h3>
     <!-- wp:post-content /--></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/category-faqs.html b/block-templates/category-faqs.html
index 6dc1921..7fc9782 100644
--- a/block-templates/category-faqs.html
+++ b/block-templates/category-faqs.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">category-faqs.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:query-title {"type":"archive","textColor":"darker-gray"} /-->
 
@@ -14,11 +14,11 @@
   <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"main-body","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"main-body","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"query-pagination","theme":"thisis","tagName":"section","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"query-pagination","tagName":"section","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/category-fse-is.html b/block-templates/category-fse-is.html
index f7a2e6c..f36bf43 100644
--- a/block-templates/category-fse-is.html
+++ b/block-templates/category-fse-is.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">category-fse-is.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:query-title {"type":"archive","textColor":"darker-gray"} /-->
 
@@ -14,11 +14,11 @@
   <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"main-body","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"main-body","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"query-pagination","theme":"thisis","tagName":"section","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"query-pagination","tagName":"section","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/featured-image-left.html b/block-templates/featured-image-left.html
index 799cef0..2f3ffba 100644
--- a/block-templates/featured-image-left.html
+++ b/block-templates/featured-image-left.html
@@ -1,7 +1,7 @@
 <!-- wp:html -->
 <div class="WP_DEBUG">featured-image-left.html</div>
 <!-- /wp:html -->
-<!-- wp:template-part {"slug":"header","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"header"} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -21,7 +21,7 @@
     <!-- /wp:column -->
 
     <!-- wp:column -->
-    <div class="wp-block-column"><!-- wp:template-part {"slug":"page-tree","theme":"thisis"} /--></div>
+    <div class="wp-block-column"><!-- wp:template-part {"slug":"page-tree"} /--></div>
     <!-- /wp:column --></div>
 <!-- /wp:columns -->
 
@@ -29,7 +29,7 @@
 <p></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
-<!-- wp:template-part {"slug":"footer","theme":"thisis","backgroundColor":"very-light-gray","textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"footer","backgroundColor":"very-light-gray","textColor":"foreground","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/front-page-demo.html b/block-templates/front-page-demo.html
index f81745f..8ed603f 100644
--- a/block-templates/front-page-demo.html
+++ b/block-templates/front-page-demo.html
@@ -4,7 +4,7 @@
 
 <!-- wp:template-part /-->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:cover {"overlayColor":"current-menu","minHeight":100,"minHeightUnit":"vh","contentPosition":"top center","align":"full"} -->
@@ -22,12 +22,12 @@
   <!-- /wp:paragraph --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"main-body","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"main-body","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
-<!-- wp:template-part {"slug":"latest-posts","theme":"thisis","tagName":"section","backgroundColor":"very-light-gray"} /-->
+<!-- wp:template-part {"slug":"latest-posts","tagName":"section","backgroundColor":"very-light-gray"} /-->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/front-page.html b/block-templates/front-page.html
index 68393d9..aa3a1fa 100644
--- a/block-templates/front-page.html
+++ b/block-templates/front-page.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">front-page.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"header"} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:cover {"overlayColor":"current-menu","minHeight":100,"minHeightUnit":"vh","contentPosition":"top center","align":"full"} -->
@@ -20,13 +20,13 @@
     <!-- /wp:paragraph --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"main-body","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"main-body"} /-->
 
-<!-- wp:template-part {"slug":"latest-posts","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"latest-posts","tagName":"section"} /-->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"footer"} /-->
 
 <!-- wp:paragraph {"align":"left"} -->
 <p class="has-text-align-left">[cloned]</p>
@@ -36,4 +36,4 @@
 <p class="has-text-align-left">[clone]</p>
 <!-- /wp:paragraph -->
 
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/full-width.html b/block-templates/full-width.html
index eddd1e5..151a3ff 100644
--- a/block-templates/full-width.html
+++ b/block-templates/full-width.html
@@ -1,7 +1,7 @@
 <!-- wp:html -->
 <div class="WP_DEBUG">full-width.html</div>
 <!-- /wp:html -->
-<!-- wp:template-part {"slug":"header","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"header"} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -15,8 +15,8 @@
 
 <!-- wp:post-content /-->
 
-<!-- wp:template-part {"slug":"page-tree","theme":"thisis","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
-<!-- wp:template-part {"slug":"footer","theme":"thisis","backgroundColor":"very-light-gray","textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"page-tree","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"footer","backgroundColor":"very-light-gray","textColor":"foreground","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/index.html b/block-templates/index.html
index 1d9f7ac..64715ad 100644
--- a/block-templates/index.html
+++ b/block-templates/index.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">index.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -12,11 +12,11 @@
     <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"main-body","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"main-body","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"query-pagination","theme":"thisis","tagName":"section","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"query-pagination","tagName":"section","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
diff --git a/block-templates/output-input.html b/block-templates/output-input.html
index c941e73..908f345 100644
--- a/block-templates/output-input.html
+++ b/block-templates/output-input.html
@@ -1,3 +1,3 @@
 <!-- wp:post-title /-->
 <!-- wp:post-content /-->
-<!-- wp:template-part {"slug":"contents-shortcode","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"contents-shortcode"} /-->
diff --git a/block-templates/page-template-hierarchy.html b/block-templates/page-template-hierarchy.html
index 208caad..178e2cc 100644
--- a/block-templates/page-template-hierarchy.html
+++ b/block-templates/page-template-hierarchy.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">page-template-hierarchy.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -16,17 +16,17 @@
 
 <!-- wp:columns -->
 <div class="wp-block-columns"><!-- wp:column {"width":"66.66%"} -->
-    <div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:template-part {"slug":"body-only","theme":"thisis","layout":{"inherit":true}} /--></div>
+    <div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:template-part {"slug":"body-only","layout":{"inherit":true}} /--></div>
     <!-- /wp:column -->
 
     <!-- wp:column {"width":"33.33%"} -->
     <div class="wp-block-column" style="flex-basis:33.33%">
-        <!-- wp:template-part {"slug":"page-tree","theme":"thisis"} /-->
+        <!-- wp:template-part {"slug":"page-tree"} /-->
 
     </div>
     <!-- /wp:column --></div>
 <!-- /wp:columns -->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/page.html b/block-templates/page.html
index 20ab1a2..8e206cb 100644
--- a/block-templates/page.html
+++ b/block-templates/page.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">page.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -14,12 +14,12 @@
 
 <!-- wp:columns -->
 <div class="wp-block-columns"><!-- wp:column {"width":"66.66%"} -->
-  <div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:template-part {"slug":"main-body","theme":"thisis","layout":{"inherit":true}} /--></div>
+  <div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:template-part {"slug":"main-body","layout":{"inherit":true}} /--></div>
   <!-- /wp:column -->
 
   <!-- wp:column {"width":"33.33%"} -->
   <div class="wp-block-column" style="flex-basis:33.33%">
-    <!-- wp:template-part {"slug":"page-tree","theme":"thisis"} /-->
+    <!-- wp:template-part {"slug":"page-tree"} /-->
 
    </div>
   <!-- /wp:column --></div>
@@ -29,6 +29,6 @@
 <p></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/portfolio.html b/block-templates/portfolio.html
index 68b3aeb..8cea1bd 100644
--- a/block-templates/portfolio.html
+++ b/block-templates/portfolio.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"header"} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background"} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -10,4 +10,4 @@
 
 <!-- wp:post-content {"layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"footer","theme":"thisis","backgroundColor":"very-light-gray","layout":{"inherit":true}} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","backgroundColor":"very-light-gray","layout":{"inherit":true}} /-->
\ No newline at end of file
diff --git a/block-templates/search.html b/block-templates/search.html
index 7d7c4a1..0e4ee77 100644
--- a/block-templates/search.html
+++ b/block-templates/search.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">search.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -12,10 +12,10 @@
   <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"main-body","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"main-body","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"query-pagination","theme":"thisis","tagName":"section","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"query-pagination","tagName":"section","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
diff --git a/block-templates/single-post-no-featured-image.html b/block-templates/single-post-no-featured-image.html
index 1176055..584834a 100644
--- a/block-templates/single-post-no-featured-image.html
+++ b/block-templates/single-post-no-featured-image.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">single-post-no-featured-image.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -12,14 +12,14 @@
     <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"previous-next","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"previous-next"} /-->
 
-<!-- wp:template-part {"slug":"main-body-no-featured-image","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"main-body-no-featured-image","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part{"slug":"single-post-fields","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part{"slug":"single-post-fields","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"post-meta-inline","theme":"thisis","tagName":"aside","className":"flex","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-meta-inline","tagName":"aside","className":"flex","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file
diff --git a/block-templates/single-post.html b/block-templates/single-post.html
index 0602be0..adf5e42 100644
--- a/block-templates/single-post.html
+++ b/block-templates/single-post.html
@@ -2,7 +2,7 @@
 <div class="WP_DEBUG">single-post.html</div>
 <!-- /wp:html -->
 
-<!-- wp:template-part {"slug":"header","theme":"thisis","layout":{"inherit":false,"contentSize":"100%"}} /-->
+<!-- wp:template-part {"slug":"header","layout":{"inherit":false,"contentSize":"100%"}} /-->
 
 <!-- wp:group {"backgroundColor":"site-header-background","layout":{"inherit":true}} -->
 <div class="wp-block-group has-site-header-background-background-color has-background"><!-- wp:columns -->
@@ -12,14 +12,14 @@
   <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"previous-next","theme":"thisis"} /-->
+<!-- wp:template-part {"slug":"previous-next"} /-->
 
-<!-- wp:template-part {"slug":"main-body","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"main-body","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part{"slug":"single-post-fields","theme":"thisis","layout":{"inherit":true}} /-->
+<!-- wp:template-part{"slug":"single-post-fields","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"post-meta-inline","theme":"thisis","tagName":"aside","className":"flex","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-meta-inline","tagName":"aside","className":"flex","layout":{"inherit":true}} /-->
 
-<!-- wp:template-part {"slug":"category-tag-clouds","theme":"thisis","tagName":"section"} /-->
-<!-- wp:template-part {"slug":"footer","theme":"thisis","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
-<!-- wp:template-part {"slug":"post-footer-stuff","theme":"thisis"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"category-tag-clouds","tagName":"section"} /-->
+<!-- wp:template-part {"slug":"footer","style":{"color":{"background":"#f7f7f7"}},"textColor":"foreground","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"post-footer-stuff"} /-->
\ No newline at end of file