diff --git a/templates/page-no-title.html b/templates/page-no-title.html
index 19b3450..7a49c50 100644
--- a/templates/page-no-title.html
+++ b/templates/page-no-title.html
@@ -1,7 +1,8 @@
 <!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group">
-  <!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"constrained"}} -->
-  <div class="wp-block-group alignwide">
+  <!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"0","padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"backgroundColor":"white","layout":{"type":"constrained"}} -->
+  <div class="wp-block-group alignwide has-white-background-color has-background"
+    style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
     <!-- wp:template-part {"slug":"header","theme":"cmt-engineering-theme","tagName":"header","area":"header"} /-->
 
     <!-- wp:post-content {"align":"wide","backgroundColor":"base-2"} /-->
@@ -10,4 +11,4 @@
   </div>
   <!-- /wp:group -->
 </div>
-<!-- /wp:group -->  
\ No newline at end of file
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/templates/page.html b/templates/page.html
index 97c21ac..3638ecc 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,20 +1,25 @@
-<!-- wp:template-part {"slug":"header","theme":"cmt-engineering-theme","tagName":"header","area":"header"} /-->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0","top":"0","bottom":"0"}}},"backgroundColor":"white","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-white-background-color has-background"
+  style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
+  <!-- wp:template-part {"slug":"header","theme":"cmt-engineering-theme","tagName":"header","area":"header"} /-->
 
-<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|20","left":"var:preset|spacing|20"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"
-  style="padding-right:var(--wp--preset--spacing--20);padding-left:var(--wp--preset--spacing--20)">
-  <!-- wp:spacer {"height":"14px"} -->
-  <div style="height:14px" aria-hidden="true" class="wp-block-spacer"></div>
-  <!-- /wp:spacer -->
+  <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|20","left":"var:preset|spacing|20"}}},"layout":{"type":"constrained"}} -->
+  <div class="wp-block-group"
+    style="padding-right:var(--wp--preset--spacing--20);padding-left:var(--wp--preset--spacing--20)">
+    <!-- wp:spacer {"height":"14px"} -->
+    <div style="height:14px" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
 
-  <!-- wp:post-title {"style":{"typography":{"fontSize":"30px","fontStyle":"normal","fontWeight":"400"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}},"textColor":"primary"} /-->
+    <!-- wp:post-title {"style":{"typography":{"fontSize":"30px","fontStyle":"normal","fontWeight":"400"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}},"textColor":"primary"} /-->
 
-  <!-- wp:post-content /-->
+    <!-- wp:post-content /-->
 
-  <!-- wp:spacer {"height":"42px"} -->
-  <div style="height:42px" aria-hidden="true" class="wp-block-spacer"></div>
-  <!-- /wp:spacer -->
+    <!-- wp:spacer {"height":"42px"} -->
+    <div style="height:42px" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
+  </div>
+  <!-- /wp:group -->
+
+  <!-- wp:template-part {"slug":"footer","theme":"cmt-engineering-theme","tagName":"footer","area":"footer"} /-->
 </div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","theme":"cmt-engineering-theme","tagName":"footer","area":"footer"} /-->
\ No newline at end of file
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/templates/single.html b/templates/single.html
index f80b557..3f9a685 100644
--- a/templates/single.html
+++ b/templates/single.html
@@ -1,30 +1,35 @@
-<!-- wp:template-part {"slug":"header","theme":"cmt-engineering-theme","tagName":"header","area":"header"} /-->
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"backgroundColor":"white","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-white-background-color has-background"
+  style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
+  <!-- wp:template-part {"slug":"header","theme":"cmt-engineering-theme","tagName":"header","area":"header"} /-->
 
-<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|20","left":"var:preset|spacing|20"}}},"layout":{"type":"constrained","contentSize":"1000px","wideSize":"1300px"}} -->
-<div class="wp-block-group"
-  style="padding-right:var(--wp--preset--spacing--20);padding-left:var(--wp--preset--spacing--20)">
-  <!-- wp:spacer {"height":"14px"} -->
-  <div style="height:14px" aria-hidden="true" class="wp-block-spacer"></div>
-  <!-- /wp:spacer -->
+  <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|20","left":"var:preset|spacing|20"}}},"layout":{"type":"constrained","contentSize":"1000px","wideSize":"1300px"}} -->
+  <div class="wp-block-group"
+    style="padding-right:var(--wp--preset--spacing--20);padding-left:var(--wp--preset--spacing--20)">
+    <!-- wp:spacer {"height":"14px"} -->
+    <div style="height:14px" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
 
-  <!-- wp:group {"metadata":{"name":"Post metadata"},"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"constrained"}} -->
-  <div class="wp-block-group">
-    <!-- wp:post-title {"style":{"typography":{"fontSize":"30px","fontStyle":"normal","fontWeight":"400"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}},"spacing":{"padding":{"bottom":"0"},"margin":{"bottom":"0"}}},"textColor":"primary"} /-->
+    <!-- wp:group {"metadata":{"name":"Post metadata"},"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"constrained"}} -->
+    <div class="wp-block-group">
+      <!-- wp:post-title {"style":{"typography":{"fontSize":"30px","fontStyle":"normal","fontWeight":"400"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}},"spacing":{"padding":{"bottom":"0"},"margin":{"bottom":"0"}}},"textColor":"primary"} /-->
 
-    <!-- wp:post-date {"style":{"typography":{"fontStyle":"normal","fontWeight":"300"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}},"spacing":{"padding":{"top":"0"}}},"textColor":"primary"} /-->
+      <!-- wp:post-date {"style":{"typography":{"fontStyle":"normal","fontWeight":"300"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}},"spacing":{"padding":{"top":"0"}}},"textColor":"primary"} /-->
+    </div>
+    <!-- /wp:group -->
+
+    <!-- wp:post-content /-->
+
+    <!-- wp:separator {"className":"is-style-dots"} -->
+    <hr class="wp-block-separator has-alpha-channel-opacity is-style-dots" />
+    <!-- /wp:separator -->
+
+    <!-- wp:spacer {"height":"42px"} -->
+    <div style="height:42px" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
   </div>
   <!-- /wp:group -->
 
-  <!-- wp:post-content /-->
-
-  <!-- wp:separator {"className":"is-style-dots"} -->
-  <hr class="wp-block-separator has-alpha-channel-opacity is-style-dots" />
-  <!-- /wp:separator -->
-
-  <!-- wp:spacer {"height":"42px"} -->
-  <div style="height:42px" aria-hidden="true" class="wp-block-spacer"></div>
-  <!-- /wp:spacer -->
+  <!-- wp:template-part {"slug":"footer","theme":"cmt-engineering-theme","tagName":"footer","area":"footer"} /-->
 </div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","theme":"cmt-engineering-theme","tagName":"footer","area":"footer"} /-->
\ No newline at end of file
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/theme.json b/theme.json
index b7e38ad..71edffb 100644
--- a/theme.json
+++ b/theme.json
@@ -30,6 +30,11 @@
           "color": "#FFF",
           "name": "White",
           "slug": "white"
+        },
+        {
+          "color": "#F2F2F2",
+          "name": "Base",
+          "slug": "base"
         }
       ]
     },
@@ -111,7 +116,7 @@
   },
   "styles": {
     "color": {
-      "background": "var(--wp--preset--color--white)"
+      "background": "var(--wp--preset--color--base)"
     },
     "blocks": {
       "core/button": {