diff --git a/source/wp-content/themes/wporg-developer-2023/parts/header-no-breadcrumbs.html b/source/wp-content/themes/wporg-developer-2023/parts/header-no-breadcrumbs.html
index dc76746ef..4c27e1407 100644
--- a/source/wp-content/themes/wporg-developer-2023/parts/header-no-breadcrumbs.html
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header-no-breadcrumbs.html
@@ -1,3 +1,18 @@
 <!-- wp:wporg/global-header {"style":{"border":{"bottom":{"color":"var:preset|color|white-opacity-15","style":"solid","width":"1px"}}}} /-->
 
 <!-- wp:template-part {"slug":"local-nav","className":"has-display-contents"} /-->
+
+<!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"className":"alignfull"} -->
+<div class="wp-block-group alignfull" style="padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
+
+	<!-- wp:group {"layout":{"type":"constrained","justifyContent":"left"},"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20","bottom":"var:preset|spacing|20"}}}} -->
+	<div class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20);margin-bottom:var(--wp--preset--spacing--20)">
+
+		<!-- wp:pattern {"slug":"wporg-developer-2023/search-field"} /-->
+
+	</div>
+	<!-- /wp:group -->
+
+</div>
+<!-- /wp:group -->
+
diff --git a/source/wp-content/themes/wporg-developer-2023/parts/header.html b/source/wp-content/themes/wporg-developer-2023/parts/header.html
index 8b5237e5b..85ab88a21 100644
--- a/source/wp-content/themes/wporg-developer-2023/parts/header.html
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header.html
@@ -9,3 +9,17 @@
 
 </div>
 <!-- /wp:group -->
+
+<!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"className":"alignfull"} -->
+<div class="wp-block-group alignfull" style="padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
+
+	<!-- wp:group {"layout":{"type":"constrained","justifyContent":"left"},"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|10","bottom":"var:preset|spacing|20"}}}} -->
+	<div class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--10);margin-bottom:var(--wp--preset--spacing--20)">
+
+		<!-- wp:pattern {"slug":"wporg-developer-2023/search-field"} /-->
+
+	</div>
+	<!-- /wp:group -->
+
+</div>
+<!-- /wp:group -->
diff --git a/source/wp-content/themes/wporg-developer-2023/parts/search-handbook.html b/source/wp-content/themes/wporg-developer-2023/parts/search-handbook.html
deleted file mode 100644
index ccafcfe24..000000000
--- a/source/wp-content/themes/wporg-developer-2023/parts/search-handbook.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"className":"alignfull"} -->
-<div class="wp-block-group alignfull" style="padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
-
-	<!-- wp:group {"layout":{"type":"constrained","justifyContent":"left"},"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|10","bottom":"var:preset|spacing|20"}}}} -->
-	<div class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--10);margin-bottom:var(--wp--preset--spacing--20)">
-
-		<!-- wp:pattern {"slug":"wporg-developer-2023/search-field"} /-->
-
-	</div>
-	<!-- /wp:group -->
-
-</div>
-<!-- /wp:group -->
diff --git a/source/wp-content/themes/wporg-developer-2023/parts/search.html b/source/wp-content/themes/wporg-developer-2023/parts/search.html
deleted file mode 100644
index e0dd4906e..000000000
--- a/source/wp-content/themes/wporg-developer-2023/parts/search.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- wp:group {"layout":{"type":"constrained","justifyContent":"left"},"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20","bottom":"var:preset|spacing|20"}}}} -->
-<div class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20);margin-bottom:var(--wp--preset--spacing--20)">
-
-	<!-- wp:pattern {"slug":"wporg-developer-2023/search-field"} /-->
-
-</div>
-<!-- /wp:group -->
diff --git a/source/wp-content/themes/wporg-developer-2023/patterns/cli-commands.php b/source/wp-content/themes/wporg-developer-2023/patterns/cli-commands.php
index 45fcfd515..0d399faf4 100644
--- a/source/wp-content/themes/wporg-developer-2023/patterns/cli-commands.php
+++ b/source/wp-content/themes/wporg-developer-2023/patterns/cli-commands.php
@@ -10,8 +10,6 @@
 <!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|60"}}},"className":"alignfull","layout":{"type":"constrained","wideSize":"1280px","contentSize":"680px"}} -->
 <main class="wp-block-group alignfull" style="padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--edge-space)">
 
-	<!-- wp:template-part {"slug":"search","className":"has-display-contents"} /-->
-
 	<!-- wp:group {"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}},"layout":{"type":"constrained","justifyContent":"left"}} -->
 	<div class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20)">
 	
diff --git a/source/wp-content/themes/wporg-developer-2023/patterns/reference-content.php b/source/wp-content/themes/wporg-developer-2023/patterns/reference-content.php
index fbbd0523a..46355b2a2 100644
--- a/source/wp-content/themes/wporg-developer-2023/patterns/reference-content.php
+++ b/source/wp-content/themes/wporg-developer-2023/patterns/reference-content.php
@@ -10,8 +10,6 @@
 <!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|60"}}},"className":"alignfull","layout":{"type":"constrained","wideSize":"1280px","contentSize":"680px"}} -->
 <main class="wp-block-group alignfull" style="padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--edge-space)">
 
-	<!-- wp:template-part {"slug":"search","className":"has-display-contents"} /-->
-
 	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"left":"var:preset|spacing|20"},"margin":{"top":"var:preset|spacing|40"}}}} -->
 	<div class="wp-block-columns alignwide" style="margin-top:var(--wp--preset--spacing--40)">
 		
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/single-command.html b/source/wp-content/themes/wporg-developer-2023/templates/single-command.html
index ff055e788..3fe44acdf 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single-command.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single-command.html
@@ -3,8 +3,6 @@
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained","wideSize":"1280px","contentSize":"680px"},"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}}} -->
 <main class="wp-block-group alignfull" style="padding-left:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space)">
 
-	<!-- wp:template-part {"slug":"search","className":"has-display-contents"} /-->
-
 	<!-- wp:group {"layout":{"type":"constrained","justifyContent":"left"},"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}}} -->
 	<div class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20)">
 
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook-github.html b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook-github.html
index 20b61891c..287d4cd20 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook-github.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook-github.html
@@ -1,7 +1,5 @@
 <!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
 
-<!-- wp:template-part {"slug":"search-handbook","className":"has-display-contents"} /-->
-
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained","wideSize":"1760px","contentSize":"680px"},"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}}} -->
 <main class="wp-block-group alignfull" style="padding-left:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space)">
 
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
index 597e6702e..0bcd64a15 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
@@ -1,7 +1,5 @@
 <!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
 
-<!-- wp:template-part {"slug":"search-handbook","className":"has-display-contents"} /-->
-
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained","wideSize":"1760px","contentSize":"680px"},"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}}} -->
 <main class="wp-block-group alignfull" style="padding-left:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space)">
 
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/single.html b/source/wp-content/themes/wporg-developer-2023/templates/single.html
index 415a470fb..df39f80ee 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single.html
@@ -1,11 +1,8 @@
 <!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
 
-
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained","wideSize":"1280px","contentSize":"680px"},"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}}} -->
 <main class="wp-block-group alignfull" style="padding-left:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space)">
 
-	<!-- wp:template-part {"slug":"search","className":"has-display-contents"} /-->
-
 	<!-- wp:group {"layout":{"type":"constrained","justifyContent":"left"},"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|40"}}}} -->
 	<div class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--40)">
 
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/taxonomy-wp-parser-since.html b/source/wp-content/themes/wporg-developer-2023/templates/taxonomy-wp-parser-since.html
index 047acec3d..d330ced1f 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/taxonomy-wp-parser-since.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/taxonomy-wp-parser-since.html
@@ -3,8 +3,6 @@
 <!-- wp:group {"tagName":"main","style":{"spacing":{"blockGap":"0px","padding":{"bottom":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"className":"entry-content","layout":{"type":"constrained"}} -->
 <main class="wp-block-group entry-content" style="padding-bottom:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space);">
 
-	<!-- wp:template-part {"slug":"search","className":"has-display-contents"} /-->
-
 	<!-- wp:query {"queryId":0,"query":{"inherit":true,"perPage":10},"align":"wide"} -->
 	<div class="wp-block-query alignwide">