diff --git a/src/wp-content/themes/twentytwentyfive/templates/404.html b/src/wp-content/themes/twentytwentyfive/templates/404.html
index 379f83d326475..d7d56dc7d0806 100644
--- a/src/wp-content/themes/twentytwentyfive/templates/404.html
+++ b/src/wp-content/themes/twentytwentyfive/templates/404.html
@@ -1,9 +1 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
-<main class="wp-block-group" style="padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)">
-	<!-- wp:pattern {"slug":"twentytwentyfive/hidden-404"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfive/hidden-404"} /-->
diff --git a/src/wp-content/themes/twentytwentyfive/templates/archive.html b/src/wp-content/themes/twentytwentyfive/templates/archive.html
index 3b0ddbe25d5f4..e59d29ba3af94 100644
--- a/src/wp-content/themes/twentytwentyfive/templates/archive.html
+++ b/src/wp-content/themes/twentytwentyfive/templates/archive.html
@@ -1,11 +1,3 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--60)">
-	<!-- wp:query-title {"type":"archive"} /-->
-	 <!-- wp:term-description /-->
-	<!-- wp:pattern {"slug":"twentytwentyfive/template-query-loop"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:query-title {"type":"archive"} /-->
+<!-- wp:term-description /-->
+<!-- wp:pattern {"slug":"twentytwentyfive/template-query-loop"} /-->
diff --git a/src/wp-content/themes/twentytwentyfive/templates/home.html b/src/wp-content/themes/twentytwentyfive/templates/home.html
index ae6870ce48c2f..8429bba1d2d1f 100644
--- a/src/wp-content/themes/twentytwentyfive/templates/home.html
+++ b/src/wp-content/themes/twentytwentyfive/templates/home.html
@@ -1,10 +1,2 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--60)">
-	<!-- wp:pattern {"slug":"twentytwentyfive/hidden-blog-heading"} /-->
-	<!-- wp:pattern {"slug":"twentytwentyfive/template-query-loop"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfive/hidden-blog-heading"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfive/template-query-loop"} /-->
diff --git a/src/wp-content/themes/twentytwentyfive/templates/index.html b/src/wp-content/themes/twentytwentyfive/templates/index.html
index ae6870ce48c2f..317f86f34b464 100644
--- a/src/wp-content/themes/twentytwentyfive/templates/index.html
+++ b/src/wp-content/themes/twentytwentyfive/templates/index.html
@@ -2,8 +2,7 @@
 
 <!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
 <main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--60)">
-	<!-- wp:pattern {"slug":"twentytwentyfive/hidden-blog-heading"} /-->
-	<!-- wp:pattern {"slug":"twentytwentyfive/template-query-loop"} /-->
+	<!-- wp:post-content /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/src/wp-content/themes/twentytwentyfive/templates/page-no-title.html b/src/wp-content/themes/twentytwentyfive/templates/page-no-title.html
index 17e4781f0d9b7..61964ad369c31 100644
--- a/src/wp-content/themes/twentytwentyfive/templates/page-no-title.html
+++ b/src/wp-content/themes/twentytwentyfive/templates/page-no-title.html
@@ -1,9 +1 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"0"}}}} -->
-<main class="wp-block-group" style="margin-top:0">
-	<!-- wp:post-content {"lock":{"move":false,"remove":true},"layout":{"type":"constrained"}} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:post-content {"lock":{"move":false,"remove":true},"layout":{"type":"constrained"}} /-->
diff --git a/src/wp-content/themes/twentytwentyfive/templates/page.html b/src/wp-content/themes/twentytwentyfive/templates/page.html
index 4331194a0cac2..8fdc353afd9c2 100644
--- a/src/wp-content/themes/twentytwentyfive/templates/page.html
+++ b/src/wp-content/themes/twentytwentyfive/templates/page.html
@@ -1,15 +1,7 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--60)">
-	<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
-		<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|60"}}}} /-->
-		<!-- wp:post-title {"level":1} /-->
-		<!-- wp:post-content {"align":"full","layout":{"type":"constrained"}} /-->
-	</div>
-	<!-- /wp:group -->
-</main>
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
+	<!-- wp:post-featured-image {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|60"}}}} /-->
+	<!-- wp:post-title {"level":1} /-->
+	<!-- wp:post-content {"align":"full","layout":{"type":"constrained"}} /-->
+</div>
 <!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer"} /-->
diff --git a/src/wp-content/themes/twentytwentyfive/templates/search.html b/src/wp-content/themes/twentytwentyfive/templates/search.html
index 3ccff6f35c24b..9feca5bc63c93 100644
--- a/src/wp-content/themes/twentytwentyfive/templates/search.html
+++ b/src/wp-content/themes/twentytwentyfive/templates/search.html
@@ -1,12 +1,4 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--60)">
-	<!-- wp:query-title {"type":"search"} /-->
-	<!-- wp:pattern {"slug":"twentytwentyfive/hidden-search"} /-->
-	<!-- wp:pattern {"slug":"twentytwentyfive/template-query-loop"} /-->
-	<!-- wp:pattern {"slug":"twentytwentyfive/more-posts"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:query-title {"type":"search"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfive/hidden-search"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfive/template-query-loop"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfive/more-posts"} /-->
diff --git a/src/wp-content/themes/twentytwentyfive/templates/single.html b/src/wp-content/themes/twentytwentyfive/templates/single.html
index 90b7fb2fbe138..a4e44822b5c59 100644
--- a/src/wp-content/themes/twentytwentyfive/templates/single.html
+++ b/src/wp-content/themes/twentytwentyfive/templates/single.html
@@ -1,25 +1,18 @@
-<!-- wp:template-part {"slug":"header"} /-->
-
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--60)">
-	<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
-		<!-- wp:post-title {"level":1} /-->
-		<!-- wp:post-featured-image {"aspectRatio":"3/2"} /-->
-		<!-- wp:pattern {"slug":"twentytwentyfive/hidden-written-by"} /-->
-		<!-- wp:post-content {"align":"full","layout":{"type":"constrained"}} /-->
-		<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-		<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
-			<!-- wp:post-terms {"term":"post_tag","separator":"  ","className":"is-style-post-terms-1"} /-->
-		</div>
-		<!-- /wp:group -->
-		
-		<!-- wp:pattern {"slug":"twentytwentyfive/post-navigation"} /-->
-		<!-- wp:pattern {"slug":"twentytwentyfive/comments"} /-->
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
+	<!-- wp:post-title {"level":1} /-->
+	<!-- wp:post-featured-image {"aspectRatio":"3/2"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfive/hidden-written-by"} /-->
+	<!-- wp:post-content {"align":"full","layout":{"type":"constrained"}} /-->
+	<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
+	<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
+		<!-- wp:post-terms {"term":"post_tag","separator":"  ","className":"is-style-post-terms-1"} /-->
 	</div>
 	<!-- /wp:group -->
-	<!-- wp:pattern {"slug":"twentytwentyfive/more-posts"} /-->
-</main>
+
+	<!-- wp:pattern {"slug":"twentytwentyfive/post-navigation"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfive/comments"} /-->
+</div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfive/more-posts"} /-->
diff --git a/src/wp-content/themes/twentytwentyfive/theme.json b/src/wp-content/themes/twentytwentyfive/theme.json
index 7daeb0dbd749d..f53c58c4265b0 100644
--- a/src/wp-content/themes/twentytwentyfive/theme.json
+++ b/src/wp-content/themes/twentytwentyfive/theme.json
@@ -685,6 +685,36 @@
 			}
 		}
 	},
+	"templates": [
+		{
+			"name": "404",
+			"template": "index"
+		},
+		{
+			"name": "archive",
+			"template": "index"
+		},
+		{
+			"name": "home",
+			"template": "index"
+		},
+		{
+			"name": "page",
+			"template": "index"
+		},
+		{
+			"name": "page-no-title",
+			"template": "index"
+		},
+		{
+			"name": "search",
+			"template": "index"
+		},
+		{
+			"name": "single",
+			"template": "index"
+		}
+	],
 	"templateParts": [
 		{
 			"area": "header",