diff --git a/muscat/parts/header-landing-page.html b/muscat/parts/header-landing-page.html
index dd3ad71c41..11d09bd3a0 100644
--- a/muscat/parts/header-landing-page.html
+++ b/muscat/parts/header-landing-page.html
@@ -1,13 +1,13 @@
 <!-- wp:group {"align":"full","backgroundColor":"primary","layout":{"type":"default"}} -->
-<div class="wp-block-group alignfull has-primary-background-color has-background"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60"},"blockGap":"0"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"center"}} -->
-<div class="wp-block-group alignwide has-background-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"fontStyle":"normal","fontWeight":"700","textTransform":"uppercase"}},"fontSize":"medium"} /-->
+<div class="wp-block-group alignfull has-primary-background-color has-background"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60"},"blockGap":"0"},"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"backgroundColor":"primary","textColor":"secondary","className":"has-background-color","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"center"}} -->
+<div class="wp-block-group alignwide has-background-color has-secondary-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"fontStyle":"normal","fontWeight":"700","textTransform":"uppercase"}},"fontSize":"medium"} /-->
 
 <!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"blockGap":"30px"}},"fontSize":"medium"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"align":"full","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull"><!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"17rem","lineHeight":1,"letterSpacing":"-11px","fontStyle":"normal","fontWeight":"500"},"spacing":{"padding":{"top":"24rem","right":"0","bottom":"var:preset|spacing|60","left":"0"}}},"textColor":"background"} -->
-<h2 class="alignwide has-background-color has-text-color" style="padding-top:24rem;padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0;font-size:17rem;font-style:normal;font-weight:500;letter-spacing:-11px;line-height:1">Is this nice?</h2>
+<div class="wp-block-group alignfull"><!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"17rem","lineHeight":1,"letterSpacing":"-11px","fontStyle":"normal","fontWeight":"500"},"spacing":{"padding":{"top":"24rem","right":"0","bottom":"var:preset|spacing|60","left":"0"}}},"textColor":"secondary","className":"has-background-color"} -->
+<h2 class="wp-block-heading alignwide has-background-color has-secondary-color has-text-color" style="padding-top:24rem;padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0;font-size:17rem;font-style:normal;font-weight:500;letter-spacing:-11px;line-height:1">Is this nice?</h2>
 <!-- /wp:heading --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/muscat/patterns/hidden-404.php b/muscat/patterns/hidden-404.php
index 87c88964de..c0c114c2c3 100644
--- a/muscat/patterns/hidden-404.php
+++ b/muscat/patterns/hidden-404.php
@@ -8,22 +8,22 @@
 ?>
 
 <!-- wp:group {"align":"full","backgroundColor":"primary","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-primary-background-color has-background"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"0","bottom":"var:preset|spacing|60","left":"0"},"blockGap":"0"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"fontStyle":"normal","fontWeight":"700","textTransform":"uppercase"}},"fontSize":"medium"} /-->
+<div class="wp-block-group alignfull has-primary-background-color has-background"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"0","bottom":"var:preset|spacing|60","left":"0"},"blockGap":"0"},"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"backgroundColor":"primary","textColor":"secondary","className":"has-background-color","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group alignfull has-background-color has-secondary-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"fontStyle":"normal","fontWeight":"700","textTransform":"uppercase"}},"fontSize":"medium"} /-->
 
 <!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"blockGap":"30px"}},"fontSize":"medium"} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"fontSize":"17rem","lineHeight":1,"letterSpacing":"-11px","fontStyle":"normal","fontWeight":"500"},"spacing":{"padding":{"top":"8rem","right":"0","bottom":"var:preset|spacing|60","left":"0"}}},"textColor":"background"} -->
-<h1 class="alignwide has-background-color has-text-color" style="padding-top:8rem;padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0;font-size:17rem;font-style:normal;font-weight:500;letter-spacing:-11px;line-height:1"><?php echo esc_html__( 'Well, this isn’t nice.', 'muscat' ); ?></h1>
+<!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"fontSize":"17rem","lineHeight":1,"letterSpacing":"-11px","fontStyle":"normal","fontWeight":"500"},"spacing":{"padding":{"top":"8rem","right":"0","bottom":"var:preset|spacing|60","left":"0"}}},"textColor":"secondary"} -->
+<h1 class="wp-block-heading alignwide has-secondary-color has-text-color" style="padding-top:8rem;padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0;font-size:17rem;font-style:normal;font-weight:500;letter-spacing:-11px;line-height:1"><?php echo esc_html__( 'Well, this isn’t nice.', 'muscat' ); ?></h1>
 <!-- /wp:heading -->
 
 <!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
-<div class="wp-block-group alignwide"><!-- wp:paragraph {"textColor":"background"} -->
-<p class="has-background-color has-text-color"><?php echo esc_html__( 'The page you’re looking doesn’t seem to exist. Maybe try a search?', 'muscat' ); ?></p>
+<div class="wp-block-group alignwide"><!-- wp:paragraph {"textColor":"secondary"} -->
+<p class="has-secondary-color has-text-color"><?php echo esc_html__( 'The page you’re looking doesn’t seem to exist. Maybe try a search?', 'muscat' ); ?></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:search {"label":"","showLabel":false,"width":75,"widthUnit":"%","style":{"border":{"width":"0px","style":"none"}},"backgroundColor":"background","textColor":"foreground"} /--></div>
+<!-- wp:search {"label":"","showLabel":false,"width":75,"widthUnit":"%","buttonText":"Search","style":{"border":{"width":"0px","style":"none"}},"backgroundColor":"secondary","textColor":"white"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:spacer -->
diff --git a/muscat/patterns/home-posts.php b/muscat/patterns/home-posts.php
index 4c8d936b4b..4760202793 100644
--- a/muscat/patterns/home-posts.php
+++ b/muscat/patterns/home-posts.php
@@ -38,8 +38,8 @@
 <div style="height:80px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:separator {"align":"full","backgroundColor":"secondary","className":"is-style-wide"} -->
-<hr class="wp-block-separator alignfull has-text-color has-secondary-color has-alpha-channel-opacity has-secondary-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"tertiary","className":"is-style-default"} -->
+<hr class="wp-block-separator has-text-color has-tertiary-color has-alpha-channel-opacity has-tertiary-background-color has-background is-style-default"/>
 <!-- /wp:separator -->
 
 <!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
diff --git a/muscat/templates/archive.html b/muscat/templates/archive.html
index f3196428f8..8d40e12170 100644
--- a/muscat/templates/archive.html
+++ b/muscat/templates/archive.html
@@ -12,7 +12,7 @@
 <!-- wp:group -->
 <div class="wp-block-group"><!-- wp:post-featured-image {"isLink":true,"height":"340px"} /-->
 
-<!-- wp:post-title {"isLink":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|foreground"}}},"typography":{"fontSize":"2.5rem"}}} /-->
+<!-- wp:post-title {"isLink":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"typography":{"fontSize":"2.5rem"}}} /-->
 
 <!-- wp:post-date /-->
 
diff --git a/muscat/templates/search.html b/muscat/templates/search.html
index 5946028041..c0b90aef35 100644
--- a/muscat/templates/search.html
+++ b/muscat/templates/search.html
@@ -26,7 +26,7 @@
 <!-- wp:group -->
 <div class="wp-block-group"><!-- wp:post-featured-image {"isLink":true,"height":"340px"} /-->
 
-<!-- wp:post-title {"isLink":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|foreground"}}},"typography":{"fontSize":"2.5rem"}}} /-->
+<!-- wp:post-title {"isLink":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"typography":{"fontSize":"2.5rem"}}} /-->
 
 <!-- wp:post-date /-->
 
diff --git a/muscat/theme.json b/muscat/theme.json
index 3ce55a6574..7c7943f409 100644
--- a/muscat/theme.json
+++ b/muscat/theme.json
@@ -11,22 +11,12 @@
 					"slug": "primary"
 				},
 				{
-					"color": "#636363",
+					"color": "#181818",
 					"name": "Secondary",
 					"slug": "secondary"
 				},
 				{
-					"color": "#ffffff",
-					"name": "Foreground",
-					"slug": "foreground"
-				},
-				{
-					"color": "#181818",
-					"name": "Background",
-					"slug": "background"
-				},
-				{
-					"color": "#2c2c2c",
+					"color": "#636363",
 					"name": "Tertiary",
 					"slug": "tertiary"
 				}
@@ -37,14 +27,7 @@
 			"wideSize": "1800px"
 		},
 		"spacing": {
-			"units": [
-				"%",
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
+			"units": ["%", "px", "em", "rem", "vh", "vw"]
 		},
 		"typography": {
 			"customFontSize": true,
@@ -61,33 +44,25 @@
 							"fontFamily": "Albert Sans",
 							"fontStyle": "normal",
 							"fontWeight": "300",
-							"src": [
-								"file:./assets/fonts/albert-sans_300.ttf"
-							]
+							"src": ["file:./assets/fonts/albert-sans_300.ttf"]
 						},
 						{
 							"fontFamily": "Albert Sans",
 							"fontStyle": "normal",
 							"fontWeight": "500",
-							"src": [
-								"file:./assets/fonts/albert-sans_500.ttf"
-							]
+							"src": ["file:./assets/fonts/albert-sans_500.ttf"]
 						},
 						{
 							"fontFamily": "Albert Sans",
 							"fontStyle": "normal",
 							"fontWeight": "600",
-							"src": [
-								"file:./assets/fonts/albert-sans_600.ttf"
-							]
+							"src": ["file:./assets/fonts/albert-sans_600.ttf"]
 						},
 						{
 							"fontFamily": "Albert Sans",
 							"fontStyle": "normal",
 							"fontWeight": "700",
-							"src": [
-								"file:./assets/fonts/albert-sans_700.ttf"
-							]
+							"src": ["file:./assets/fonts/albert-sans_700.ttf"]
 						},
 						{
 							"fontFamily": "Albert Sans",
@@ -206,7 +181,7 @@
 			},
 			"core/code": {
 				"border": {
-					"color": "var(--wp--preset--color--foreground)",
+					"color": "var(--wp--preset--color--white)",
 					"radius": "0.25rem",
 					"style": "solid",
 					"width": "2px"
@@ -303,7 +278,7 @@
 			},
 			"core/post-date": {
 				"color": {
-					"text": "var(--wp--preset--color--foreground)"
+					"text": "var(--wp--preset--color--white)"
 				},
 				"elements": {
 					"link": {
@@ -347,7 +322,7 @@
 			},
 			"core/pullquote": {
 				"border": {
-					"color": "var(--wp--preset--color--foreground)",
+					"color": "var(--wp--preset--color--white)",
 					"style": "solid",
 					"width": "1px 0"
 				},
@@ -413,7 +388,7 @@
 					"width": "0 0 1px 0"
 				},
 				"color": {
-					"text": "var(--wp--preset--color--foreground)"
+					"text": "var(--wp--preset--color--white)"
 				}
 			},
 			"core/site-tagline": {
@@ -441,21 +416,21 @@
 			}
 		},
 		"color": {
-			"background": "var(--wp--preset--color--background)",
-			"text": "var(--wp--preset--color--foreground)"
+			"background": "var(--wp--preset--color--secondary)",
+			"text": "var(--wp--preset--color--white)"
 		},
 		"elements": {
 			"button": {
 				":active": {
 					"color": {
 						"background": "var(--wp--preset--color--primary)",
-						"text": "var(--wp--preset--color--background)"
+						"text": "var(--wp--preset--color--secondary)"
 					}
 				},
 				":focus": {
 					"color": {
 						"background": "var(--wp--preset--color--primary)",
-						"text": "var(--wp--preset--color--background)"
+						"text": "var(--wp--preset--color--secondary)"
 					},
 					"outline": {
 						"color": "var(--wp--preset--color--primary)",
@@ -466,8 +441,8 @@
 				},
 				":hover": {
 					"color": {
-						"background": "var(--wp--preset--color--secondary)",
-						"text": "var(--wp--preset--color--background)"
+						"background": "var(--wp--preset--color--tertiary)",
+						"text": "var(--wp--preset--color--secondary)"
 					}
 				},
 				"border": {
@@ -475,7 +450,7 @@
 				},
 				"color": {
 					"background": "var(--wp--preset--color--primary)",
-					"text": "var(--wp--preset--color--background)"
+					"text": "var(--wp--preset--color--secondary)"
 				},
 				"typography": {
 					"fontFamily": "Albert Sans"
@@ -569,4 +544,4 @@
 	],
 	"version": 2,
 	"$schema": "https://schemas.wp.org/trunk/theme.json"
-}
\ No newline at end of file
+}