diff --git a/templates/index.html b/templates/index.html
index 24603ad..d7762a9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,52 +1,57 @@
-<!-- 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"
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"backgroundColor":"base","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-base-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":"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:query {"queryId":13,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
-    <div class="wp-block-query"><!-- wp:post-template -->
-      <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"constrained"}} -->
-      <div class="wp-block-group">
-        <!-- wp:post-title {"style":{"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}},"textColor":"primary"} /-->
+      <!-- wp:query {"queryId":13,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
+      <div class="wp-block-query"><!-- wp:post-template -->
+        <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"constrained"}} -->
+        <div class="wp-block-group">
+          <!-- wp:post-title {"style":{"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}},"textColor":"primary"} /-->
 
-        <!-- wp:post-date /-->
+          <!-- wp:post-date /-->
+        </div>
+        <!-- /wp:group -->
+
+        <!-- wp:post-excerpt {"style":{"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}}} /-->
+        <!-- /wp:post-template -->
+
+        <!-- wp:query-pagination {"style":{"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}}} -->
+        <!-- wp:query-pagination-previous /-->
+
+        <!-- wp:query-pagination-numbers /-->
+
+        <!-- wp:query-pagination-next /-->
+        <!-- /wp:query-pagination -->
+
+        <!-- wp:query-no-results -->
+        <!-- wp:paragraph {"placeholder":"Add text or blocks that will display when a query returns no results."} -->
+        <p></p>
+        <!-- /wp:paragraph -->
+        <!-- /wp:query-no-results -->
       </div>
-      <!-- /wp:group -->
+      <!-- /wp:query -->
 
-      <!-- wp:post-excerpt {"style":{"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}}} /-->
-      <!-- /wp:post-template -->
-
-      <!-- wp:query-pagination {"style":{"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}}} -->
-      <!-- wp:query-pagination-previous /-->
-
-      <!-- wp:query-pagination-numbers /-->
-
-      <!-- wp:query-pagination-next /-->
-      <!-- /wp:query-pagination -->
-
-      <!-- wp:query-no-results -->
-      <!-- wp:paragraph {"placeholder":"Add text or blocks that will display when a query returns no results."} -->
-      <p></p>
-      <!-- /wp:paragraph -->
-      <!-- /wp:query-no-results -->
+      <!-- wp:spacer {"height":"42px"} -->
+      <div style="height:42px" aria-hidden="true" class="wp-block-spacer"></div>
+      <!-- /wp:spacer -->
     </div>
-    <!-- /wp:query -->
+    <!-- /wp:group -->
 
-    <!-- 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"} /-->
 </div>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/templates/page-no-title.html b/templates/page-no-title.html
index 7a49c50..f0e1a9e 100644
--- a/templates/page-no-title.html
+++ b/templates/page-no-title.html
@@ -1,5 +1,6 @@
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"backgroundColor":"base","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-base-background-color has-background"
+  style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
   <!-- 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">
diff --git a/templates/page.html b/templates/page.html
index 3638ecc..3aac0b3 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,25 +1,30 @@
-<!-- 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"
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"backgroundColor":"base","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-base-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":"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"} /-->
 </div>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/templates/single.html b/templates/single.html
index 3f9a685..00b3d15 100644
--- a/templates/single.html
+++ b/templates/single.html
@@ -1,35 +1,40 @@
-<!-- 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"
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"backgroundColor":"base","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-base-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":{"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"} /-->
 </div>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/theme.json b/theme.json
index f118d70..bc25329 100644
--- a/theme.json
+++ b/theme.json
@@ -116,7 +116,7 @@
   },
   "styles": {
     "color": {
-      "background": "var(--wp--preset--color--base)"
+      "background": "var(--wp--preset--color--white)"
     },
     "blocks": {
       "core/button": {