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 fb64ac02c..245fdf62d 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
@@ -13,8 +13,8 @@
 	<!-- wp:group {"align":"left","className":"has-three-columns","layout":{"type":"flex","flexWrap":"wrap","orientation":"vertical"}} -->
 	<div class="wp-block-group alignleft has-three-columns">
 		
-		<!-- wp:group {"tagName":"main","className":"alignwide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}}} -->
-		<main class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20)">
+		<!-- wp:group {"tagName":"main","className":"alignwide"} -->
+		<main class="wp-block-group alignwide">
 
 			<!-- wp:group {"tagName":"article","style":{"spacing":{"margin":{"top":"0px"}}}} -->
 			<article class="wp-block-group" style="margin-top:0px">
diff --git a/source/wp-content/themes/wporg-developer-2023/src/style/style.scss b/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
index aedee7ef0..d91b7d310 100644
--- a/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
+++ b/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
@@ -3,11 +3,6 @@
  * templates or theme.json settings.
  */
 
-body.handbook-landing-page,
-body.post-type-archive-command {
-	--wp--custom--wporg-sidebar-container--spacing--margin--top: 100px;
-}
-
 .wporg-breadcrumbs {
 	// If the breadcrumbs are present, the space after them needs to be reduced.
 	// The next content is typically the search field.
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 1cc1d3537..0a907c39d 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
@@ -8,8 +8,8 @@
 	<!-- wp:group {"align":"left","className":"has-three-columns","layout":{"type":"flex","flexWrap":"wrap","orientation":"vertical"}} -->
 	<div class="wp-block-group alignleft has-three-columns">
 		
-		<!-- wp:group {"tagName":"main","className":"alignwide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}}} -->
-		<main class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20)">
+		<!-- wp:group {"tagName":"main","className":"alignwide"} -->
+		<main class="wp-block-group alignwide">
 
 			<!-- wp:group {"tagName":"article"} -->
 			<article class="wp-block-group">
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook-block-editor.html b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook-block-editor.html
index 8eddc7337..282e67628 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook-block-editor.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook-block-editor.html
@@ -8,8 +8,8 @@
 	<!-- wp:group {"align":"left","className":"has-three-columns","layout":{"type":"flex","flexWrap":"wrap","orientation":"vertical"}} -->
 	<div class="wp-block-group alignleft has-three-columns">
 		
-		<!-- wp:group {"tagName":"main","className":"alignwide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}}} -->
-		<main class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20)">
+		<!-- wp:group {"tagName":"main","className":"alignwide"} -->
+		<main class="wp-block-group alignwide">
 
 			<!-- wp:group {"tagName":"article","style":{"spacing":{"margin":{"top":"0px"}}}} -->
 			<article class="wp-block-group" style="margin-top:0px">
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 0b23c4c87..dbba8d2c3 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
@@ -8,8 +8,8 @@
 	<!-- wp:group {"align":"left","className":"has-three-columns","layout":{"type":"flex","flexWrap":"wrap","orientation":"vertical"}} -->
 	<div class="wp-block-group alignleft has-three-columns">
 		
-		<!-- wp:group {"tagName":"main","className":"alignwide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}}} -->
-		<main class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20)">
+		<!-- wp:group {"tagName":"main","className":"alignwide"} -->
+		<main class="wp-block-group alignwide">
 
 			<!-- wp:group {"tagName":"article","style":{"spacing":{"margin":{"top":"0px"}}}} -->
 			<article class="wp-block-group" style="margin-top:0px">
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 904bb9a51..8dd43ed42 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
@@ -8,8 +8,8 @@
 	<!-- wp:group {"align":"left","className":"has-three-columns","layout":{"type":"flex","flexWrap":"wrap","orientation":"vertical"}} -->
 	<div class="wp-block-group alignleft has-three-columns">
 		
-		<!-- wp:group {"tagName":"main","className":"alignwide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}}} -->
-		<main class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20)">
+		<!-- wp:group {"tagName":"main","className":"alignwide"} -->
+		<main class="wp-block-group alignwide">
 
 			<!-- wp:group {"tagName":"article","style":{"spacing":{"margin":{"top":"0px"}}}} -->
 			<article class="wp-block-group" style="margin-top:0px">
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 44877ba5b..66df928b4 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single.html
@@ -8,8 +8,8 @@
 	<!-- wp:group {"align":"left","className":"has-three-columns","layout":{"type":"flex","flexWrap":"wrap","orientation":"vertical"}} -->
 	<div class="wp-block-group alignleft has-three-columns">
 		
-		<!-- wp:group {"tagName":"main","className":"alignwide","style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}}} -->
-		<main class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--20)">
+		<!-- wp:group {"tagName":"main","className":"alignwide"} -->
+		<main class="wp-block-group alignwide">
 
 			<!-- wp:group {"tagName":"article"} -->
 			<article class="wp-block-group">
diff --git a/source/wp-content/themes/wporg-developer-2023/theme.json b/source/wp-content/themes/wporg-developer-2023/theme.json
index 114e89393..b32589401 100644
--- a/source/wp-content/themes/wporg-developer-2023/theme.json
+++ b/source/wp-content/themes/wporg-developer-2023/theme.json
@@ -158,13 +158,6 @@
 				"paddingVertical": "calc(( var(--wp--custom--select--height) - (var(--wp--custom--select--font-size) * var(--wp--custom--select--line-height))) / 2)",
 				"borderRadius": "var(--wp--custom--button--border--radius)"
 			},
-			"wporg-sidebar-container": {
-				"spacing": {
-					"margin": {
-						"top": "150px"
-					}
-				}
-			},
 			"wporg-command-github": {
 				"color": {
 					"open": "var(--wp--custom--color--green-60)",