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
new file mode 100644
index 000000000..92ce5b8c9
--- /dev/null
+++ b/source/wp-content/themes/wporg-developer-2023/parts/search-handbook.html
@@ -0,0 +1,13 @@
+<!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}},"border":{"bottom":{"color":"var:preset|color|light-grey-1","width":"1px"}}},"className":"alignfull"} -->
+<div class="wp-block-group alignfull" style="border-bottom-color:var(--wp--preset--color--light-grey-1);border-bottom-width:1px;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 -->
\ No newline at end of file
diff --git a/source/wp-content/themes/wporg-developer-2023/parts/search.html b/source/wp-content/themes/wporg-developer-2023/parts/search.html
new file mode 100644
index 000000000..e0dd4906e
--- /dev/null
+++ b/source/wp-content/themes/wporg-developer-2023/parts/search.html
@@ -0,0 +1,7 @@
+<!-- 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 9307492c4..45fcfd515 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,7 +10,7 @@
 <!-- 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:pattern {"slug":"wporg-developer-2023/search-field"} /-->
+	<!-- 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 c84c18f07..fbbd0523a 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,7 +10,7 @@
 <!-- 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:pattern {"slug":"wporg-developer-2023/search-field"} /-->
+	<!-- 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/patterns/search-field.php b/source/wp-content/themes/wporg-developer-2023/patterns/search-field.php
index fb8e9b9c9..0da614213 100644
--- a/source/wp-content/themes/wporg-developer-2023/patterns/search-field.php
+++ b/source/wp-content/themes/wporg-developer-2023/patterns/search-field.php
@@ -7,10 +7,4 @@
 
 ?>
 
-<!-- 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:search {"label":"<?php esc_attr_e( 'Search', 'wporg' ); ?>","showLabel":false,"placeholder":"<?php esc_attr_e( 'Search resources', 'wporg' ); ?>","width":260,"widthUnit":"px","buttonText":"<?php esc_attr_e( 'Search', 'wporg' ); ?>","buttonPosition":"button-inside","buttonUseIcon":true} /-->
-
-</div>
-<!-- /wp:group -->
+<!-- wp:search {"label":"<?php esc_attr_e( 'Search', 'wporg' ); ?>","showLabel":false,"placeholder":"<?php esc_attr_e( 'Search resources', 'wporg' ); ?>","width":260,"widthUnit":"px","buttonText":"<?php esc_attr_e( 'Search', 'wporg' ); ?>","buttonPosition":"button-inside","buttonUseIcon":true} /-->
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 a75ee9ba4..ff055e788 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,7 +3,7 @@
 <!-- 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:pattern {"slug":"wporg-developer-2023/search-field"} /-->
+	<!-- 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 74bb01e66..8328dbe8a 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,10 +1,10 @@
 <!-- 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)">
 
-	<!-- wp:pattern {"slug":"wporg-developer-2023/search-field"} /-->
-
 	<!-- wp:group {"className":"has-three-columns","align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|40"}}}} -->
 	<div class="wp-block-group alignwide has-three-columns" style="margin-top:var(--wp--preset--spacing--40)">
 
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 3280589be..f121c6943 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,10 +1,10 @@
 <!-- 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)">
 
-	<!-- wp:pattern {"slug":"wporg-developer-2023/search-field"} /-->
-
 	<!-- wp:group {"className":"has-three-columns","align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|40"}}}} -->
 	<div class="wp-block-group alignwide has-three-columns" style="margin-top:var(--wp--preset--spacing--40)">
 
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 85900b9f4..415a470fb 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single.html
@@ -4,7 +4,7 @@
 <!-- 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:pattern {"slug":"wporg-developer-2023/search-field"} /-->
+	<!-- 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 9a46fc075..047acec3d 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,7 +3,7 @@
 <!-- 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:pattern {"slug":"wporg-developer-2023/search-field"} /-->
+	<!-- 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">
diff --git a/source/wp-content/themes/wporg-developer-2023/theme.json b/source/wp-content/themes/wporg-developer-2023/theme.json
index 5881f4988..be5dd86a8 100644
--- a/source/wp-content/themes/wporg-developer-2023/theme.json
+++ b/source/wp-content/themes/wporg-developer-2023/theme.json
@@ -148,7 +148,7 @@
 			"wporg-sidebar-container": {
 				"spacing": {
 					"margin": {
-						"top": "170px"
+						"top": "190px"
 					}
 				}
 			}