diff --git a/ames/templates/block-templates/index.html b/ames/templates/block-templates/index.html
deleted file mode 100644
index ca5964f278..0000000000
--- a/ames/templates/block-templates/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/arbutus/parts/block-template-parts/footer.html b/arbutus/parts/block-template-parts/footer.html
deleted file mode 100644
index d36c3fa529..0000000000
--- a/arbutus/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/footer-separator"} /-->
\ No newline at end of file
diff --git a/arbutus/parts/block-template-parts/header.html b/arbutus/parts/block-template-parts/header.html
deleted file mode 100644
index 48838102f6..0000000000
--- a/arbutus/parts/block-template-parts/header.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-rounded-logo"} /-->
\ No newline at end of file
diff --git a/arbutus/templates/block-templates/archive.html b/arbutus/templates/block-templates/archive.html
deleted file mode 100644
index c65b03c4b4..0000000000
--- a/arbutus/templates/block-templates/archive.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"100px"}}}} /-->
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":false},"className":"site-footer-container"} /-->
diff --git a/arbutus/templates/block-templates/header-footer-only.html b/arbutus/templates/block-templates/header-footer-only.html
deleted file mode 100644
index 376b9c3bff..0000000000
--- a/arbutus/templates/block-templates/header-footer-only.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/arbutus/templates/block-templates/index.html b/arbutus/templates/block-templates/index.html
deleted file mode 100644
index ca5964f278..0000000000
--- a/arbutus/templates/block-templates/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/arbutus/templates/block-templates/page.html b/arbutus/templates/block-templates/page.html
deleted file mode 100644
index 7e9321180f..0000000000
--- a/arbutus/templates/block-templates/page.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group"><!-- wp:post-featured-image {"align":"full"} /-->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /--></main>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":40} -->
-<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/arbutus/templates/block-templates/single.html b/arbutus/templates/block-templates/single.html
deleted file mode 100644
index d128f82af8..0000000000
--- a/arbutus/templates/block-templates/single.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group"><!-- wp:post-featured-image {"align":"full"} /-->
-
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"20px"}}},"layout":{"inherit":true}} -->
-<div class="wp-block-group" style="padding-top:20px;padding-bottom:0px"><!-- wp:post-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1.3"}},"textColor":"primary"} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/blank-canvas-blocks/templates/block-templates/home.html b/blank-canvas-blocks/templates/block-templates/home.html
deleted file mode 100644
index 716b44987b..0000000000
--- a/blank-canvas-blocks/templates/block-templates/home.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container"} /--> 
\ No newline at end of file
diff --git a/blockbase/parts/block-template-parts/footer.html b/blockbase/parts/block-template-parts/footer.html
deleted file mode 100644
index d9c01bb4e6..0000000000
--- a/blockbase/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
diff --git a/blockbase/parts/block-template-parts/header-centered.html b/blockbase/parts/block-template-parts/header-centered.html
deleted file mode 100644
index c88a818a1d..0000000000
--- a/blockbase/parts/block-template-parts/header-centered.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- wp:group {"className":"gapless-group","layout":{"inherit":"true"}} -->
-<div class="wp-block-group gapless-group">
-
-<!-- wp:group {"align":"full","className":"site-header gapless-group fullwidth"} -->
-<div class="wp-block-group alignfull site-header gapless-group fullwidth">
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:site-logo {"align":"center","width":128} /-->
-<!-- wp:site-title {"textAlign":"center","style":{"spacing":{"padding":{"top":"30px","bottom":"20px"}},"typography":{"fontSize":"55px"}}} /-->
-<!-- wp:site-tagline {"textAlign":"center","fontSize":"small"} /-->
-<!-- wp:spacer {"height":20} -->
-<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- wp:navigation {"__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"center","orientation":"horizontal"}} /-->
-
-</div>
-<!-- /wp:group -->
-</div>
-<!-- /wp:group -->
diff --git a/blockbase/parts/block-template-parts/header-default.html b/blockbase/parts/block-template-parts/header-default.html
deleted file mode 100644
index b06304df99..0000000000
--- a/blockbase/parts/block-template-parts/header-default.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:group {"className":"gapless-group","layout":{"inherit":"true"}} -->
-<div class="wp-block-group gapless-group">
-<!-- wp:group {"align":"full","className":"site-header","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"padding":{"bottom":"var(--wp--custom--gap--vertical)","top":"var(--wp--custom--gap--vertical)"}}}} -->
-<div class="wp-block-group site-header alignfull" style="padding-bottom:var(--wp--custom--gap--vertical);padding-top:var(--wp--custom--gap--vertical)">
-
-	<!-- wp:group {"className":"site-brand","layout":{"type":"flex"}} -->
-	<div class="wp-block-group site-brand">
-		<!-- wp:site-logo {"width":64} /-->
-
-		<!-- wp:group -->
-		<div class="wp-block-group">
-			<!-- wp:site-title /-->
-			<!-- wp:site-tagline /-->
-		</div>
-		<!-- /wp:group -->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:navigation {"__unstableLocation":"primary","__unstableSocialLinks":"social","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->
-
-</div>
-<!-- /wp:group -->
-
-</div>
-<!-- /wp:group -->
\ No newline at end of file
diff --git a/blockbase/parts/block-template-parts/header-linear.html b/blockbase/parts/block-template-parts/header-linear.html
deleted file mode 100644
index 4669f61c7b..0000000000
--- a/blockbase/parts/block-template-parts/header-linear.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:group {"className":"gapless-group","layout":{"inherit":"true"}} -->
-<div class="wp-block-group gapless-group">
-<!-- wp:group {"align":"full","className":"site-header site-header-linear","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"padding":{"bottom":"var(--wp--custom--gap--vertical)","top":"var(--wp--custom--gap--vertical)"}}}} -->
-<div class="wp-block-group site-header site-header-linear alignfull" style="padding-bottom:var(--wp--custom--gap--vertical);padding-top:var(--wp--custom--gap--vertical)">
-
-	<!-- wp:group {"className":"site-brand","layout":{"type":"flex"}} -->
-	<div class="wp-block-group site-brand">
-		<!-- wp:site-logo {"width":64} /-->
-
-		<!-- wp:group {"className":"site-words-stack-small","layout":{"type":"flex"}} -->
-		<div class="wp-block-group site-words-stack-small">
-			<!-- wp:site-title /-->
-			<!-- wp:site-tagline {"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:navigation {"className":"blockbase-responsive-navigation-linear","__unstableLocation":"primary","__unstableSocialLinks":"social","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->
-
-</div>
-<!-- /wp:group -->
-
-</div>
-<!-- /wp:group -->
diff --git a/blockbase/parts/block-template-parts/header-minimal.html b/blockbase/parts/block-template-parts/header-minimal.html
deleted file mode 100644
index 60392038a4..0000000000
--- a/blockbase/parts/block-template-parts/header-minimal.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- wp:group {"className":"gapless-group","layout":{"inherit":"true"}} -->
-<div class="wp-block-group gapless-group">
-<!-- wp:group {"align":"full","layout":{"inherit":"true"}} -->
-<div class="wp-block-group alignfull">
-<!-- wp:group {"align":"wide","className":"site-header site-header-linear","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"padding":{"bottom":"var(--wp--custom--gap--vertical)","top":"var(--wp--custom--gap--vertical)"}}}} -->
-<div class="wp-block-group site-header site-header-linear alignwide" style="padding-bottom:var(--wp--custom--gap--vertical);padding-top:var(--wp--custom--gap--vertical)">
-	
-	<!-- wp:group {"className":"site-brand","layout":{"type":"flex"}} -->
-	<div class="wp-block-group site-brand">
-		<!-- wp:site-logo {"width":64} /-->
-	
-		<!-- wp:group {"className":"site-words-stack-small","layout":{"type":"flex"}} -->
-		<div class="wp-block-group site-words-stack-small">
-			<!-- wp:site-title /-->
-			<!-- wp:site-tagline {"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-	</div>
-	<!-- /wp:group -->
-	
-	<!-- wp:navigation {"className":"blockbase-responsive-navigation-minimal","overlayMenu":"always","__unstableLocation":"primary","__unstableSocialLinks":"social","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->
-	
-</div>
-<!-- /wp:group -->
-</div>
-<!-- /wp:group -->
-	
-</div>
-<!-- /wp:group -->
\ No newline at end of file
diff --git a/blockbase/parts/block-template-parts/header-rounded-logo.html b/blockbase/parts/block-template-parts/header-rounded-logo.html
deleted file mode 100644
index a7635dd0fa..0000000000
--- a/blockbase/parts/block-template-parts/header-rounded-logo.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:group {"className":"gapless-group","layout":{"inherit":"true"}} -->
-<div class="wp-block-group gapless-group">
-<!-- wp:group {"align":"full","className":"site-header","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"padding":{"bottom":"var(--wp--custom--gap--vertical)","top":"var(--wp--custom--gap--vertical)"}}}} -->
-<div class="wp-block-group site-header alignfull" style="padding-bottom:var(--wp--custom--gap--vertical);padding-top:var(--wp--custom--gap--vertical)">
-
-	<!-- wp:group {"className":"site-brand","layout":{"type":"flex"}} -->
-	<div class="wp-block-group site-brand">
-		<!-- wp:site-logo {"className":"is-style-rounded","width":64} /-->
-
-		<!-- wp:group -->
-		<div class="wp-block-group">
-			<!-- wp:site-title /-->
-			<!-- wp:site-tagline /-->
-		</div>
-		<!-- /wp:group -->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:navigation {"__unstableLocation":"primary","__unstableSocialLinks":"social","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"}} /-->
-
-</div>
-<!-- /wp:group -->
-
-</div>
-<!-- /wp:group -->
diff --git a/blockbase/parts/block-template-parts/header-wide.html b/blockbase/parts/block-template-parts/header-wide.html
deleted file mode 100644
index 3741e4b55e..0000000000
--- a/blockbase/parts/block-template-parts/header-wide.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:group {"className":"gapless-group","layout":{"inherit":"true"}} -->
-<div class="wp-block-group gapless-group">
-	<!-- wp:group {"align":"wide","className":"site-header","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"padding":{"bottom":"var(--wp--custom--gap--vertical)","top":"var(--wp--custom--gap--vertical)"}}}} -->
-	<div class="wp-block-group site-header alignwide" style="padding-bottom:var(--wp--custom--gap--vertical);padding-top:var(--wp--custom--gap--vertical)">
-
-		<!-- wp:group {"className":"site-brand","layout":{"type":"flex"}} -->
-		<div class="wp-block-group site-brand">
-			<!-- wp:site-logo {"width":64} /-->
-
-			<!-- wp:group -->
-			<div class="wp-block-group">
-				<!-- wp:site-title /-->
-				<!-- wp:site-tagline /-->
-			</div>
-			<!-- /wp:group -->
-		</div>
-		<!-- /wp:group -->
-
-		<!-- wp:navigation {"__unstableLocation":"primary","__unstableSocialLinks":"social","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->
-
-	</div>
-	<!-- /wp:group -->
-
-	</div>
-	<!-- /wp:group -->
diff --git a/blockbase/parts/block-template-parts/header.html b/blockbase/parts/block-template-parts/header.html
deleted file mode 100644
index fe38294df4..0000000000
--- a/blockbase/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-default"} /-->
-
-<!-- wp:spacer {"height":50} -->
-<div style="height:50px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/blockbase/parts/block-template-parts/post-meta-icons.html b/blockbase/parts/block-template-parts/post-meta-icons.html
deleted file mode 100644
index 372ce50720..0000000000
--- a/blockbase/parts/block-template-parts/post-meta-icons.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-    <!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-    <div class="wp-block-group post-meta">
-        <!-- wp:post-author {"showAvatar":false,"showBio":false,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}},"className":"is-style-post-author-icon"} /-->
-        <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}},"className":"is-style-post-date-icon"} /-->
-        <!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}},"className":"is-style-post-category-icon"} /-->
-        <!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}},"className":"is-style-post-tag-icon"} /-->
-    </div>
-    <!-- /wp:group -->
-</div>
-<!-- /wp:group -->
\ No newline at end of file
diff --git a/blockbase/parts/block-template-parts/post-meta.html b/blockbase/parts/block-template-parts/post-meta.html
deleted file mode 100644
index cbd1a6ec0a..0000000000
--- a/blockbase/parts/block-template-parts/post-meta.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-<div class="wp-block-group post-meta">
-    <!-- wp:post-author {"showAvatar":false,"showBio":false,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-</div>
-<!-- /wp:group -->
diff --git a/blockbase/templates/block-templates/404.html b/blockbase/templates/block-templates/404.html
deleted file mode 100644
index 91bb176ca6..0000000000
--- a/blockbase/templates/block-templates/404.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-group">
-	<!-- wp:pattern {"slug":"blockbase/404"} /-->
-	<!-- wp:search {"label":""} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/blockbase/templates/block-templates/archive.html b/blockbase/templates/block-templates/archive.html
deleted file mode 100644
index b26f563869..0000000000
--- a/blockbase/templates/block-templates/archive.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"100px"}}}} /-->
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/blockbase/templates/block-templates/blank.html b/blockbase/templates/block-templates/blank.html
deleted file mode 100644
index 120094756e..0000000000
--- a/blockbase/templates/block-templates/blank.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
\ No newline at end of file
diff --git a/blockbase/templates/block-templates/footer-only.html b/blockbase/templates/block-templates/footer-only.html
deleted file mode 100644
index 6e42f28a78..0000000000
--- a/blockbase/templates/block-templates/footer-only.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/blockbase/templates/block-templates/header-footer-only.html b/blockbase/templates/block-templates/header-footer-only.html
deleted file mode 100644
index 376b9c3bff..0000000000
--- a/blockbase/templates/block-templates/header-footer-only.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/blockbase/templates/block-templates/index.html b/blockbase/templates/block-templates/index.html
deleted file mode 100644
index ca5964f278..0000000000
--- a/blockbase/templates/block-templates/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/blockbase/templates/block-templates/page.html b/blockbase/templates/block-templates/page.html
deleted file mode 100644
index c8be3ed6b5..0000000000
--- a/blockbase/templates/block-templates/page.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-<!-- wp:post-title /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-<!-- wp:post-featured-image {"align":"full"} /-->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/blockbase/templates/block-templates/search.html b/blockbase/templates/block-templates/search.html
deleted file mode 100644
index 51ebe81f6e..0000000000
--- a/blockbase/templates/block-templates/search.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:query -->
-<div class="wp-block-query">
-<!-- wp:post-template -->
-
-	<!-- wp:post-title {"level":5,"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-
-<!-- /wp:post-template -->
-</div>
-<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/blockbase/templates/block-templates/single.html b/blockbase/templates/block-templates/single.html
deleted file mode 100644
index 7a903a73e4..0000000000
--- a/blockbase/templates/block-templates/single.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-<!-- wp:post-title /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-<!-- wp:post-featured-image {"align":"full"} /-->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-    <!-- wp:spacer {"height":60} -->
-    <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-    <!-- wp:post-comments /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-blue/parts/block-template-parts/footer.html b/geologist-blue/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/geologist-blue/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-blue/parts/block-template-parts/header.html b/geologist-blue/parts/block-template-parts/header.html
deleted file mode 100644
index b6959f8382..0000000000
--- a/geologist-blue/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-blue/templates/block-templates/archive.html b/geologist-blue/templates/block-templates/archive.html
deleted file mode 100644
index 53b71d3e3a..0000000000
--- a/geologist-blue/templates/block-templates/archive.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"160px"}}}} /-->
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-blue/templates/block-templates/index.html b/geologist-blue/templates/block-templates/index.html
deleted file mode 100644
index 61f28d7941..0000000000
--- a/geologist-blue/templates/block-templates/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-blue/templates/block-templates/page-without-title.html b/geologist-blue/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/geologist-blue/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-blue/templates/block-templates/page.html b/geologist-blue/templates/block-templates/page.html
deleted file mode 100644
index abd1fc3a44..0000000000
--- a/geologist-blue/templates/block-templates/page.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-blue/templates/block-templates/search.html b/geologist-blue/templates/block-templates/search.html
deleted file mode 100644
index fff4ed6d4d..0000000000
--- a/geologist-blue/templates/block-templates/search.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-blue/templates/block-templates/single.html b/geologist-blue/templates/block-templates/single.html
deleted file mode 100644
index cd579e0e38..0000000000
--- a/geologist-blue/templates/block-templates/single.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true},"style":{"spacing":{"padding":{"top":"30px","right":"20px","bottom":"0px","left":"20px"}}}} -->
-	<div class="wp-block-group" style="padding-top:30px;padding-right:20px;padding-bottom:0px;padding-left:20px">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-cream/parts/block-template-parts/footer.html b/geologist-cream/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/geologist-cream/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-cream/parts/block-template-parts/header.html b/geologist-cream/parts/block-template-parts/header.html
deleted file mode 100644
index b6959f8382..0000000000
--- a/geologist-cream/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-cream/templates/block-templates/archive.html b/geologist-cream/templates/block-templates/archive.html
deleted file mode 100644
index 53b71d3e3a..0000000000
--- a/geologist-cream/templates/block-templates/archive.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"160px"}}}} /-->
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-cream/templates/block-templates/index.html b/geologist-cream/templates/block-templates/index.html
deleted file mode 100644
index 61f28d7941..0000000000
--- a/geologist-cream/templates/block-templates/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-cream/templates/block-templates/page-without-title.html b/geologist-cream/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/geologist-cream/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-cream/templates/block-templates/page.html b/geologist-cream/templates/block-templates/page.html
deleted file mode 100644
index abd1fc3a44..0000000000
--- a/geologist-cream/templates/block-templates/page.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-cream/templates/block-templates/search.html b/geologist-cream/templates/block-templates/search.html
deleted file mode 100644
index fff4ed6d4d..0000000000
--- a/geologist-cream/templates/block-templates/search.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-cream/templates/block-templates/single.html b/geologist-cream/templates/block-templates/single.html
deleted file mode 100644
index cd579e0e38..0000000000
--- a/geologist-cream/templates/block-templates/single.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true},"style":{"spacing":{"padding":{"top":"30px","right":"20px","bottom":"0px","left":"20px"}}}} -->
-	<div class="wp-block-group" style="padding-top:30px;padding-right:20px;padding-bottom:0px;padding-left:20px">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-slate/parts/block-template-parts/footer.html b/geologist-slate/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/geologist-slate/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-slate/parts/block-template-parts/header.html b/geologist-slate/parts/block-template-parts/header.html
deleted file mode 100644
index b6959f8382..0000000000
--- a/geologist-slate/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-slate/templates/block-templates/archive.html b/geologist-slate/templates/block-templates/archive.html
deleted file mode 100644
index 53b71d3e3a..0000000000
--- a/geologist-slate/templates/block-templates/archive.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"160px"}}}} /-->
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-slate/templates/block-templates/index.html b/geologist-slate/templates/block-templates/index.html
deleted file mode 100644
index 61f28d7941..0000000000
--- a/geologist-slate/templates/block-templates/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-slate/templates/block-templates/page-without-title.html b/geologist-slate/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/geologist-slate/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-slate/templates/block-templates/page.html b/geologist-slate/templates/block-templates/page.html
deleted file mode 100644
index abd1fc3a44..0000000000
--- a/geologist-slate/templates/block-templates/page.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-slate/templates/block-templates/search.html b/geologist-slate/templates/block-templates/search.html
deleted file mode 100644
index fff4ed6d4d..0000000000
--- a/geologist-slate/templates/block-templates/search.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-slate/templates/block-templates/single.html b/geologist-slate/templates/block-templates/single.html
deleted file mode 100644
index cd579e0e38..0000000000
--- a/geologist-slate/templates/block-templates/single.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true},"style":{"spacing":{"padding":{"top":"30px","right":"20px","bottom":"0px","left":"20px"}}}} -->
-	<div class="wp-block-group" style="padding-top:30px;padding-right:20px;padding-bottom:0px;padding-left:20px">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-yellow/parts/block-template-parts/footer.html b/geologist-yellow/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/geologist-yellow/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-yellow/parts/block-template-parts/header.html b/geologist-yellow/parts/block-template-parts/header.html
deleted file mode 100644
index b6959f8382..0000000000
--- a/geologist-yellow/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-yellow/templates/block-templates/archive.html b/geologist-yellow/templates/block-templates/archive.html
deleted file mode 100644
index 53b71d3e3a..0000000000
--- a/geologist-yellow/templates/block-templates/archive.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"160px"}}}} /-->
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-yellow/templates/block-templates/index.html b/geologist-yellow/templates/block-templates/index.html
deleted file mode 100644
index 61f28d7941..0000000000
--- a/geologist-yellow/templates/block-templates/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-yellow/templates/block-templates/page-without-title.html b/geologist-yellow/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/geologist-yellow/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-yellow/templates/block-templates/page.html b/geologist-yellow/templates/block-templates/page.html
deleted file mode 100644
index abd1fc3a44..0000000000
--- a/geologist-yellow/templates/block-templates/page.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-yellow/templates/block-templates/search.html b/geologist-yellow/templates/block-templates/search.html
deleted file mode 100644
index fff4ed6d4d..0000000000
--- a/geologist-yellow/templates/block-templates/search.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist-yellow/templates/block-templates/single.html b/geologist-yellow/templates/block-templates/single.html
deleted file mode 100644
index cd579e0e38..0000000000
--- a/geologist-yellow/templates/block-templates/single.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true},"style":{"spacing":{"padding":{"top":"30px","right":"20px","bottom":"0px","left":"20px"}}}} -->
-	<div class="wp-block-group" style="padding-top:30px;padding-right:20px;padding-bottom:0px;padding-left:20px">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist/parts/block-template-parts/footer.html b/geologist/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/geologist/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist/parts/block-template-parts/header.html b/geologist/parts/block-template-parts/header.html
deleted file mode 100644
index b6959f8382..0000000000
--- a/geologist/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist/templates/block-templates/archive.html b/geologist/templates/block-templates/archive.html
deleted file mode 100644
index 53b71d3e3a..0000000000
--- a/geologist/templates/block-templates/archive.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"160px"}}}} /-->
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist/templates/block-templates/index.html b/geologist/templates/block-templates/index.html
deleted file mode 100644
index 61f28d7941..0000000000
--- a/geologist/templates/block-templates/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist/templates/block-templates/page-without-title.html b/geologist/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/geologist/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist/templates/block-templates/page.html b/geologist/templates/block-templates/page.html
deleted file mode 100644
index abd1fc3a44..0000000000
--- a/geologist/templates/block-templates/page.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist/templates/block-templates/search.html b/geologist/templates/block-templates/search.html
deleted file mode 100644
index fff4ed6d4d..0000000000
--- a/geologist/templates/block-templates/search.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/geologist/templates/block-templates/single.html b/geologist/templates/block-templates/single.html
deleted file mode 100644
index cd579e0e38..0000000000
--- a/geologist/templates/block-templates/single.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true},"style":{"spacing":{"padding":{"top":"30px","right":"20px","bottom":"0px","left":"20px"}}}} -->
-	<div class="wp-block-group" style="padding-top:30px;padding-right:20px;padding-bottom:0px;padding-left:20px">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/ibis/parts/block-template-parts/footer.html b/ibis/parts/block-template-parts/footer.html
deleted file mode 100644
index 6825ff4bfb..0000000000
--- a/ibis/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- wp:spacer {"height":30} -->
-<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:paragraph {"align":"center","fontSize":"small"} -->
-<p class="has-text-align-center has-small-font-size">Proudly powered by <a href="https://wordpress.org">WordPress</a></p>
-<!-- /wp:paragraph -->
-
-<!-- wp:spacer {"height":30} -->
-<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/ibis/parts/block-template-parts/header.html b/ibis/parts/block-template-parts/header.html
deleted file mode 100644
index edb9df247c..0000000000
--- a/ibis/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- wp:group {"align":"full","backgroundColor":"background"} -->
-<div class="wp-block-group alignfull has-background-background-color has-background"><div class="wp-block-group__inner-container"><!-- wp:spacer {"height":20} -->
-<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column {"width":33.33} -->
-<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:site-title {"style":{"typography":{"fontSize":32}}} /--></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"width":66.66} -->
-<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:navigation {"orientation":"horizontal","itemsJustification":"right"} -->
-<!-- wp:navigation-link {"label":"Home","url":"http://home"} /-->
-<!-- /wp:navigation --></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div></div>
-<!-- /wp:group -->
\ No newline at end of file
diff --git a/ibis/templates/block-templates/index.html b/ibis/templates/block-templates/index.html
deleted file mode 100644
index 2be5910efd..0000000000
--- a/ibis/templates/block-templates/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- wp:group {"align":"full","tagName":"header"} -->
-<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"header","theme":"ibis","align":"full"} /--></div></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"align":"full","className":"site-content","tagName":"main"} -->
-<div class="wp-block-group alignfull site-content"><div class="wp-block-group__inner-container"><!-- wp:query-loop -->
-<!-- wp:post-title /-->
-
-<!-- wp:post-content /-->
-<!-- /wp:query-loop --></div></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"align":"full","tagName":"footer"} -->
-<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"footer","theme":"ibis","align":"full"} /--></div></div>
-<!-- /wp:group -->
diff --git a/ibis/templates/block-templates/singular.html b/ibis/templates/block-templates/singular.html
deleted file mode 100644
index fe02bb42a6..0000000000
--- a/ibis/templates/block-templates/singular.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:group {"align":"full","tagName":"header"} -->
-<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"header","theme":"ibis","align":"full"} /--></div></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"align":"full","className":"site-content","tagName":"main"} -->
-<div class="wp-block-group alignfull site-content"><div class="wp-block-group__inner-container">
-<!-- wp:post-title /-->
-<!-- wp:post-content {"align":"full"} /--></div></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"align":"full","tagName":"footer"} -->
-<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"footer","theme":"ibis","align":"full"} /--></div></div>
-<!-- /wp:group -->
diff --git a/jackson/templates/block-templates/index.html b/jackson/templates/block-templates/index.html
deleted file mode 100644
index ca5964f278..0000000000
--- a/jackson/templates/block-templates/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/kingsley/parts/block-template-parts/footer.html b/kingsley/parts/block-template-parts/footer.html
deleted file mode 100644
index 45e7b2ce8d..0000000000
--- a/kingsley/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/footer-small"} /-->
\ No newline at end of file
diff --git a/kingsley/templates/block-templates/index.html b/kingsley/templates/block-templates/index.html
deleted file mode 100644
index ca5964f278..0000000000
--- a/kingsley/templates/block-templates/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/mayland-blocks/parts/block-template-parts/footer.html b/mayland-blocks/parts/block-template-parts/footer.html
deleted file mode 100644
index 5e25bfef66..0000000000
--- a/mayland-blocks/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/footer-primary"} /-->
\ No newline at end of file
diff --git a/mayland-blocks/parts/block-template-parts/header.html b/mayland-blocks/parts/block-template-parts/header.html
deleted file mode 100644
index 6c44d111b6..0000000000
--- a/mayland-blocks/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-default"} /-->
-
-<!-- wp:spacer {"height":54} -->
-<div style="height:54px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/mayland-blocks/parts/block-template-parts/post-meta.html b/mayland-blocks/parts/block-template-parts/post-meta.html
deleted file mode 100644
index 17515dfd8d..0000000000
--- a/mayland-blocks/parts/block-template-parts/post-meta.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:group {"textColor":"gray","className":"post-meta","layout":{"type":"flex"}} -->
-<div class="post-meta wp-block-group post-meta has-gray-color has-text-color"><!-- wp:post-author {"showAvatar":false,"showBio":false,"fontSize":"small"} /-->
-
-<!-- wp:post-date {"fontSize":"small","isLink":true} /-->
-
-<!-- wp:post-terms {"term":"category","fontSize":"small"} /-->
-
-<!-- wp:post-terms {"term": "post_tag", "fontSize":"small"} /--></div>
-<!-- /wp:group -->
diff --git a/mayland-blocks/templates/block-templates/archive.html b/mayland-blocks/templates/block-templates/archive.html
deleted file mode 100644
index 8ec638a87b..0000000000
--- a/mayland-blocks/templates/block-templates/archive.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-group">
-
-<!-- wp:query {"query":{"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":""}} -->
-<div class="wp-block-query">
-<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"120px"}}}} /-->
-<!-- wp:post-template -->
-<!-- wp:post-title {"isLink":true} /-->
-
-<!-- wp:post-excerpt /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-<!-- wp:spacer -->
-<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- /wp:post-template -->
-</div>
-<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->
diff --git a/mayland-blocks/templates/block-templates/front-page.html b/mayland-blocks/templates/block-templates/front-page.html
deleted file mode 100644
index 2da844e962..0000000000
--- a/mayland-blocks/templates/block-templates/front-page.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->
diff --git a/mayland-blocks/templates/block-templates/index.html b/mayland-blocks/templates/block-templates/index.html
deleted file mode 100644
index 832feb4fda..0000000000
--- a/mayland-blocks/templates/block-templates/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-group">
-
-<!-- wp:query {"query":{"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":""}} -->
-<div class="wp-block-query">
-<!-- wp:post-template -->
-<!-- wp:post-title {"isLink":true} /-->
-
-<!-- wp:post-excerpt /-->
-
-<!-- wp:group {"style":{"spacing":{"margin":{"top":"20px"}}}} -->
-<div class="wp-block-group" style="margin-top:20px;">
-    <!-- wp:template-part {"slug":"post-meta-icons"} /-->
-</div>
-<!-- /wp:group -->
-<!-- wp:spacer -->
-<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- /wp:post-template -->
-</div>
-<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->
diff --git a/mayland-blocks/templates/block-templates/page.html b/mayland-blocks/templates/block-templates/page.html
deleted file mode 100644
index 3b476c18ea..0000000000
--- a/mayland-blocks/templates/block-templates/page.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-group">
-
-<!-- wp:post-title {"level":1} /-->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->
diff --git a/mayland-blocks/templates/block-templates/single.html b/mayland-blocks/templates/block-templates/single.html
deleted file mode 100644
index b02abbe6a3..0000000000
--- a/mayland-blocks/templates/block-templates/single.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-group">
-<!-- wp:post-title {"level":1} /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-<!-- wp:spacer {"height":16} -->
-<div style="height:16px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-
-<!-- wp:spacer {"height":16} -->
-<div style="height:16px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-<!-- wp:spacer {"height":64} -->
-<div style="height:64px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:post-author {"showAvatar":false,"showBio":true,"byline":"Published by","fontSize":"huge"} /-->
-
-<!-- wp:spacer {"height":32} -->
-<div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:post-comments /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->
diff --git a/quadrat-black/parts/block-template-parts/footer.html b/quadrat-black/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/quadrat-black/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-black/parts/block-template-parts/header.html b/quadrat-black/parts/block-template-parts/header.html
deleted file mode 100644
index 6cad8ba4b5..0000000000
--- a/quadrat-black/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":136} -->
-<div style="height:136px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-black/templates/block-templates/archive.html b/quadrat-black/templates/block-templates/archive.html
deleted file mode 100644
index 8ee1068603..0000000000
--- a/quadrat-black/templates/block-templates/archive.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","align":"center","style":{"spacing":{"margin":{"bottom":"120px"}}}} /-->
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-black/templates/block-templates/index.html b/quadrat-black/templates/block-templates/index.html
deleted file mode 100644
index 21c4de5cc8..0000000000
--- a/quadrat-black/templates/block-templates/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-black/templates/block-templates/page-without-title.html b/quadrat-black/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/quadrat-black/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-black/templates/block-templates/page.html b/quadrat-black/templates/block-templates/page.html
deleted file mode 100644
index e06500e35b..0000000000
--- a/quadrat-black/templates/block-templates/page.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-	<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-	<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-black/templates/block-templates/search.html b/quadrat-black/templates/block-templates/search.html
deleted file mode 100644
index 0a849e1459..0000000000
--- a/quadrat-black/templates/block-templates/search.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-numbers /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-black/templates/block-templates/single.html b/quadrat-black/templates/block-templates/single.html
deleted file mode 100644
index 846e6299d3..0000000000
--- a/quadrat-black/templates/block-templates/single.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-	<div class="wp-block-group post-meta">
-		<!-- wp:post-date {"textAlign":"center","isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-	<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-		<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-		<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-green/parts/block-template-parts/footer.html b/quadrat-green/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/quadrat-green/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-green/parts/block-template-parts/header.html b/quadrat-green/parts/block-template-parts/header.html
deleted file mode 100644
index 6cad8ba4b5..0000000000
--- a/quadrat-green/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":136} -->
-<div style="height:136px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-green/templates/block-templates/archive.html b/quadrat-green/templates/block-templates/archive.html
deleted file mode 100644
index 8ee1068603..0000000000
--- a/quadrat-green/templates/block-templates/archive.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","align":"center","style":{"spacing":{"margin":{"bottom":"120px"}}}} /-->
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-green/templates/block-templates/index.html b/quadrat-green/templates/block-templates/index.html
deleted file mode 100644
index 21c4de5cc8..0000000000
--- a/quadrat-green/templates/block-templates/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-green/templates/block-templates/page-without-title.html b/quadrat-green/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/quadrat-green/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-green/templates/block-templates/page.html b/quadrat-green/templates/block-templates/page.html
deleted file mode 100644
index e06500e35b..0000000000
--- a/quadrat-green/templates/block-templates/page.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-	<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-	<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-green/templates/block-templates/search.html b/quadrat-green/templates/block-templates/search.html
deleted file mode 100644
index 0a849e1459..0000000000
--- a/quadrat-green/templates/block-templates/search.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-numbers /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-green/templates/block-templates/single.html b/quadrat-green/templates/block-templates/single.html
deleted file mode 100644
index 846e6299d3..0000000000
--- a/quadrat-green/templates/block-templates/single.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-	<div class="wp-block-group post-meta">
-		<!-- wp:post-date {"textAlign":"center","isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-	<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-		<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-		<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-red/parts/block-template-parts/footer.html b/quadrat-red/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/quadrat-red/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-red/parts/block-template-parts/header.html b/quadrat-red/parts/block-template-parts/header.html
deleted file mode 100644
index 6cad8ba4b5..0000000000
--- a/quadrat-red/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":136} -->
-<div style="height:136px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-red/templates/block-templates/archive.html b/quadrat-red/templates/block-templates/archive.html
deleted file mode 100644
index 8ee1068603..0000000000
--- a/quadrat-red/templates/block-templates/archive.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","align":"center","style":{"spacing":{"margin":{"bottom":"120px"}}}} /-->
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-red/templates/block-templates/index.html b/quadrat-red/templates/block-templates/index.html
deleted file mode 100644
index 21c4de5cc8..0000000000
--- a/quadrat-red/templates/block-templates/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-red/templates/block-templates/page-without-title.html b/quadrat-red/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/quadrat-red/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-red/templates/block-templates/page.html b/quadrat-red/templates/block-templates/page.html
deleted file mode 100644
index e06500e35b..0000000000
--- a/quadrat-red/templates/block-templates/page.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-	<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-	<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-red/templates/block-templates/search.html b/quadrat-red/templates/block-templates/search.html
deleted file mode 100644
index 0a849e1459..0000000000
--- a/quadrat-red/templates/block-templates/search.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-numbers /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-red/templates/block-templates/single.html b/quadrat-red/templates/block-templates/single.html
deleted file mode 100644
index 846e6299d3..0000000000
--- a/quadrat-red/templates/block-templates/single.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-	<div class="wp-block-group post-meta">
-		<!-- wp:post-date {"textAlign":"center","isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-	<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-		<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-		<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-white/parts/block-template-parts/footer.html b/quadrat-white/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/quadrat-white/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-white/parts/block-template-parts/header.html b/quadrat-white/parts/block-template-parts/header.html
deleted file mode 100644
index 6cad8ba4b5..0000000000
--- a/quadrat-white/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":136} -->
-<div style="height:136px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-white/templates/block-templates/archive.html b/quadrat-white/templates/block-templates/archive.html
deleted file mode 100644
index 8ee1068603..0000000000
--- a/quadrat-white/templates/block-templates/archive.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","align":"center","style":{"spacing":{"margin":{"bottom":"120px"}}}} /-->
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-white/templates/block-templates/index.html b/quadrat-white/templates/block-templates/index.html
deleted file mode 100644
index 21c4de5cc8..0000000000
--- a/quadrat-white/templates/block-templates/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-white/templates/block-templates/page-without-title.html b/quadrat-white/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/quadrat-white/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-white/templates/block-templates/page.html b/quadrat-white/templates/block-templates/page.html
deleted file mode 100644
index e06500e35b..0000000000
--- a/quadrat-white/templates/block-templates/page.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-	<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-	<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-white/templates/block-templates/search.html b/quadrat-white/templates/block-templates/search.html
deleted file mode 100644
index 0a849e1459..0000000000
--- a/quadrat-white/templates/block-templates/search.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-numbers /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-white/templates/block-templates/single.html b/quadrat-white/templates/block-templates/single.html
deleted file mode 100644
index 846e6299d3..0000000000
--- a/quadrat-white/templates/block-templates/single.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-	<div class="wp-block-group post-meta">
-		<!-- wp:post-date {"textAlign":"center","isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-	<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-		<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-		<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-yellow/parts/block-template-parts/footer.html b/quadrat-yellow/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/quadrat-yellow/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-yellow/parts/block-template-parts/header.html b/quadrat-yellow/parts/block-template-parts/header.html
deleted file mode 100644
index 6cad8ba4b5..0000000000
--- a/quadrat-yellow/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":136} -->
-<div style="height:136px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-yellow/templates/block-templates/archive.html b/quadrat-yellow/templates/block-templates/archive.html
deleted file mode 100644
index 8ee1068603..0000000000
--- a/quadrat-yellow/templates/block-templates/archive.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","align":"center","style":{"spacing":{"margin":{"bottom":"120px"}}}} /-->
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-yellow/templates/block-templates/index.html b/quadrat-yellow/templates/block-templates/index.html
deleted file mode 100644
index 21c4de5cc8..0000000000
--- a/quadrat-yellow/templates/block-templates/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-yellow/templates/block-templates/page-without-title.html b/quadrat-yellow/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/quadrat-yellow/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-yellow/templates/block-templates/page.html b/quadrat-yellow/templates/block-templates/page.html
deleted file mode 100644
index e06500e35b..0000000000
--- a/quadrat-yellow/templates/block-templates/page.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-	<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-	<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-yellow/templates/block-templates/search.html b/quadrat-yellow/templates/block-templates/search.html
deleted file mode 100644
index 0a849e1459..0000000000
--- a/quadrat-yellow/templates/block-templates/search.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-numbers /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat-yellow/templates/block-templates/single.html b/quadrat-yellow/templates/block-templates/single.html
deleted file mode 100644
index 846e6299d3..0000000000
--- a/quadrat-yellow/templates/block-templates/single.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-	<div class="wp-block-group post-meta">
-		<!-- wp:post-date {"textAlign":"center","isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-	<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-		<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-		<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat/parts/block-template-parts/footer.html b/quadrat/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/quadrat/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat/parts/block-template-parts/header.html b/quadrat/parts/block-template-parts/header.html
deleted file mode 100644
index 6cad8ba4b5..0000000000
--- a/quadrat/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":136} -->
-<div style="height:136px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat/templates/block-templates/archive.html b/quadrat/templates/block-templates/archive.html
deleted file mode 100644
index 8ee1068603..0000000000
--- a/quadrat/templates/block-templates/archive.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","align":"center","style":{"spacing":{"margin":{"bottom":"120px"}}}} /-->
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat/templates/block-templates/index.html b/quadrat/templates/block-templates/index.html
deleted file mode 100644
index 21c4de5cc8..0000000000
--- a/quadrat/templates/block-templates/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template {"align":"wide"} -->
-		<!-- wp:group -->
-		<div class="wp-block-group">
-		<!-- wp:post-date {"isLink":true,"textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"center", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:spacer {"height":60} -->
-		<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat/templates/block-templates/page-without-title.html b/quadrat/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7b041f8f0..0000000000
--- a/quadrat/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat/templates/block-templates/page.html b/quadrat/templates/block-templates/page.html
deleted file mode 100644
index e06500e35b..0000000000
--- a/quadrat/templates/block-templates/page.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-	<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-	<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat/templates/block-templates/search.html b/quadrat/templates/block-templates/search.html
deleted file mode 100644
index 0a849e1459..0000000000
--- a/quadrat/templates/block-templates/search.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-
-	<!-- wp:query-pagination {"align":"wide","paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-numbers /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/quadrat/templates/block-templates/single.html b/quadrat/templates/block-templates/single.html
deleted file mode 100644
index 846e6299d3..0000000000
--- a/quadrat/templates/block-templates/single.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-	<div class="wp-block-group post-meta">
-		<!-- wp:post-date {"textAlign":"center","isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}},"layout":{"inherit":true}} -->
-	<div class="wp-block-group" style="margin-bottom:calc(2 * var(--wp--style--block-gap))">
-		<!-- wp:post-title {"textAlign":"center","level":1,"align":"wide"} /-->
-		<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/russell/parts/block-template-parts/header.html b/russell/parts/block-template-parts/header.html
deleted file mode 100644
index 4ded779625..0000000000
--- a/russell/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-default"} /-->
-
-<!-- wp:spacer {"height":10} -->
-<div style="height:10px" aria-hidden="true" class="wp-block-spacer no-gap-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/russell/parts/block-template-parts/post-meta.html b/russell/parts/block-template-parts/post-meta.html
deleted file mode 100644
index cbd1a6ec0a..0000000000
--- a/russell/parts/block-template-parts/post-meta.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-<div class="wp-block-group post-meta">
-    <!-- wp:post-author {"showAvatar":false,"showBio":false,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-</div>
-<!-- /wp:group -->
diff --git a/russell/templates/block-templates/archive.html b/russell/templates/block-templates/archive.html
deleted file mode 100644
index 1254984261..0000000000
--- a/russell/templates/block-templates/archive.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"100px"}}}} /-->
-	<!-- wp:post-template -->
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-		<!-- wp:spacer {"height":40} -->
-		<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-	</div>
-	<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:query-pagination -->
-			<!-- wp:query-pagination-previous /-->
-
-			<!-- wp:query-pagination-numbers /-->
-
-			<!-- wp:query-pagination-next /-->
-		<!-- /wp:query-pagination -->
-		</div>
-		<!-- /wp:group -->
-	</main>
-	<!-- /wp:query -->
-
-	<!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container"} /-->
diff --git a/russell/templates/block-templates/blank.html b/russell/templates/block-templates/blank.html
deleted file mode 100644
index 120094756e..0000000000
--- a/russell/templates/block-templates/blank.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
\ No newline at end of file
diff --git a/russell/templates/block-templates/header-footer-only.html b/russell/templates/block-templates/header-footer-only.html
deleted file mode 100644
index 376b9c3bff..0000000000
--- a/russell/templates/block-templates/header-footer-only.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/russell/templates/block-templates/index.html b/russell/templates/block-templates/index.html
deleted file mode 100644
index 6ae6b82f2b..0000000000
--- a/russell/templates/block-templates/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/russell/templates/block-templates/page.html b/russell/templates/block-templates/page.html
deleted file mode 100644
index c8be3ed6b5..0000000000
--- a/russell/templates/block-templates/page.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-<!-- wp:post-title /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-<!-- wp:post-featured-image {"align":"full"} /-->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/russell/templates/block-templates/search.html b/russell/templates/block-templates/search.html
deleted file mode 100644
index 51ebe81f6e..0000000000
--- a/russell/templates/block-templates/search.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:query -->
-<div class="wp-block-query">
-<!-- wp:post-template -->
-
-	<!-- wp:post-title {"level":5,"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-
-<!-- /wp:post-template -->
-</div>
-<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/russell/templates/block-templates/single.html b/russell/templates/block-templates/single.html
deleted file mode 100644
index 7a903a73e4..0000000000
--- a/russell/templates/block-templates/single.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-<!-- wp:post-title /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-<!-- wp:post-featured-image {"align":"full"} /-->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-    <!-- wp:spacer {"height":60} -->
-    <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-    <!-- wp:post-comments /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/seedlet-blocks/parts/block-template-parts/footer.html b/seedlet-blocks/parts/block-template-parts/footer.html
deleted file mode 100644
index 3298034279..0000000000
--- a/seedlet-blocks/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/footer-left"} /-->
\ No newline at end of file
diff --git a/seedlet-blocks/parts/block-template-parts/header.html b/seedlet-blocks/parts/block-template-parts/header.html
deleted file mode 100644
index 1ade6c1d9b..0000000000
--- a/seedlet-blocks/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-centered"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/seedlet-blocks/parts/block-template-parts/post-meta.html b/seedlet-blocks/parts/block-template-parts/post-meta.html
deleted file mode 100644
index c01b87a37b..0000000000
--- a/seedlet-blocks/parts/block-template-parts/post-meta.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:separator {"className":"is-style-wide"} -->
-<hr class="wp-block-separator is-style-wide"/>
-<!-- /wp:separator -->
-
-<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-<div class="wp-block-group post-meta"><!-- wp:post-author {"showAvatar":false,"showBio":false,"fontSize":"14px"} /-->
-
-<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-
-<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-
-<!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /--></div>
-<!-- /wp:group -->
diff --git a/seedlet-blocks/templates/block-templates/archive.html b/seedlet-blocks/templates/block-templates/archive.html
deleted file mode 100644
index ed76cc925a..0000000000
--- a/seedlet-blocks/templates/block-templates/archive.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"120px"}}}} /-->
-<!-- wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-title {"isLink":true} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- /wp:post-template -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container","align":"full"} /-->
diff --git a/seedlet-blocks/templates/block-templates/index.html b/seedlet-blocks/templates/block-templates/index.html
deleted file mode 100644
index b1c3eeefa3..0000000000
--- a/seedlet-blocks/templates/block-templates/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-title {"isLink":true} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- /wp:post-template -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/seedlet-blocks/templates/block-templates/page.html b/seedlet-blocks/templates/block-templates/page.html
deleted file mode 100644
index afc694a044..0000000000
--- a/seedlet-blocks/templates/block-templates/page.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-group"><!-- wp:post-title /--></main>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-<!-- wp:group {"className":"author-bio","layout":{"inherit":true}} -->
-<div class="wp-block-group author-bio"><!-- wp:post-author {"showAvatar":false,"showBio":true,"byline":"Published by","fontSize":"huge"} /-->
-
-<!-- wp:columns {"className":"wp-block-post-navigation-links"} -->
-<div class="wp-block-columns wp-block-post-navigation-links"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:paragraph {"className":"wp-block-post-navigation-link-byline"} -->
-<p class="wp-block-post-navigation-link-byline">Previous Post</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:post-navigation-link {"type":"previous","showTitle":true} /--></div>
-<!-- /wp:column -->
-
-<!-- wp:column -->
-<div class="wp-block-column"><!-- wp:paragraph {"align":"right","className":"wp-block-post-navigation-link-byline"} -->
-<p class="has-text-align-right wp-block-post-navigation-link-byline">Next Post</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:post-navigation-link {"textAlign":"right","showTitle":true} /--></div>
-<!-- /wp:column --></div>
-<!-- wp:spacer {"height":50} -->
-<div style="height:50px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- wp:post-comments /-->
-<!-- wp:spacer {"height":25} -->
-<div style="height:25px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- /wp:columns --></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/seedlet-blocks/templates/block-templates/single.html b/seedlet-blocks/templates/block-templates/single.html
deleted file mode 100644
index afc694a044..0000000000
--- a/seedlet-blocks/templates/block-templates/single.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-group"><!-- wp:post-title /--></main>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-<!-- wp:group {"className":"author-bio","layout":{"inherit":true}} -->
-<div class="wp-block-group author-bio"><!-- wp:post-author {"showAvatar":false,"showBio":true,"byline":"Published by","fontSize":"huge"} /-->
-
-<!-- wp:columns {"className":"wp-block-post-navigation-links"} -->
-<div class="wp-block-columns wp-block-post-navigation-links"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:paragraph {"className":"wp-block-post-navigation-link-byline"} -->
-<p class="wp-block-post-navigation-link-byline">Previous Post</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:post-navigation-link {"type":"previous","showTitle":true} /--></div>
-<!-- /wp:column -->
-
-<!-- wp:column -->
-<div class="wp-block-column"><!-- wp:paragraph {"align":"right","className":"wp-block-post-navigation-link-byline"} -->
-<p class="has-text-align-right wp-block-post-navigation-link-byline">Next Post</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:post-navigation-link {"textAlign":"right","showTitle":true} /--></div>
-<!-- /wp:column --></div>
-<!-- wp:spacer {"height":50} -->
-<div style="height:50px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- wp:post-comments /-->
-<!-- wp:spacer {"height":25} -->
-<div style="height:25px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- /wp:columns --></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/skatepark/parts/block-template-parts/footer.html b/skatepark/parts/block-template-parts/footer.html
deleted file mode 100644
index 0430c5ef4a..0000000000
--- a/skatepark/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/footer-columns"} /-->
\ No newline at end of file
diff --git a/skatepark/parts/block-template-parts/header.html b/skatepark/parts/block-template-parts/header.html
deleted file mode 100644
index 42a4741715..0000000000
--- a/skatepark/parts/block-template-parts/header.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-wide"} /-->
\ No newline at end of file
diff --git a/skatepark/templates/block-templates/404.html b/skatepark/templates/block-templates/404.html
deleted file mode 100644
index 32b46813a3..0000000000
--- a/skatepark/templates/block-templates/404.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":170} -->
-<div style="height:170px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-group">
-	<!-- wp:pattern {"slug":"blockbase/404"} /-->
-	<!-- wp:search {"label":""} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/skatepark/templates/block-templates/archive.html b/skatepark/templates/block-templates/archive.html
deleted file mode 100644
index 4cc3f53989..0000000000
--- a/skatepark/templates/block-templates/archive.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"4em","bottom":"2.5em"}}}} -->
-<main class="wp-block-group" style="padding-top:4em;padding-bottom:2.5em">
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:query-title {"type":"archive","align":"wide"} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:pattern {"slug":"skatepark/blog-posts"} /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/skatepark/templates/block-templates/index.html b/skatepark/templates/block-templates/index.html
deleted file mode 100644
index 3cec965f3c..0000000000
--- a/skatepark/templates/block-templates/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"4em","bottom":"2.5em"}}}} -->
-<main class="wp-block-group" style="padding-top:4em;padding-bottom:2.5em">
-	
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:pattern {"slug":"skatepark/blog-posts"} /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/skatepark/templates/block-templates/page.html b/skatepark/templates/block-templates/page.html
deleted file mode 100644
index 18ac8a5e6d..0000000000
--- a/skatepark/templates/block-templates/page.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true},"style":{"spacing":{"padding":{"top":"4em"}}}} -->
-<div class="wp-block-group" style="padding-top:4em"><!-- wp:post-title {"level":1,"align":"wide"} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"bottom":"5em"}}}} -->
-<main class="wp-block-group" style="padding-bottom:5em">
-
-<!-- wp:group {"align":"full"} -->
-<div class="wp-block-group alignfull"><!-- wp:post-featured-image {"align":"full"} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/skatepark/templates/block-templates/search.html b/skatepark/templates/block-templates/search.html
deleted file mode 100644
index 576e96105c..0000000000
--- a/skatepark/templates/block-templates/search.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:search {"label":""} /-->
-
-	<!-- wp:spacer {"height":45} -->
-	<div style="height:45px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":3,"isLink":true,"style":{"typography":{"fontStyle":"normal","fontWeight":"800"}},"fontSize":"huge","style":{"spacing":{"margin":{"top":"1em"}}}} /-->
-		<!-- wp:post-excerpt {"style":{"spacing":{"padding":{"bottom":"2em"}}}} /-->
-		<!-- wp:separator {"className":"is-style-wide"} -->
-			<hr class="wp-block-separator is-style-wide"/>
-		<!-- /wp:separator -->
-
-	<!-- /wp:post-template -->
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/skatepark/templates/block-templates/single.html b/skatepark/templates/block-templates/single.html
deleted file mode 100644
index 229bee5f02..0000000000
--- a/skatepark/templates/block-templates/single.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true},"style":{"spacing":{"padding":{"top":"4em"}}}} -->
-<div class="wp-block-group" style="padding-top:4em"><!-- wp:post-title {"level":1,"align":"wide"} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:group {"align":"full"} -->
-<div class="wp-block-group alignfull">
-<!-- wp:post-featured-image {"align":"full", "style":{"spacing":{"margin":{"bottom":"calc(2*var(--wp--style--block-gap) + 3*var(--wp--custom--gap--horizontal))"}}}} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"5em","bottom":"5em"}}},"layout":{"inherit":true}} -->
-<div class="wp-block-group" style="padding-top:5em;padding-bottom:5em">
-<!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column {"width":"58%"} -->
-	<div class="wp-block-column" style="flex-basis:58%"><!-- wp:separator {"className":"is-style-wide"} -->
-	<hr class="wp-block-separator is-style-wide"/>
-	<!-- /wp:separator -->
-	<!-- wp:post-author {"showBio":true} /-->
-	</div>
-	<!-- /wp:column -->
-
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:separator {"className":"is-style-wide"} -->
-	<hr class="wp-block-separator is-style-wide"/>
-	<!-- /wp:separator -->
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-	<div class="wp-block-group post-meta">
-    <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}},"className":"is-style-post-date-icon"} /-->
-	<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}},"className":"is-style-post-category-icon"} /-->
-    <!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}},"className":"is-style-post-tag-icon"} /--></div>
-	<!-- /wp:group -->
-
-	</div>
-	<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
-<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:pattern {"slug":"skatepark/post-navigation-labeled"} /-->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/theme-utils.mjs b/theme-utils.mjs
index 5cff9469f6..10e9e3b211 100644
--- a/theme-utils.mjs
+++ b/theme-utils.mjs
@@ -606,12 +606,12 @@ async function pushChangesToSandbox() {
 		`, true);
 	}
 
-	if(changedFiles.length > 0) {
-		console.log('pushing changed files to sandbox:', changedFiles);
-		await executeCommand(`
-			rsync -avR --no-p --no-times --exclude-from='.sandbox-ignore' ${changedFiles.join(' ')} wpcom-sandbox:${sandboxPublicThemesFolder}/
-		`, true);
-	}
+	// if(changedFiles.length > 0) {
+	// 	console.log('pushing changed files to sandbox:', changedFiles);
+	// 	await executeCommand(`
+	// 		rsync -avR --no-p --no-times --exclude-from='.sandbox-ignore' ${changedFiles.join(' ')} wpcom-sandbox:${sandboxPublicThemesFolder}/
+	// 	`, true);
+	// }
 }
 
 /*
@@ -620,7 +620,7 @@ async function pushChangesToSandbox() {
 */
 async function getComittedChangesSinceHash(hash) {
 	const directoriesToIgnoreString = directoriesToIgnore.map( directory => ':^' + directory ).join(' ');
-	let comittedChanges = await executeCommand(`git diff ${hash} HEAD --name-only -- . ${directoriesToIgnoreString}`);
+	let comittedChanges = await executeCommand(`git diff ${hash} HEAD --name-only --diff-filter=AM -- . ${directoriesToIgnoreString}`);
 	comittedChanges = comittedChanges.replace(/\r?\n|\r/g, " ").split(" ");
 
 	let uncomittedChanges = await executeCommand(`git diff HEAD --name-only -- . ${directoriesToIgnoreString}`);
@@ -636,7 +636,7 @@ async function getComittedChangesSinceHash(hash) {
 async function getDeletedFilesSince(hash){
 
 	let deletedSinceHash = await executeCommand(`
-		git log --format=format:"" --name-only -M100% --diff-filter=D ${hash}..HEAD
+		git log --format=format:"" --name-only -M100% --diff-filter=DR ${hash}..HEAD
 	`);
 	deletedSinceHash = deletedSinceHash.replace(/\r?\n|\r/g, " ").trim().split(" ");
 
diff --git a/videomaker-white/parts/block-template-parts/footer.html b/videomaker-white/parts/block-template-parts/footer.html
deleted file mode 100644
index 2326858ac3..0000000000
--- a/videomaker-white/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- wp:spacer {"height":140} -->
-<div style="height:140px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- wp:pattern {"slug":"blockbase/footer-vertical-menu"} /-->
\ No newline at end of file
diff --git a/videomaker-white/parts/block-template-parts/header.html b/videomaker-white/parts/block-template-parts/header.html
deleted file mode 100644
index e75329d08f..0000000000
--- a/videomaker-white/parts/block-template-parts/header.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-minimal"} /-->
\ No newline at end of file
diff --git a/videomaker-white/templates/block-templates/404.html b/videomaker-white/templates/block-templates/404.html
deleted file mode 100644
index 6d6603ca1e..0000000000
--- a/videomaker-white/templates/block-templates/404.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:pattern {"slug":"blockbase/404"} /-->
-	<!-- wp:search {"label":""} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker-white/templates/block-templates/archive.html b/videomaker-white/templates/block-templates/archive.html
deleted file mode 100644
index dfbf05868e..0000000000
--- a/videomaker-white/templates/block-templates/archive.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header","layout":{"inherit":true}} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"100px"}}}} /-->
-
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true,"style":{"spacing":{"margin":{"bottom":"45px"}}}} /-->
-	<!-- wp:post-featured-image {"isLink":"true","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2.5 * var(--wp--style--block-gap,1em))"}}}} /-->
-	<!-- wp:post-excerpt /-->
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--style--block-gap,1em)","bottom":"var(--wp--style--block-gap,1em)"}}}} -->
-	<div class="wp-block-group post-meta" style="padding-top:var(--wp--style--block-gap,1em);padding-bottom:var(--wp--style--block-gap,1em)">
-		<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:spacer {"height":60} -->
-	<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-
-	<div class="wp-block-group">
-	<!-- wp:query-pagination {"paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container"} /-->
diff --git a/videomaker-white/templates/block-templates/header-footer-only.html b/videomaker-white/templates/block-templates/header-footer-only.html
deleted file mode 100644
index ffbd349ec0..0000000000
--- a/videomaker-white/templates/block-templates/header-footer-only.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"0"}}}} -->
-<main class="wp-block-group" style="margin-top:0">
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker-white/templates/block-templates/index.html b/videomaker-white/templates/block-templates/index.html
deleted file mode 100644
index 0df8224436..0000000000
--- a/videomaker-white/templates/block-templates/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true,"style":{"spacing":{"margin":{"bottom":"45px"}}}} /-->
-	<!-- wp:post-featured-image {"isLink":"true","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2.5 * var(--wp--style--block-gap,1em))"}}}} /-->
-	<!-- wp:post-excerpt /-->
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--style--block-gap,1em)","bottom":"var(--wp--style--block-gap,1em)"}}}} -->
-	<div class="wp-block-group post-meta" style="padding-top:var(--wp--style--block-gap,1em);padding-bottom:var(--wp--style--block-gap,1em)">
-		<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:spacer {"height":60} -->
-	<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-
-	<div class="wp-block-group">
-	<!-- wp:query-pagination {"paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker-white/templates/block-templates/page.html b/videomaker-white/templates/block-templates/page.html
deleted file mode 100644
index 393fadfd5e..0000000000
--- a/videomaker-white/templates/block-templates/page.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title /-->
-		<!-- wp:group {"className":"post-meta","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--style--block-gap,1em)","bottom":"var(--wp--style--block-gap,1em)"}}}} -->
-		<div class="wp-block-group post-meta" style="padding-top:var(--wp--style--block-gap,1em);padding-bottom:var(--wp--style--block-gap,1em)">
-			<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-			<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:group {"className":"post-tags-container","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2 * var(--wp--style--block-gap,1em))"}}}} -->
-		<div class="wp-block-group post-tags-container" style="margin-top:var(--wp--style--block-gap,1em);margin-bottom:calc(2 * var(--wp--style--block-gap,1em))">
-			<!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:post-featured-image {"align":"full","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2 * var(--wp--style--block-gap,1em))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-comments /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker-white/templates/block-templates/search.html b/videomaker-white/templates/block-templates/search.html
deleted file mode 100644
index a323e6bb4b..0000000000
--- a/videomaker-white/templates/block-templates/search.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:query -->
-<div class="wp-block-query">
-<!-- wp:post-template -->
-
-	<!-- wp:post-title {"level":5,"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-
-<!-- /wp:post-template -->
-</div>
-<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker-white/templates/block-templates/single.html b/videomaker-white/templates/block-templates/single.html
deleted file mode 100644
index f2cacf5f5c..0000000000
--- a/videomaker-white/templates/block-templates/single.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-    <!-- wp:group {"layout":{"inherit":true}} -->
-    <div class="wp-block-group">
-		<!-- wp:post-title /-->
-		<!-- wp:group {"className":"post-meta","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--style--block-gap,1em)","bottom":"var(--wp--style--block-gap,1em)"}}}} -->
-		<div class="wp-block-group post-meta" style="padding-top:var(--wp--style--block-gap,1em);padding-bottom:var(--wp--style--block-gap,1em)">
-			<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-			<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:post-featured-image {"align":"full","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2 * var(--wp--style--block-gap,1em))"}}}} /-->
-		<!-- wp:group {"className":"post-tags-container","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2 * var(--wp--style--block-gap,1em))"}}}} -->
-		<div class="wp-block-group post-tags-container" style="margin-top:var(--wp--style--block-gap,1em);margin-bottom:calc(2 * var(--wp--style--block-gap,1em))">
-			<!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-
-    <!-- wp:group {"align":"wide","layout":{"type":"flex","justifyContent":"space-between"}} -->
-    <div class="wp-block-group alignwide">
-        <!-- wp:post-navigation-link {"type":"previous"} /-->
-        <!-- wp:post-navigation-link /-->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:spacer {"height":60} -->
-    <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-    <!-- wp:post-comments /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker/parts/block-template-parts/footer.html b/videomaker/parts/block-template-parts/footer.html
deleted file mode 100644
index 2326858ac3..0000000000
--- a/videomaker/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- wp:spacer {"height":140} -->
-<div style="height:140px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-<!-- wp:pattern {"slug":"blockbase/footer-vertical-menu"} /-->
\ No newline at end of file
diff --git a/videomaker/parts/block-template-parts/header.html b/videomaker/parts/block-template-parts/header.html
deleted file mode 100644
index e75329d08f..0000000000
--- a/videomaker/parts/block-template-parts/header.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-minimal"} /-->
\ No newline at end of file
diff --git a/videomaker/templates/block-templates/404.html b/videomaker/templates/block-templates/404.html
deleted file mode 100644
index 6d6603ca1e..0000000000
--- a/videomaker/templates/block-templates/404.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:pattern {"slug":"blockbase/404"} /-->
-	<!-- wp:search {"label":""} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker/templates/block-templates/archive.html b/videomaker/templates/block-templates/archive.html
deleted file mode 100644
index dfbf05868e..0000000000
--- a/videomaker/templates/block-templates/archive.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header","layout":{"inherit":true}} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"100px"}}}} /-->
-
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true,"style":{"spacing":{"margin":{"bottom":"45px"}}}} /-->
-	<!-- wp:post-featured-image {"isLink":"true","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2.5 * var(--wp--style--block-gap,1em))"}}}} /-->
-	<!-- wp:post-excerpt /-->
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--style--block-gap,1em)","bottom":"var(--wp--style--block-gap,1em)"}}}} -->
-	<div class="wp-block-group post-meta" style="padding-top:var(--wp--style--block-gap,1em);padding-bottom:var(--wp--style--block-gap,1em)">
-		<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:spacer {"height":60} -->
-	<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-
-	<div class="wp-block-group">
-	<!-- wp:query-pagination {"paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container"} /-->
diff --git a/videomaker/templates/block-templates/header-footer-only.html b/videomaker/templates/block-templates/header-footer-only.html
deleted file mode 100644
index ffbd349ec0..0000000000
--- a/videomaker/templates/block-templates/header-footer-only.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"0"}}}} -->
-<main class="wp-block-group" style="margin-top:0">
-
-<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker/templates/block-templates/index.html b/videomaker/templates/block-templates/index.html
deleted file mode 100644
index 0df8224436..0000000000
--- a/videomaker/templates/block-templates/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true,"style":{"spacing":{"margin":{"bottom":"45px"}}}} /-->
-	<!-- wp:post-featured-image {"isLink":"true","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2.5 * var(--wp--style--block-gap,1em))"}}}} /-->
-	<!-- wp:post-excerpt /-->
-
-	<!-- wp:group {"className":"post-meta","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--style--block-gap,1em)","bottom":"var(--wp--style--block-gap,1em)"}}}} -->
-	<div class="wp-block-group post-meta" style="padding-top:var(--wp--style--block-gap,1em);padding-bottom:var(--wp--style--block-gap,1em)">
-		<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:spacer {"height":60} -->
-	<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-
-	<div class="wp-block-group">
-	<!-- wp:query-pagination {"paginationArrow":"arrow"} -->
-		<!-- wp:query-pagination-previous /-->
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker/templates/block-templates/page.html b/videomaker/templates/block-templates/page.html
deleted file mode 100644
index 393fadfd5e..0000000000
--- a/videomaker/templates/block-templates/page.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title /-->
-		<!-- wp:group {"className":"post-meta","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--style--block-gap,1em)","bottom":"var(--wp--style--block-gap,1em)"}}}} -->
-		<div class="wp-block-group post-meta" style="padding-top:var(--wp--style--block-gap,1em);padding-bottom:var(--wp--style--block-gap,1em)">
-			<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-			<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:group {"className":"post-tags-container","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2 * var(--wp--style--block-gap,1em))"}}}} -->
-		<div class="wp-block-group post-tags-container" style="margin-top:var(--wp--style--block-gap,1em);margin-bottom:calc(2 * var(--wp--style--block-gap,1em))">
-			<!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:post-featured-image {"align":"full","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2 * var(--wp--style--block-gap,1em))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-comments /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker/templates/block-templates/search.html b/videomaker/templates/block-templates/search.html
deleted file mode 100644
index a323e6bb4b..0000000000
--- a/videomaker/templates/block-templates/search.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
-<main class="wp-block-group">
-
-<!-- wp:query -->
-<div class="wp-block-query">
-<!-- wp:post-template -->
-
-	<!-- wp:post-title {"level":5,"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-
-<!-- /wp:post-template -->
-</div>
-<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/videomaker/templates/block-templates/single.html b/videomaker/templates/block-templates/single.html
deleted file mode 100644
index f2cacf5f5c..0000000000
--- a/videomaker/templates/block-templates/single.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- wp:template-part {"area":"header","slug":"header-minimal","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":110} -->
-<div style="height:110px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-    <!-- wp:group {"layout":{"inherit":true}} -->
-    <div class="wp-block-group">
-		<!-- wp:post-title /-->
-		<!-- wp:group {"className":"post-meta","layout":{"type":"flex"},"style":{"spacing":{"padding":{"top":"var(--wp--style--block-gap,1em)","bottom":"var(--wp--style--block-gap,1em)"}}}} -->
-		<div class="wp-block-group post-meta" style="padding-top:var(--wp--style--block-gap,1em);padding-bottom:var(--wp--style--block-gap,1em)">
-			<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-			<!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:post-featured-image {"align":"full","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2 * var(--wp--style--block-gap,1em))"}}}} /-->
-		<!-- wp:group {"className":"post-tags-container","style":{"spacing":{"margin":{"top":"var(--wp--style--block-gap,1em)","bottom":"calc(2 * var(--wp--style--block-gap,1em))"}}}} -->
-		<div class="wp-block-group post-tags-container" style="margin-top:var(--wp--style--block-gap,1em);margin-bottom:calc(2 * var(--wp--style--block-gap,1em))">
-			<!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-		</div>
-		<!-- /wp:group -->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":60} -->
-<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-
-    <!-- wp:group {"align":"wide","layout":{"type":"flex","justifyContent":"space-between"}} -->
-    <div class="wp-block-group alignwide">
-        <!-- wp:post-navigation-link {"type":"previous"} /-->
-        <!-- wp:post-navigation-link /-->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:spacer {"height":60} -->
-    <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-    <!-- wp:post-comments /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"area":"footer","slug":"footer","tagName":"footer","className":"site-footer-container"} /-->
diff --git a/zoologist/parts/block-template-parts/footer.html b/zoologist/parts/block-template-parts/footer.html
deleted file mode 100644
index 27ba0dac60..0000000000
--- a/zoologist/parts/block-template-parts/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
-
-<!-- wp:spacer {"height":120} -->
-<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/zoologist/parts/block-template-parts/header.html b/zoologist/parts/block-template-parts/header.html
deleted file mode 100644
index 2ee4fabccc..0000000000
--- a/zoologist/parts/block-template-parts/header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- wp:pattern {"slug":"blockbase/header-linear"} /-->
-
-<!-- wp:spacer {"height":90} -->
-<div style="height:90px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/zoologist/parts/block-template-parts/post-meta.html b/zoologist/parts/block-template-parts/post-meta.html
deleted file mode 100644
index cbd1a6ec0a..0000000000
--- a/zoologist/parts/block-template-parts/post-meta.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
-<div class="wp-block-group post-meta">
-    <!-- wp:post-author {"showAvatar":false,"showBio":false,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-terms {"term":"category","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-    <!-- wp:post-terms {"term": "post_tag","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
-</div>
-<!-- /wp:group -->
diff --git a/zoologist/templates/block-templates/archive.html b/zoologist/templates/block-templates/archive.html
deleted file mode 100644
index 39fe27c46f..0000000000
--- a/zoologist/templates/block-templates/archive.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true},"query":{"perPage":5,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":"","inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"160px"}}}} /-->
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons","layout":{"inherit":true}} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/zoologist/templates/block-templates/index.html b/zoologist/templates/block-templates/index.html
deleted file mode 100644
index 78da4ce060..0000000000
--- a/zoologist/templates/block-templates/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:query {"tagName":"main","layout":{"inherit":true},"query":{"perPage":5,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":"","inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template -->
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true, "level": 3, "textAlign":"left", "style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-		<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-		<!-- wp:spacer {"height":120} -->
-		<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-	<!-- /wp:post-template -->
-	<!-- wp:query-pagination {"align":"wide"} -->
-	<!-- wp:query-pagination-previous /-->
-	<!-- wp:query-pagination-numbers /-->
-	<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-</main>
-<!-- /wp:query -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/zoologist/templates/block-templates/page-without-title.html b/zoologist/templates/block-templates/page-without-title.html
deleted file mode 100644
index d7528c1df4..0000000000
--- a/zoologist/templates/block-templates/page-without-title.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:spacer {"height":30} -->
-<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/zoologist/templates/block-templates/page.html b/zoologist/templates/block-templates/page.html
deleted file mode 100644
index abd1fc3a44..0000000000
--- a/zoologist/templates/block-templates/page.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/zoologist/templates/block-templates/search.html b/zoologist/templates/block-templates/search.html
deleted file mode 100644
index fff4ed6d4d..0000000000
--- a/zoologist/templates/block-templates/search.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-	<!-- wp:post-template -->
-
-		<!-- wp:post-title {"level":5,"isLink":true} /-->
-		<!-- wp:post-excerpt /-->
-
-	<!-- /wp:post-template -->
-	<!-- /wp:query -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->
diff --git a/zoologist/templates/block-templates/single.html b/zoologist/templates/block-templates/single.html
deleted file mode 100644
index a1ed0cee9e..0000000000
--- a/zoologist/templates/block-templates/single.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"textAlign":"left","level":1,"style":{"spacing":{"margin":{"bottom":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-		<!-- wp:post-featured-image {"align":"wide","style":{"spacing":{"margin":{"top":"calc(2 * var(--wp--style--block-gap))"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:template-part {"slug":"post-meta-icons"} /-->
-
-	<!-- wp:spacer {"height":150} -->
-	<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:group {"layout":{"inherit":true},"style":{"spacing":{"padding":{"top":"30px","right":"20px","bottom":"0px","left":"20px"}}}} -->
-	<div class="wp-block-group" style="padding-top:30px;padding-right:20px;padding-bottom:0px;padding-left:20px">
-		<!-- wp:columns {"align":"wide","className":"next-prev-links"} -->
-		<div class="wp-block-columns alignwide next-prev-links">
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"type":"previous","label":"←","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-			<!-- wp:column -->
-			<div class="wp-block-column">
-				<!-- wp:post-navigation-link {"textAlign":"right","label":"→","showTitle":true} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-		<!-- wp:spacer {"height":150} -->
-		<div style="height:150px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","className":"site-footer-container"} /-->