diff --git a/club/parts/footer.html b/club/parts/footer.html
index 0a5c587fa5..abf38da08f 100644
--- a/club/parts/footer.html
+++ b/club/parts/footer.html
@@ -1,5 +1,9 @@
 <!-- wp:group -->
-<div class="wp-block-group"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group"><!-- wp:spacer {"height":"clamp(3rem, calc(3rem + ((1vw - 0.48rem) * 5.7692)), 6rem)"} -->
+	<div style="height:clamp(3rem, calc(3rem + ((1vw - 0.48rem) * 5.7692)), 6rem)" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	
+	<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
 	<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"0.5rem"}},"layout":{"type":"flex","orientation":"vertical"}} -->
 	<div class="wp-block-group"><!-- wp:site-title {"level":2,"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"large"} /-->
 	
diff --git a/club/parts/header.html b/club/parts/header.html
index 6b826fe119..efa743d840 100644
--- a/club/parts/header.html
+++ b/club/parts/header.html
@@ -1,6 +1,6 @@
-<!-- wp:group {"className":"gapless-group","layout":{"inherit":"true"}} -->
-<div class="wp-block-group gapless-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"var(\u002d\u002dwp\u002d\u002dcustom\u002d\u002dgap\u002d\u002dvertical)","top":"var(\u002d\u002dwp\u002d\u002dcustom\u002d\u002dgap\u002d\u002dvertical)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-	<div class="wp-block-group alignfull" style="padding-top:var(--wp--custom--gap--vertical);padding-bottom:var(--wp--custom--gap--vertical)"><!-- wp:group {"layout":{"type":"flex"}} -->
+<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"className":"gapless-group","layout":{"inherit":"true"}} -->
+<div class="wp-block-group gapless-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"1rem","top":"1rem"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	<div class="wp-block-group alignfull" style="padding-top:1rem;padding-bottom:1rem"><!-- wp:group {"layout":{"type":"flex"}} -->
 	<div class="wp-block-group"><!-- wp:site-logo {"width":64} /-->
 	
 	<!-- wp:group -->
@@ -9,7 +9,12 @@
 	<!-- /wp:group -->
 	
 	<!-- wp:navigation {"__unstableLocation":"primary","overlayBackgroundColor":"background","overlayTextColor":"foreground","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
-	<!-- /wp:group --></div>
 	<!-- /wp:group -->
 
-	
\ No newline at end of file
+	<!-- wp:spacer {"height":"clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)"} -->
+<div style="height:clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+	</div>
+	<!-- /wp:group -->
+
diff --git a/club/patterns/404.php b/club/patterns/404.php
index 571c23fc49..791e224105 100644
--- a/club/patterns/404.php
+++ b/club/patterns/404.php
@@ -8,8 +8,8 @@
 ?>
 
 <!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group"><!-- wp:spacer {"height":"4rem"} -->
-<div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
+<main class="wp-block-group"><!-- wp:spacer {"height":"clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 4rem)"} -->
+<div style="height:clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 4rem)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
 <!-- wp:heading {"textAlign":"left","level":1,"style":{"typography":{"textTransform":"uppercase"}}} -->
@@ -22,7 +22,4 @@
 
 <!-- wp:pattern {"slug":"club/search"} /-->
 
-<!-- wp:spacer {"height":"4rem"} -->
-<div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer --></main>
 <!-- /wp:group -->
diff --git a/club/patterns/post-list.php b/club/patterns/post-list.php
index b74fd0bc07..0645fe7365 100644
--- a/club/patterns/post-list.php
+++ b/club/patterns/post-list.php
@@ -55,8 +55,4 @@
 <!-- wp:query-pagination-next /-->
 <!-- /wp:query-pagination --></main>
 
-<!-- wp:spacer -->
-<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
 <!-- /wp:query -->
diff --git a/club/templates/archive.html b/club/templates/archive.html
index 06377548bd..5cd97a992d 100644
--- a/club/templates/archive.html
+++ b/club/templates/archive.html
@@ -1,6 +1,10 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:query-title {"type":"archive","level":2} /-->
+<!-- wp:query-title {"type":"archive"} /-->
+
+<!-- wp:spacer {"height":"clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)"} -->
+<div style="height:clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
 <!-- wp:pattern {"slug":"club/posts-list"} /-->
 
diff --git a/club/templates/index.html b/club/templates/index.html
index 21bd74ec47..885ffe33ac 100644
--- a/club/templates/index.html
+++ b/club/templates/index.html
@@ -1,7 +1,7 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:separator {"style":{"spacing":{"margin":{"bottom":"-1em","top":"0em"}}},"className":"alignfull"} -->
-<hr class="wp-block-separator has-alpha-channel-opacity alignfull" style="margin-top:0em;margin-bottom:-1em"/>
+<!-- wp:separator {"style":{"spacing":{"margin":{"bottom":"calc(-1 * clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem))","top":"calc(-1 * clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem))"}}},"className":"alignfull"} -->
+<hr class="wp-block-separator has-alpha-channel-opacity alignfull" style="margin-top:calc(-1 * clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem));margin-bottom:calc(-1 * clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem))"/>
 <!-- /wp:separator -->
 
 <!-- wp:pattern {"slug":"club/posts-list"} /-->
diff --git a/club/templates/search.html b/club/templates/search.html
index 169b3bc837..305326d127 100644
--- a/club/templates/search.html
+++ b/club/templates/search.html
@@ -3,11 +3,16 @@
 <!-- wp:group {"layout":{"inherit":false}} -->
 <div class="wp-block-group">
 
+<!-- wp:spacer {"height":"clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)"} -->
+<div style="height:clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
 <!-- wp:pattern {"slug":"club/search"} /-->
 
-<!-- wp:spacer {"height":"40px"} -->
-<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- wp:spacer {"height":"clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 5.7692)), 3rem)"} -->
+<div style="height:clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 5.7692)), 3rem)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer --></div>
+
 <!-- /wp:group -->
 
 <!-- wp:pattern {"slug":"club/posts-list"} /-->
diff --git a/club/templates/single.html b/club/templates/single.html
index f76e17a30b..33d70218bf 100644
--- a/club/templates/single.html
+++ b/club/templates/single.html
@@ -29,8 +29,8 @@
     <!-- /wp:column --></div>
     <!-- /wp:columns -->
     
-    <!-- wp:spacer {"height":"40px"} -->
-    <div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- wp:spacer {"height":"clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 5.7692)), 3rem)"} -->
+    <div style="height:clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 5.7692)), 3rem)" aria-hidden="true" class="wp-block-spacer"></div>
     <!-- /wp:spacer -->
 
 
@@ -51,8 +51,8 @@
     <!-- /wp:group -->
     
 
-    <!-- wp:spacer {"height":"40px"} -->
-    <div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- wp:spacer {"height":"clamp(0rem, calc(0rem + ((1vw - 0.48rem) * 5.7692)), 1rem)"} -->
+    <div style="height:clamp(0rem, calc(0rem + ((1vw - 0.48rem) * 5.7692)), 1rem)" aria-hidden="true" class="wp-block-spacer"></div>
     <!-- /wp:spacer -->
     
     <!-- wp:columns -->
diff --git a/club/theme.json b/club/theme.json
index a29e58e17a..437ea0797f 100644
--- a/club/theme.json
+++ b/club/theme.json
@@ -366,11 +366,6 @@
                     "style": "solid",
                     "width": "0"
                 },
-                "spacing": {
-                    "padding": {
-                        "left": "var(--wp--custom--gap--horizontal)"
-                    }
-                },
                 "typography": {
                     "fontSize": "var(--wp--preset--font-size--large)",
                     "fontStyle": "normal"
@@ -411,8 +406,15 @@
                 },
                 "elements": {
                     "button": {
+                        "spacing": {
+                            "padding": {
+                                "top": "1rem",
+                                "bottom": "1rem"
+                            }
+                        },
                         "typography": {
-                            "fontSize": "var(--wp--preset--font-size--large)"
+                            "fontSize": "var(--wp--preset--font-size--large)",
+                            "lineHeight": "1.25"
                         }
                     }
                 }
@@ -605,7 +607,7 @@
             }
         },
         "spacing": {
-            "blockGap": "30px"
+            "blockGap": "clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)"
         },
         "typography": {
             "fontFamily": "var(--wp--preset--font-family--spacemono)",