From 218ecbf3f4fffd7de9b0e5f0fffa8e31a813fa8b Mon Sep 17 00:00:00 2001
From: Brian Gardner <bmg1227@gmail.com>
Date: Wed, 21 Sep 2022 09:38:58 -0500
Subject: [PATCH] Update colors to Base / Contrast (#126)

---
 functions.php                                 |   8 +-
 .../footer-default-contrast-background.php    |   4 +-
 patterns/footer-mega-contrast-background.php  |   8 +-
 patterns/footer-split-contrast-background.php |   4 +-
 .../footer-stacked-contrast-background.php    |   8 +-
 ...oter-three-columns-contrast-background.php |   6 +-
 patterns/footer-three-columns.php             |   2 +-
 ...eneral-boxes-three-contrast-background.php |  16 +-
 patterns/general-boxes-three.php              |  28 ++--
 .../general-boxes-two-contrast-background.php |  12 +-
 patterns/general-boxes-two.php                |  20 +--
 ...general-cta-button-contrast-background.php |   8 +-
 ...eneral-cta-stacked-contrast-background.php |   8 +-
 ...al-hero-one-column-contrast-background.php |  12 +-
 ...hero-three-columns-contrast-background.php |  16 +-
 ...l-hero-two-columns-contrast-background.php |  12 +-
 .../general-podcast-contrast-background.php   |  20 +--
 .../general-portfolio-contrast-background.php |   4 +-
 ...icing-four-columns-contrast-background.php | 132 ++++++++---------
 patterns/general-pricing-four-columns.php     |  32 ++--
 ...cing-three-columns-contrast-background.php | 100 ++++++-------
 patterns/general-pricing-three-columns.php    |  24 +--
 ...ricing-two-columns-contrast-background.php |  68 ++++-----
 patterns/general-pricing-two-columns.php      |  16 +-
 ...-team-four-columns-contrast-background.php |   4 +-
 ...l-team-two-columns-contrast-background.php |   4 +-
 ...testimonials-boxes-contrast-background.php |  16 +-
 patterns/general-testimonials-boxes.php       |  16 +-
 ...neral-testimonials-contrast-background.php |   4 +-
 .../header-default-contrast-background.php    |   8 +-
 patterns/page-home.php                        |  20 +--
 patterns/page-link-contrast-background.php    |  26 ++--
 patterns/page-link.php                        |   4 +-
 style.css                                     | 140 +++++++++---------
 theme.json                                    |  50 +++----
 35 files changed, 430 insertions(+), 430 deletions(-)

diff --git a/functions.php b/functions.php
index 6bbf4638..68e7cb35 100644
--- a/functions.php
+++ b/functions.php
@@ -57,8 +57,8 @@ function frost_register_block_styles() {
 
 	$block_styles = array(
 		'core/button'          => array(
-			'fill-background'    => __( 'Fill Background', 'frost' ),
-			'outline-background' => __( 'Outline Background', 'frost' ),
+			'fill-base'    => __( 'Fill Base', 'frost' ),
+			'outline-base' => __( 'Outline Base', 'frost' ),
 		),
 		'core/group'           => array(
 			'shadow'       => __( 'Shadow', 'frost' ),
@@ -76,9 +76,9 @@ function frost_register_block_styles() {
 		),
 		'core/navigation-link' => array(
 			'fill'         => __( 'Fill', 'frost' ),
-			'fill-background'    => __( 'Fill Background', 'frost' ),
+			'fill-base'    => __( 'Fill Base', 'frost' ),
 			'outline'      => __( 'Outline', 'frost' ),
-			'outline-background' => __( 'Outline Background', 'frost' ),
+			'outline-base' => __( 'Outline Base', 'frost' ),
 		),
 	);
 
diff --git a/patterns/footer-default-contrast-background.php b/patterns/footer-default-contrast-background.php
index 969f24c4..5485b8fd 100644
--- a/patterns/footer-default-contrast-background.php
+++ b/patterns/footer-default-contrast-background.php
@@ -7,8 +7,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"40px","bottom":"40px"},"margin":{"top":"0px"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"foreground","textColor":"background","layout":{"type":"constrained"},"fontSize":"small"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background has-link-color has-small-font-size" style="margin-top:0px;padding-top:40px;padding-bottom:40px">
+<!-- wp:group {"layout":{"type":"constrained"},"align":"full","style":{"spacing":{"padding":{"top":"40px","bottom":"40px"},"margin":{"top":"0px"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color","fontSize":"small"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color has-small-font-size" style="margin-top:0px;padding-top:40px;padding-bottom:40px">
 <!-- wp:group {"align":"wide","layout":{"type":"flex","allowOrientation":false,"justifyContent":"space-between"}} -->
 <div class="wp-block-group alignwide">
 <!-- wp:paragraph -->
diff --git a/patterns/footer-mega-contrast-background.php b/patterns/footer-mega-contrast-background.php
index b9e3eee7..e197f9a3 100644
--- a/patterns/footer-mega-contrast-background.php
+++ b/patterns/footer-mega-contrast-background.php
@@ -7,8 +7,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"typography":{"fontSize":"18px"},"spacing":{"margin":{"top":"0px"}}},"backgroundColor":"foreground","textColor":"background","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="font-size:18px;margin-top:0px">
+<!-- wp:group {"layout":{"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"typography":{"fontSize":"18px"},"spacing":{"margin":{"top":"0px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color" style="margin-top:0px;font-size:18px">
 <!-- wp:columns {"align":"wide","style":{"elements":{"link":{"color":[]}},"spacing":{"padding":{"top":"100px","bottom":"100px"},"blockGap":"100px"}}} -->
 <div class="wp-block-columns alignwide has-link-color" style="padding-top:100px;padding-bottom:100px">
 <!-- wp:column {"width":"50%"} -->
@@ -21,8 +21,8 @@
 <!-- /wp:paragraph -->
 <!-- wp:buttons -->
 <div class="wp-block-buttons">
-<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background">
+<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base">
 <a class="wp-block-button__link no-border-radius" href="#"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a>
 </div>
 <!-- /wp:button -->
diff --git a/patterns/footer-split-contrast-background.php b/patterns/footer-split-contrast-background.php
index d5a0ca34..ae98374d 100644
--- a/patterns/footer-split-contrast-background.php
+++ b/patterns/footer-split-contrast-background.php
@@ -7,8 +7,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"40vh","bottom":"40px"},"margin":{"top":"0px"}}},"backgroundColor":"foreground","textColor":"background","layout":{"type":"constrained"},"fontSize":"small"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background has-link-color has-small-font-size" style="margin-top:0px;padding-top:40vh;padding-bottom:40px">
+<!-- wp:group {"layout":{"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"spacing":{"padding":{"top":"40vh","bottom":"40px"},"margin":{"top":"0px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color","fontSize":"small"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color has-small-font-size" style="margin-top:0px;padding-top:40vh;padding-bottom:40px">
 <!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
 <div class="wp-block-columns alignwide are-vertically-aligned-center">
 <!-- wp:column {"verticalAlignment":"center","width":"75%"} -->
diff --git a/patterns/footer-stacked-contrast-background.php b/patterns/footer-stacked-contrast-background.php
index 63e256eb..d8937884 100644
--- a/patterns/footer-stacked-contrast-background.php
+++ b/patterns/footer-stacked-contrast-background.php
@@ -6,8 +6,8 @@
  * Block Types: core/template-part/footer
  */
 ?>
-<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"100px","bottom":"40px"},"margin":{"top":"0px"}}},"backgroundColor":"foreground","textColor":"background","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-bottom:40px">
+<!-- wp:group {"layout":{"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"spacing":{"padding":{"top":"100px","bottom":"40px"},"margin":{"top":"0px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-bottom:40px">
 <!-- wp:heading {"textAlign":"center","style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"margin":{"bottom":"20px"}}},"fontSize":"max-48"} -->
 <h2 class="has-text-align-center has-max-48-font-size" id="let-s-connect" style="font-style:normal;font-weight:400;margin-bottom:20px"><?php echo esc_html__( 'Let’s Connect', 'frost' ); ?></h2>
 <!-- /wp:heading -->
@@ -16,8 +16,8 @@
 <!-- /wp:paragraph -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"}} -->
 <div class="wp-block-buttons">
-<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link no-border-radius" href="#"><?php echo esc_html__( 'Get in Touch', 'frost' ); ?> →</a></div>
+<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link no-border-radius" href="#"><?php echo esc_html__( 'Get in Touch', 'frost' ); ?> →</a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
diff --git a/patterns/footer-three-columns-contrast-background.php b/patterns/footer-three-columns-contrast-background.php
index 15c8d1fb..7728d1bb 100644
--- a/patterns/footer-three-columns-contrast-background.php
+++ b/patterns/footer-three-columns-contrast-background.php
@@ -7,8 +7,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"40px","bottom":"40px"},"margin":{"top":"0px"}}},"backgroundColor":"foreground","textColor":"background","layout":{"type":"constrained"},"fontSize":"small"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background has-link-color has-small-font-size" style="margin-top:0px;padding-top:40px;padding-bottom:40px">
+<!-- wp:group {"layout":{"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"spacing":{"padding":{"top":"40px","bottom":"40px"},"margin":{"top":"0px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color","fontSize":"small"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color has-small-font-size" style="margin-top:0px;padding-top:40px;padding-bottom:40px">
 <!-- wp:group {"align":"wide","layout":{"type":"flex","allowOrientation":false,"justifyContent":"space-between"}} -->
 <div class="wp-block-group alignwide">
 <!-- wp:paragraph -->
@@ -17,7 +17,7 @@
 <!-- wp:paragraph -->
 <p><a href="#"><?php echo esc_html__( 'Privacy Policy', 'frost' ); ?></a> · <a href="#"><?php echo esc_html__( 'Terms of Service', 'frost' ); ?></a> · <a href="#"><?php echo esc_html__( 'Contact Us', 'frost' ); ?></a></p>
 <!-- /wp:paragraph -->
-<!-- wp:social-links {"iconColor":"foreground","iconColorValue":"#000","iconBackgroundColor":"background","iconBackgroundColorValue":"#fff","className":"is-style-default","style":{"spacing":{"blockGap":"10px"}}} -->
+<!-- wp:social-links {"iconColor":"contrast","iconColorValue":"#000","iconBackgroundColor":"base","iconBackgroundColorValue":"#fff","className":"is-style-default","style":{"spacing":{"blockGap":"10px"}}} -->
 <ul class="wp-block-social-links has-icon-color has-icon-background-color is-style-default">
 <!-- wp:social-link {"url":"#","service":"facebook"} /-->
 <!-- wp:social-link {"url":"#","service":"instagram"} /-->
diff --git a/patterns/footer-three-columns.php b/patterns/footer-three-columns.php
index f0085a7c..f2ea2b37 100644
--- a/patterns/footer-three-columns.php
+++ b/patterns/footer-three-columns.php
@@ -17,7 +17,7 @@
 <!-- wp:paragraph -->
 <p><a href="#"><?php echo esc_html__( 'Privacy Policy', 'frost' ); ?></a> · <a href="#"><?php echo esc_html__( 'Terms of Service', 'frost' ); ?></a> · <a href="#"><?php echo esc_html__( 'Contact Us', 'frost' ); ?></a></p>
 <!-- /wp:paragraph -->
-<!-- wp:social-links {"iconColor":"background","iconColorValue":"#fff","iconBackgroundColor":"foreground","iconBackgroundColorValue":"#000","className":"is-style-default","style":{"spacing":{"blockGap":"10px"}}} -->
+<!-- wp:social-links {"iconColor":"base","iconColorValue":"#fff","iconBackgroundColor":"contrast","iconBackgroundColorValue":"#000","className":"is-style-default","style":{"spacing":{"blockGap":"10px"}}} -->
 <ul class="wp-block-social-links has-icon-color has-icon-background-color is-style-default">
 <!-- wp:social-link {"url":"#","service":"facebook"} /-->
 <!-- wp:social-link {"url":"#","service":"instagram"} /-->
diff --git a/patterns/general-boxes-three-contrast-background.php b/patterns/general-boxes-three-contrast-background.php
index 7aa2083a..96225fe8 100644
--- a/patterns/general-boxes-three-contrast-background.php
+++ b/patterns/general-boxes-three-contrast-background.php
@@ -6,10 +6,10 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-group alignfull has-foreground-background-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"background"} -->
-<div class="wp-block-column has-background-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-group alignfull has-contrast-background-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"base"} -->
+<div class="wp-block-column has-base-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
 <h3 id="sample-heading-1"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"style":{"typography":{"fontSize":"18px"}}} -->
@@ -21,8 +21,8 @@
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column -->
-<!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"background"} -->
-<div class="wp-block-column has-background-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
+<!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"base"} -->
+<div class="wp-block-column has-base-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
 <h3 id="sample-heading-2"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"style":{"typography":{"fontSize":"18px"}}} -->
@@ -34,8 +34,8 @@
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column -->
-<!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"background"} -->
-<div class="wp-block-column has-background-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
+<!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"base"} -->
+<div class="wp-block-column has-base-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
 <h3 id="sample-heading-3"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"style":{"typography":{"fontSize":"18px"}}} -->
diff --git a/patterns/general-boxes-three.php b/patterns/general-boxes-three.php
index 0fc7e447..cca41cb2 100644
--- a/patterns/general-boxes-three.php
+++ b/patterns/general-boxes-three.php
@@ -6,44 +6,44 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-text-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-column has-foreground-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-text-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-column has-contrast-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
 <h3 id="sample-heading-1"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"style":{"typography":{"fontSize":"18px"}}} -->
 <p style="font-size:18px">Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum. Fringilla nec accumsan eget, facilisis mi justo, luctus pellentesque.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column -->
-<!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-column has-foreground-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
+<!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-column has-contrast-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
 <h3 id="sample-heading-2"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"style":{"typography":{"fontSize":"18px"}}} -->
 <p style="font-size:18px">Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum. Fringilla nec accumsan eget, facilisis mi justo, luctus pellentesque.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column -->
-<!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-column has-foreground-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
+<!-- wp:column {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-column has-contrast-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"level":3} -->
 <h3 id="sample-heading-3"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"style":{"typography":{"fontSize":"18px"}}} -->
 <p style="font-size:18px">Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum. Fringilla nec accumsan eget, facilisis mi justo, luctus pellentesque.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column --></div>
diff --git a/patterns/general-boxes-two-contrast-background.php b/patterns/general-boxes-two-contrast-background.php
index fe71f288..223c35b9 100644
--- a/patterns/general-boxes-two-contrast-background.php
+++ b/patterns/general-boxes-two-contrast-background.php
@@ -6,10 +6,10 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-group alignfull has-foreground-background-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"60px","right":"60px","bottom":"60px","left":"60px"}}},"backgroundColor":"background"} -->
-<div class="wp-block-column has-background-background-color has-background" style="padding-top:60px;padding-right:60px;padding-bottom:60px;padding-left:60px"><!-- wp:heading {"level":3,"fontSize":"large"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-group alignfull has-contrast-background-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"60px","right":"60px","bottom":"60px","left":"60px"}}},"backgroundColor":"base"} -->
+<div class="wp-block-column has-base-background-color has-background" style="padding-top:60px;padding-right:60px;padding-bottom:60px;padding-left:60px"><!-- wp:heading {"level":3,"fontSize":"large"} -->
 <h3 class="has-large-font-size" id="sample-heading-1"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph -->
@@ -21,8 +21,8 @@
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column -->
-<!-- wp:column {"style":{"spacing":{"padding":{"top":"60px","right":"60px","bottom":"60px","left":"60px"}}},"backgroundColor":"background"} -->
-<div class="wp-block-column has-background-background-color has-background" style="padding-top:60px;padding-right:60px;padding-bottom:60px;padding-left:60px"><!-- wp:heading {"level":3,"fontSize":"large"} -->
+<!-- wp:column {"style":{"spacing":{"padding":{"top":"60px","right":"60px","bottom":"60px","left":"60px"}}},"backgroundColor":"base"} -->
+<div class="wp-block-column has-base-background-color has-background" style="padding-top:60px;padding-right:60px;padding-bottom:60px;padding-left:60px"><!-- wp:heading {"level":3,"fontSize":"large"} -->
 <h3 class="has-large-font-size" id="sample-heading-2"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph -->
diff --git a/patterns/general-boxes-two.php b/patterns/general-boxes-two.php
index 9ab3c5a7..856dd78f 100644
--- a/patterns/general-boxes-two.php
+++ b/patterns/general-boxes-two.php
@@ -6,31 +6,31 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-text-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"60px","right":"60px","bottom":"60px","left":"60px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-column has-foreground-background-color has-background" style="padding-top:60px;padding-right:60px;padding-bottom:60px;padding-left:60px"><!-- wp:heading {"level":3,"fontSize":"large"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-text-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"60px","right":"60px","bottom":"60px","left":"60px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-column has-contrast-background-color has-background" style="padding-top:60px;padding-right:60px;padding-bottom:60px;padding-left:60px"><!-- wp:heading {"level":3,"fontSize":"large"} -->
 <h3 class="has-large-font-size" id="sample-heading-1"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph -->
 <p>Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum. Fringilla nec accumsan eget, facilisis mi justo, luctus pellentesque vitae gravida non diam accumsan posuere, venenatis at mi turpis.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column -->
-<!-- wp:column {"style":{"spacing":{"padding":{"top":"60px","right":"60px","bottom":"60px","left":"60px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-column has-foreground-background-color has-background" style="padding-top:60px;padding-right:60px;padding-bottom:60px;padding-left:60px"><!-- wp:heading {"level":3,"fontSize":"large"} -->
+<!-- wp:column {"style":{"spacing":{"padding":{"top":"60px","right":"60px","bottom":"60px","left":"60px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-column has-contrast-background-color has-background" style="padding-top:60px;padding-right:60px;padding-bottom:60px;padding-left:60px"><!-- wp:heading {"level":3,"fontSize":"large"} -->
 <h3 class="has-large-font-size" id="sample-heading-2"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h3>
 <!-- /wp:heading -->
 <!-- wp:paragraph -->
 <p>Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum. Fringilla nec accumsan eget, facilisis mi justo, luctus pellentesque vitae gravida non diam accumsan posuere, venenatis at mi turpis.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column --></div>
diff --git a/patterns/general-cta-button-contrast-background.php b/patterns/general-cta-button-contrast-background.php
index 3094cbca..808c6c62 100644
--- a/patterns/general-cta-button-contrast-background.php
+++ b/patterns/general-cta-button-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","bottom":"100px","right":"30px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","bottom":"100px","right":"30px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
 <div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"60%"} -->
 <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:60%"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.5"}},"fontSize":"large"} -->
 <p class="has-large-font-size" style="line-height:1.5">Lorem ipsum dolor sit amet, consectetur adipiscing lectus. Vestibulum mi justo, luctus eu pellentesque vitae gravida non.</p>
@@ -16,8 +16,8 @@
 
 <!-- wp:column {"verticalAlignment":"center","width":"40%"} -->
 <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:40%"><!-- wp:buttons {"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal"}} -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"spacing":{"padding":{"top":"15px","bottom":"15px","left":"25px","right":"25px"}},"border":{"radius":"0px"}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link wp-element-button" style="border-radius:0px;padding-top:15px;padding-right:25px;padding-bottom:15px;padding-left:25px"><?php echo esc_html__( 'Let’s Get Started', 'frost' ); ?> →</a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"spacing":{"padding":{"top":"15px","bottom":"15px","left":"25px","right":"25px"}},"border":{"radius":"0px"}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link wp-element-button" style="border-radius:0px;padding-top:15px;padding-right:25px;padding-bottom:15px;padding-left:25px"><?php echo esc_html__( 'Let’s Get Started', 'frost' ); ?> →</a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column --></div>
diff --git a/patterns/general-cta-stacked-contrast-background.php b/patterns/general-cta-stacked-contrast-background.php
index 3c34f256..d946a90e 100644
--- a/patterns/general-cta-stacked-contrast-background.php
+++ b/patterns/general-cta-stacked-contrast-background.php
@@ -5,16 +5,16 @@
  * Categories: frost-general
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","bottom":"100px","right":"30px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","style":{"spacing":{"margin":{"bottom":"20px"}}},"fontSize":"max-48"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","bottom":"100px","right":"30px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","style":{"spacing":{"margin":{"bottom":"20px"}}},"fontSize":"max-48"} -->
 <h2 class="has-text-align-center has-max-48-font-size" id="let-s-connect" style="margin-bottom:20px"><?php echo esc_html__( 'Let’s Connect', 'frost' ); ?></h2>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center"} -->
 <p class="has-text-align-center">Quisque aliquam nisl quis metus taylor feugiat. Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum vitae gravida non diam.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center"}} -->
-<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link wp-element-button"><?php echo esc_html__( 'Get in Touch', 'frost' ); ?> →</a></div>
+<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link wp-element-button"><?php echo esc_html__( 'Get in Touch', 'frost' ); ?> →</a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:group -->
diff --git a/patterns/general-hero-one-column-contrast-background.php b/patterns/general-hero-one-column-contrast-background.php
index c5b3b76f..c38dfa22 100644
--- a/patterns/general-hero-one-column-contrast-background.php
+++ b/patterns/general-hero-one-column-contrast-background.php
@@ -5,8 +5,8 @@
  * Categories: frost-general
  */
 ?>
-<!-- wp:group {"layout":{"type":"constrained","wideSize":"800px"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:image {"id":3482,"sizeSlug":"full","linkDestination":"none"} -->
+<!-- wp:group {"layout":{"type":"constrained","wideSize":"800px"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:image {"id":3482,"sizeSlug":"full","linkDestination":"none"} -->
 <figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_theme_file_uri() ) . '/assets/images/sample-white_1920x1200.jpg'; ?>" alt="Sample Image" class="wp-image-3482"/></figure>
 <!-- /wp:image -->
 <!-- wp:spacer {"height":"60px"} -->
@@ -19,11 +19,11 @@
 <p class="has-text-align-center">Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum. Fringilla nec accumsan eget, facilisis mi justo, luctus eu pellentesque vitae gravida non diam accumsan.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"}} -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Get Started', 'frost' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Get Started', 'frost' ); ?></a></div>
 <!-- /wp:button -->
-<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:group -->
diff --git a/patterns/general-hero-three-columns-contrast-background.php b/patterns/general-hero-three-columns-contrast-background.php
index ec6032f5..be9b8b2b 100644
--- a/patterns/general-hero-three-columns-contrast-background.php
+++ b/patterns/general-hero-three-columns-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
 <h2 class="has-text-align-center has-x-large-font-size" id="image-heading-text-button"><?php echo esc_html__( 'Image, heading, text, button.', 'frost' ); ?></h2>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center"} -->
@@ -31,8 +31,8 @@
 <!-- /wp:paragraph -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"}} -->
 <div class="wp-block-buttons">
-<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
@@ -51,8 +51,8 @@
 <!-- /wp:paragraph -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"}} -->
 <div class="wp-block-buttons">
-<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
@@ -71,8 +71,8 @@
 <!-- /wp:paragraph -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"}} -->
 <div class="wp-block-buttons">
-<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column --></div>
diff --git a/patterns/general-hero-two-columns-contrast-background.php b/patterns/general-hero-two-columns-contrast-background.php
index 551f0be4..af327d20 100644
--- a/patterns/general-hero-two-columns-contrast-background.php
+++ b/patterns/general-hero-two-columns-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"70px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:70px;padding-left:30px"><!-- wp:media-text {"mediaPosition":"right","mediaId":3484,"mediaLink":"https://frostwp.com/patterns/hero-section/sample-white_1200x1200/","mediaType":"image","mediaWidth":40} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"70px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:70px;padding-left:30px"><!-- wp:media-text {"mediaPosition":"right","mediaId":3484,"mediaLink":"https://frostwp.com/patterns/hero-section/sample-white_1200x1200/","mediaType":"image","mediaWidth":40} -->
 <div class="wp-block-media-text alignwide has-media-on-the-right is-stacked-on-mobile" style="grid-template-columns:auto 40%"><div class="wp-block-media-text__content"><!-- wp:heading {"fontSize":"x-large"} -->
 <h2 class="has-x-large-font-size" id="text-on-left-image-on-right"><?php echo esc_html__( 'Text on left, media on right.', 'frost' ); ?></h2>
 <!-- /wp:heading -->
@@ -15,11 +15,11 @@
 <p>Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum. Fringilla nec accumsan eget, facilisis mi justo, luctus pellentesque gravida vitae non diam accumsan posuere, venenatis mi turpis.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Get Started', 'frost' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Get Started', 'frost' ); ?></a></div>
 <!-- /wp:button -->
-<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div><figure class="wp-block-media-text__media"><img src="<?php echo esc_url( get_theme_file_uri() ) . '/assets/images/sample-white_1200x1200.jpg'; ?>" alt="Sample Image" class="wp-image-3484 size-full"/></figure></div>
 <!-- /wp:media-text --></div>
diff --git a/patterns/general-podcast-contrast-background.php b/patterns/general-podcast-contrast-background.php
index 08f435dc..be153373 100644
--- a/patterns/general-podcast-contrast-background.php
+++ b/patterns/general-podcast-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"verticalAlignment":"center","align":"wide","style":{"spacing":{"blockGap":"60px"}}} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"verticalAlignment":"center","align":"wide","style":{"spacing":{"blockGap":"60px"}}} -->
 <div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"30%"} -->
 <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:30%"><!-- wp:image {"id":3488,"sizeSlug":"full","linkDestination":"none"} -->
 <figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_theme_file_uri() ) . '/assets/images/sample-white_800x800.jpg'; ?>" alt="Sample Image" class="wp-image-3488"/></figure>
@@ -24,17 +24,17 @@
 <figure class="wp-block-audio"><audio controls src="<?php echo esc_url( get_theme_file_uri() ) . '/assets/audio/sample-audio-file.mp3'; ?>"></audio></figure>
 <!-- /wp:audio -->
 <!-- wp:buttons {"style":{"spacing":{"blockGap":"10px"}}} -->
-<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link wp-element-button" href="#">Apple Podcasts</a></div>
+<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link wp-element-button" href="#">Apple Podcasts</a></div>
 <!-- /wp:button -->
-<!-- wp:button {"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link wp-element-button" href="#">Google Podcasts</a></div>
+<!-- wp:button {"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link wp-element-button" href="#">Google Podcasts</a></div>
 <!-- /wp:button -->
-<!-- wp:button {"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link wp-element-button" href="#">Spotify</a></div>
+<!-- wp:button {"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link wp-element-button" href="#">Spotify</a></div>
 <!-- /wp:button -->
-<!-- wp:button {"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link wp-element-button" href="#">Stitcher</a></div>
+<!-- wp:button {"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link wp-element-button" href="#">Stitcher</a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column --></div>
diff --git a/patterns/general-portfolio-contrast-background.php b/patterns/general-portfolio-contrast-background.php
index 28163dbb..9b098665 100644
--- a/patterns/general-portfolio-contrast-background.php
+++ b/patterns/general-portfolio-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
 <div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":""} -->
 <div class="wp-block-column is-vertically-aligned-center"><!-- wp:heading {"fontSize":"x-large"} -->
 <h2 class="has-x-large-font-size" id="sample-heading"><?php echo esc_html__( 'Sample Heading', 'frost' ); ?></h2>
diff --git a/patterns/general-pricing-four-columns-contrast-background.php b/patterns/general-pricing-four-columns-contrast-background.php
index ff3c81c7..64fd264b 100644
--- a/patterns/general-pricing-four-columns-contrast-background.php
+++ b/patterns/general-pricing-four-columns-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
 <h2 class="has-text-align-center has-x-large-font-size" id="pricing-table"><?php echo esc_html__( 'Pricing Table', 'frost' ); ?></h2>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center"} -->
@@ -17,49 +17,49 @@
 <div class="wp-block-columns alignwide has-smaller-left-margin">
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Personal', 'frost' ); ?> - $95</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
@@ -69,49 +69,49 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Professional', 'frost' ); ?> - $295</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
@@ -121,49 +121,49 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Enterprise', 'frost' ); ?> - $495</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
@@ -173,49 +173,49 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Ultimate', 'frost' ); ?> - $995</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:group --></div>
diff --git a/patterns/general-pricing-four-columns.php b/patterns/general-pricing-four-columns.php
index 4b35d154..a2850c4b 100644
--- a/patterns/general-pricing-four-columns.php
+++ b/patterns/general-pricing-four-columns.php
@@ -17,15 +17,15 @@
 <div class="wp-block-columns alignwide has-smaller-left-margin">
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Personal', 'frost' ); ?> - $95</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
@@ -69,15 +69,15 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Professional', 'frost' ); ?> - $295</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
@@ -121,15 +121,15 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Enterprise', 'frost' ); ?> - $495</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
@@ -173,15 +173,15 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Ultimate', 'frost' ); ?> - $995</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
diff --git a/patterns/general-pricing-three-columns-contrast-background.php b/patterns/general-pricing-three-columns-contrast-background.php
index 32e22575..a65e6564 100644
--- a/patterns/general-pricing-three-columns-contrast-background.php
+++ b/patterns/general-pricing-three-columns-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"right":"30px","top":"100px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"right":"30px","top":"100px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
 <h2 class="has-text-align-center has-x-large-font-size" id="pricing-table"><?php echo esc_html__( 'Pricing Table', 'frost' ); ?></h2>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center"} -->
@@ -17,49 +17,49 @@
 <div class="wp-block-columns alignwide has-smaller-left-margin">
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Personal', 'frost' ); ?> - $95</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
@@ -69,49 +69,49 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Professional', 'frost' ); ?> - $295</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
@@ -121,49 +121,49 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Enterprise', 'frost' ); ?> - $495</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:group --></div>
diff --git a/patterns/general-pricing-three-columns.php b/patterns/general-pricing-three-columns.php
index fc3064bc..79729e18 100644
--- a/patterns/general-pricing-three-columns.php
+++ b/patterns/general-pricing-three-columns.php
@@ -17,15 +17,15 @@
 <div class="wp-block-columns alignwide has-smaller-left-margin">
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Personal', 'frost' ); ?> - $95</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
@@ -69,15 +69,15 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Professional', 'frost' ); ?> - $295</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
@@ -121,15 +121,15 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Enterprise', 'frost' ); ?> - $495</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
diff --git a/patterns/general-pricing-two-columns-contrast-background.php b/patterns/general-pricing-two-columns-contrast-background.php
index ec988a32..8ede0cab 100644
--- a/patterns/general-pricing-two-columns-contrast-background.php
+++ b/patterns/general-pricing-two-columns-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":false,"contentSize":"800px","type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
+<!-- wp:group {"layout":{"inherit":false,"contentSize":"800px","type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><<!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
 <h2 class="has-text-align-center has-x-large-font-size" id="pricing-table"><?php echo esc_html__( 'Pricing Table', 'frost' ); ?></h2>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center"} -->
@@ -17,49 +17,49 @@
 <div class="wp-block-columns alignwide has-smaller-left-margin">
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Personal', 'frost' ); ?> - $95</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button -->
 </div>
 <!-- /wp:buttons -->
@@ -69,49 +69,49 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-group has-foreground-color has-background-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-group has-contrast-color has-base-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Professional', 'frost' ); ?> - $295</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"background"} -->
-<div class="wp-block-group has-border-color has-background-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"base"} -->
+<div class="wp-block-group has-border-color has-base-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:separator {"backgroundColor":"background","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background-color has-alpha-channel-opacity has-background-background-color has-background is-style-wide"/>
+<!-- wp:separator {"backgroundColor":"base","className":"has-text-color has-background-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background has-background-color is-style-wide"/>
 <!-- /wp:separator -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"40px"}}}} -->
 <div class="wp-block-buttons" style="margin-top:40px">
-<!-- wp:button {"backgroundColor":"background","textColor":"foreground"} -->
-<div class="wp-block-button"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
+<!-- wp:button {"backgroundColor":"base","textColor":"contrast"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-contrast-color has-base-background-color has-text-color has-background"><?php echo esc_html__( 'Sign Up Now', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:group --></div>
diff --git a/patterns/general-pricing-two-columns.php b/patterns/general-pricing-two-columns.php
index 51105bf9..a333b302 100644
--- a/patterns/general-pricing-two-columns.php
+++ b/patterns/general-pricing-two-columns.php
@@ -17,15 +17,15 @@
 <div class="wp-block-columns alignwide has-smaller-left-margin">
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Personal', 'frost' ); ?> - $95</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
@@ -69,15 +69,15 @@
 <!-- /wp:column -->
 <!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-column">
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group has-background-color has-foreground-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
+<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"top":"20px","right":"30px","bottom":"20px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="padding-top:20px;padding-right:30px;padding-bottom:20px;padding-left:30px">
 <!-- wp:heading {"textAlign":"center","level":4} -->
 <h4 class="has-text-align-center" id="personal-95"><?php echo esc_html__( 'Professional', 'frost' ); ?> - $295</h4>
 <!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"foreground"} -->
-<div class="wp-block-group has-border-color has-foreground-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"10px"},"border":{"width":"1px","style":"solid"}},"borderColor":"contrast"} -->
+<div class="wp-block-group has-border-color has-contrast-border-color" style="border-style:solid;border-width:1px;padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size"><?php echo esc_html__( 'Feature Item', 'frost' ); ?></p>
 <!-- /wp:paragraph -->
diff --git a/patterns/general-team-four-columns-contrast-background.php b/patterns/general-team-four-columns-contrast-background.php
index 04d68324..6ce7205e 100644
--- a/patterns/general-team-four-columns-contrast-background.php
+++ b/patterns/general-team-four-columns-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
 <h2 class="has-text-align-center has-x-large-font-size" id="our-team"><?php echo esc_html__( 'Our Team', 'frost' ); ?></h2>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center","style":{"spacing":{"margin":{"bottom":"60px"}}}} -->
diff --git a/patterns/general-team-two-columns-contrast-background.php b/patterns/general-team-two-columns-contrast-background.php
index f02f5206..b7f93801 100644
--- a/patterns/general-team-two-columns-contrast-background.php
+++ b/patterns/general-team-two-columns-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"70px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:70px;padding-left:30px"><!-- wp:group {"align":"wide"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"70px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:70px;padding-left:30px"><!-- wp:group {"align":"wide"} -->
 <div class="wp-block-group alignwide"><!-- wp:heading {"fontSize":"x-large"} -->
 <h2 class="has-x-large-font-size" id="our-team"><?php echo esc_html__( 'Our Team', 'frost' ); ?></h2>
 <!-- /wp:heading -->
diff --git a/patterns/general-testimonials-boxes-contrast-background.php b/patterns/general-testimonials-boxes-contrast-background.php
index 91bfaa93..d9eac2e8 100644
--- a/patterns/general-testimonials-boxes-contrast-background.php
+++ b/patterns/general-testimonials-boxes-contrast-background.php
@@ -6,11 +6,11 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-group alignfull has-foreground-background-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-group alignfull has-contrast-background-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
 <div class="wp-block-columns alignwide"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"background"} -->
-<div class="wp-block-group has-background-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
+<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"base"} -->
+<div class="wp-block-group has-base-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
 <h4 class="has-text-align-center" style="font-size:72px;line-height:1">“</h4>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"18px"}}} -->
@@ -22,8 +22,8 @@
 <!-- /wp:group --></div>
 <!-- /wp:column -->
 <!-- wp:column -->
-<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"background"} -->
-<div class="wp-block-group has-background-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
+<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"base"} -->
+<div class="wp-block-group has-base-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
 <h4 class="has-text-align-center" style="font-size:72px;line-height:1">“</h4>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"18px"}}} -->
@@ -35,8 +35,8 @@
 <!-- /wp:group --></div>
 <!-- /wp:column -->
 <!-- wp:column -->
-<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"background"} -->
-<div class="wp-block-group has-background-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
+<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"base"} -->
+<div class="wp-block-group has-base-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
 <h4 class="has-text-align-center" style="font-size:72px;line-height:1">“</h4>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"18px"}}} -->
diff --git a/patterns/general-testimonials-boxes.php b/patterns/general-testimonials-boxes.php
index 95cef61d..ecc9831d 100644
--- a/patterns/general-testimonials-boxes.php
+++ b/patterns/general-testimonials-boxes.php
@@ -6,11 +6,11 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-text-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-text-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
 <div class="wp-block-columns alignwide"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-group has-foreground-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
+<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-group has-contrast-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
 <h4 class="has-text-align-center" style="font-size:72px;line-height:1">“</h4>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"18px"}}} -->
@@ -22,8 +22,8 @@
 <!-- /wp:group --></div>
 <!-- /wp:column -->
 <!-- wp:column -->
-<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-group has-foreground-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
+<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-group has-contrast-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
 <h4 class="has-text-align-center" style="font-size:72px;line-height:1">“</h4>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"18px"}}} -->
@@ -35,8 +35,8 @@
 <!-- /wp:group --></div>
 <!-- /wp:column -->
 <!-- wp:column -->
-<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"foreground"} -->
-<div class="wp-block-group has-foreground-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
+<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"backgroundColor":"contrast"} -->
+<div class="wp-block-group has-contrast-background-color has-background" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:heading {"textAlign":"center","level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
 <h4 class="has-text-align-center" style="font-size:72px;line-height:1">“</h4>
 <!-- /wp:heading -->
 <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"18px"}}} -->
diff --git a/patterns/general-testimonials-contrast-background.php b/patterns/general-testimonials-contrast-background.php
index 241cba2e..5b5d6efa 100644
--- a/patterns/general-testimonials-contrast-background.php
+++ b/patterns/general-testimonials-contrast-background.php
@@ -6,8 +6,8 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"align":"wide"} -->
 <div class="wp-block-columns alignwide"><!-- wp:column -->
 <div class="wp-block-column"><!-- wp:heading {"level":4,"style":{"typography":{"fontSize":72,"lineHeight":"1"}}} -->
 <h4 style="font-size:72px;line-height:1">“</h4>
diff --git a/patterns/header-default-contrast-background.php b/patterns/header-default-contrast-background.php
index 88e5b558..d5cfef8a 100644
--- a/patterns/header-default-contrast-background.php
+++ b/patterns/header-default-contrast-background.php
@@ -7,12 +7,12 @@
  * Viewport Width: 1280
  */
 ?>
-<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"30px"},"margin":{"top":"0px"}}},"backgroundColor":"foreground","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-foreground-background-color has-background" style="margin-top:0px;padding-top:30px;padding-bottom:30px">
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"30px"},"margin":{"top":"0px"}}},"backgroundColor":"contrast","layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull has-contrast-background-color has-background" style="margin-top:0px;padding-top:30px;padding-bottom:30px">
 <!-- wp:group {"align":"wide","layout":{"type":"flex","justifyContent":"space-between"}} -->
 <div class="wp-block-group alignwide">
-<!-- wp:site-title {"style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}}}} /-->
-<!-- wp:navigation {"textColor":"background","isResponsive":true,"style":{"spacing":{"blockGap":"20px"}}} -->
+<!-- wp:site-title {"style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}}}} /-->
+<!-- wp:navigation {"textColor":"base","isResponsive":true,"style":{"spacing":{"blockGap":"20px"}}} -->
 <!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
 <!-- /wp:navigation -->
 </div>
diff --git a/patterns/page-home.php b/patterns/page-home.php
index abef4ec2..5b835fc1 100644
--- a/patterns/page-home.php
+++ b/patterns/page-home.php
@@ -28,8 +28,8 @@
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:group -->
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"70px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:70px;padding-left:30px"><!-- wp:media-text {"mediaPosition":"right","mediaId":3484,"mediaLink":"https://frostwp.com/patterns/hero-section/sample-white_1200x1200/","mediaType":"image","mediaWidth":40} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"70px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:70px;padding-left:30px"><!-- wp:media-text {"mediaPosition":"right","mediaId":3484,"mediaLink":"https://frostwp.com/patterns/hero-section/sample-white_1200x1200/","mediaType":"image","mediaWidth":40} -->
 <div class="wp-block-media-text alignwide has-media-on-the-right is-stacked-on-mobile" style="grid-template-columns:auto 40%"><div class="wp-block-media-text__content"><!-- wp:heading {"fontSize":"x-large"} -->
 <h2 class="has-x-large-font-size" id="text-on-left-image-on-right"><?php echo esc_html__( 'Text on left, media on right.', 'frost' ); ?></h2>
 <!-- /wp:heading -->
@@ -37,11 +37,11 @@
 <p>Lorem ipsum dolor sit amet, consectetur adipiscing vestibulum. Fringilla nec accumsan eget, facilisis mi justo, luctus pellentesque gravida vitae non diam accumsan posuere, venenatis mi turpis.</p>
 <!-- /wp:paragraph -->
 <!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Get Started', 'frost' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Get Started', 'frost' ); ?></a></div>
 <!-- /wp:button -->
-<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-background"} -->
-<div class="wp-block-button is-style-outline-background"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
+<!-- wp:button {"style":{"border":{"radius":0}},"className":"is-style-outline-base"} -->
+<div class="wp-block-button is-style-outline-base"><a class="wp-block-button__link no-border-radius wp-element-button"><?php echo esc_html__( 'Learn More', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div><figure class="wp-block-media-text__media"><img src="<?php echo esc_url( get_theme_file_uri() ) . '/assets/images/sample-white_1200x1200.jpg'; ?>" alt="Sample Image" class="wp-image-3484 size-full"/></figure></div>
 <!-- /wp:media-text --></div>
@@ -64,8 +64,8 @@
 <!-- /wp:buttons --></div></div>
 <!-- /wp:media-text --></div>
 <!-- /wp:group -->
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","bottom":"100px","right":"30px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background"} -->
-<div class="wp-block-group alignfull has-background-color has-foreground-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","bottom":"100px","right":"30px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color"} -->
+<div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
 <div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"60%"} -->
 <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:60%"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.5"}},"fontSize":"large"} -->
 <p class="has-large-font-size" style="line-height:1.5">Lorem ipsum dolor sit amet, consectetur adipiscing lectus. Vestibulum mi justo, luctus eu pellentesque vitae gravida non.</p>
@@ -74,8 +74,8 @@
 
 <!-- wp:column {"verticalAlignment":"center","width":"40%"} -->
 <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:40%"><!-- wp:buttons {"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal"}} -->
-<div class="wp-block-buttons"><!-- wp:button {"style":{"spacing":{"padding":{"top":"15px","bottom":"15px","left":"25px","right":"25px"}},"border":{"radius":"0px"}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button is-style-fill-background"><a class="wp-block-button__link wp-element-button" style="border-radius:0px;padding-top:15px;padding-right:25px;padding-bottom:15px;padding-left:25px"><?php echo esc_html__( 'Let’s Get Started', 'frost' ); ?> →</a></div>
+<div class="wp-block-buttons"><!-- wp:button {"style":{"spacing":{"padding":{"top":"15px","bottom":"15px","left":"25px","right":"25px"}},"border":{"radius":"0px"}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button is-style-fill-base"><a class="wp-block-button__link wp-element-button" style="border-radius:0px;padding-top:15px;padding-right:25px;padding-bottom:15px;padding-left:25px"><?php echo esc_html__( 'Let’s Get Started', 'frost' ); ?> →</a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column --></div>
diff --git a/patterns/page-link-contrast-background.php b/patterns/page-link-contrast-background.php
index 09dce3a3..9bd24b93 100644
--- a/patterns/page-link-contrast-background.php
+++ b/patterns/page-link-contrast-background.php
@@ -5,8 +5,8 @@
  * Categories: frost-page
  */
 ?>
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"foreground","textColor":"background","className":"is-style-full-height"} -->
-<div class="wp-block-group alignfull is-style-full-height has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:group -->
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"},"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"spacing":{"margin":{"top":"0px"},"padding":{"top":"100px","right":"30px","bottom":"100px","left":"30px"}}},"backgroundColor":"contrast","textColor":"base","className":"is-style-full-height has-background-color"} -->
+<div class="wp-block-group alignfull is-style-full-height has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color" style="margin-top:0px;padding-top:100px;padding-right:30px;padding-bottom:100px;padding-left:30px"><!-- wp:group -->
 <div class="wp-block-group">
 <!-- wp:image {"align":"center","id":3489,"width":120,"height":120,"sizeSlug":"full","linkDestination":"none","className":"is-style-rounded"} -->
 <figure class="wp-block-image aligncenter size-full is-resized is-style-rounded"><img src="<?php echo esc_url( get_theme_file_uri() ) . '/assets/images/sample-white_800x800.jpg'; ?>" class="wp-image-3489" width="120" height="120"/></figure>
@@ -17,7 +17,7 @@
 <!-- wp:paragraph {"align":"center"} -->
 <p class="has-text-align-center"><?php echo esc_html__( 'Company Name', 'frost' ); ?><br><a href="mailto:name@company.com">name@company.com</a></p>
 <!-- /wp:paragraph -->
-<!-- wp:social-links {"iconColor":"foreground","iconColorValue":"#000","iconBackgroundColor":"background","iconBackgroundColorValue":"#fff","size":"has-normal-icon-size","align":"center","layout":{"type":"flex","justifyContent":"center"},"style":{"spacing":{"blockGap":"10px"}}} -->
+<!-- wp:social-links {"iconColor":"contrast","iconColorValue":"#000","iconBackgroundColor":"base","iconBackgroundColorValue":"#fff","size":"has-normal-icon-size","align":"center","layout":{"type":"flex","justifyContent":"center"},"style":{"spacing":{"blockGap":"10px"}}} -->
 <ul class="wp-block-social-links aligncenter has-normal-icon-size has-icon-color has-icon-background-color">
 <!-- wp:social-link {"url":"#","service":"facebook"} /-->
 <!-- wp:social-link {"url":"#","service":"instagram"} /-->
@@ -31,20 +31,20 @@
 <!-- /wp:spacer -->
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center","orientation":"horizontal"},"style":{"spacing":{"blockGap":"10px"}}} -->
 <div class="wp-block-buttons">
-<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-background"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Visit My Website', 'frost' ); ?></a></div>
+<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-base"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Visit My Website', 'frost' ); ?></a></div>
 <!-- /wp:button -->
-<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-background"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Read My Blog', 'frost' ); ?></a></div>
+<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-base"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Read My Blog', 'frost' ); ?></a></div>
 <!-- /wp:button -->
-<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-background"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Download My Ebook', 'frost' ); ?></a></div>
+<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-base"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Download My Ebook', 'frost' ); ?></a></div>
 <!-- /wp:button -->
-<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-background"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Follow My Newsletter', 'frost' ); ?></a></div>
+<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-base"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Follow My Newsletter', 'frost' ); ?></a></div>
 <!-- /wp:button -->
-<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-background"} -->
-<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-background"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Listen to My Podcast', 'frost' ); ?></a></div>
+<!-- wp:button {"width":100,"style":{"border":{"radius":0}},"className":"is-style-fill-base"} -->
+<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill-base"><a class="wp-block-button__link no-border-radius"><?php echo esc_html__( 'Listen to My Podcast', 'frost' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->
 <!-- wp:spacer {"height":"40px"} -->
diff --git a/patterns/page-link.php b/patterns/page-link.php
index 4f8b10ce..600bd8c0 100644
--- a/patterns/page-link.php
+++ b/patterns/page-link.php
@@ -17,8 +17,8 @@
 <!-- wp:paragraph {"align":"center"} -->
 <p class="has-text-align-center"><?php echo esc_html__( 'Company Name', 'frost' ); ?><br><a href="mailto:name@company.com">name@company.com</a></p>
 <!-- /wp:paragraph -->
-<!-- wp:social-links {"iconBackgroundColor":"foreground","iconBackgroundColorValue":"#000","size":"has-normal-icon-size","align":"center","layout":{"type":"flex","justifyContent":"center"},"style":{"spacing":{"blockGap":"10px"}}} -->
-<ul class="wp-block-social-links aligncenter has-normal-icon-size has-icon-background-color">
+<!-- wp:social-links {"iconBackgroundColor":"contrast","iconBackgroundColorValue":"#000","size":"has-normal-icon-size","align":"center","style":{"spacing":{"blockGap":"10px"}},"className":"has-icon-base-color","layout":{"type":"flex","justifyContent":"center"}} -->
+<ul class="wp-block-social-links aligncenter has-normal-icon-size has-icon-background-color has-icon-base-color">
 <!-- wp:social-link {"url":"#","service":"facebook"} /-->
 <!-- wp:social-link {"url":"#","service":"instagram"} /-->
 <!-- wp:social-link {"url":"#","service":"twitter"} /-->
diff --git a/style.css b/style.css
index b280c89b..28a6f5be 100644
--- a/style.css
+++ b/style.css
@@ -69,10 +69,10 @@ input[type="button"],
 input[type="submit"],
 .wp-block-post-comments input[type=submit],
 .wp-block-search__button {
-	border: 1px solid var(--wp--preset--color--foreground);
+	border: 1px solid var(--wp--preset--color--contrast);
 	border-radius: 0;
-	background-color: var(--wp--preset--color--foreground);
-	color: var(--wp--preset--color--background);
+	background-color: var(--wp--preset--color--contrast);
+	color: var(--wp--preset--color--base);
 	cursor: pointer;
 	font-size: var(--wp--preset--font-size--small);
 	font-weight: var(--wp--custom--font-weight--regular);
@@ -91,25 +91,25 @@ input[type="submit"]:hover,
 .wp-block-search__button:focus,
 .wp-block-search__button:hover {
 	background-color: transparent;
-	border: 1px solid var(--wp--preset--color--foreground);
-	color: var(--wp--preset--color--foreground);
+	border: 1px solid var(--wp--preset--color--contrast);
+	color: var(--wp--preset--color--contrast);
 	text-decoration: none;
 }
 
-/* Button - Fill Background
+/* Button - Fill Base
 --------------------------------------------- */
 
-.wp-block-button.is-style-fill-background .wp-element-button {
-	background-color: var(--wp--preset--color--background);
-	border: 1px solid var(--wp--preset--color--background);
-	color: var(--wp--preset--color--foreground);
+.wp-block-button.is-style-fill-base .wp-element-button {
+	background-color: var(--wp--preset--color--base);
+	border: 1px solid var(--wp--preset--color--base);
+	color: var(--wp--preset--color--contrast);
 }
 
-.wp-block-button.is-style-fill-background .wp-element-button:focus,
-.wp-block-button.is-style-fill-background .wp-element-button:hover {
+.wp-block-button.is-style-fill-base .wp-element-button:focus,
+.wp-block-button.is-style-fill-base .wp-element-button:hover {
 	background-color: transparent;
-	border: 1px solid var(--wp--preset--color--background);
-	color: var(--wp--preset--color--background);
+	border: 1px solid var(--wp--preset--color--base);
+	color: var(--wp--preset--color--base);
 }
 
 /* Button - Outline
@@ -119,31 +119,31 @@ input[type="submit"]:hover,
 	background-color: transparent;
 	border: 1px solid;
 	border-color: currentColor;
-	color: var(--wp--preset--color--foreground);
+	color: var(--wp--preset--color--contrast);
 	padding: 10px 25px;
 }
 
 .wp-block-button.is-style-outline .wp-element-button:focus,
 .wp-block-button.is-style-outline .wp-element-button:hover {
-	background-color: var(--wp--preset--color--foreground);
-	border-color: var(--wp--preset--color--foreground);
-	color: var(--wp--preset--color--background);
+	background-color: var(--wp--preset--color--contrast);
+	border-color: var(--wp--preset--color--contrast);
+	color: var(--wp--preset--color--base);
 }
 
-/* Button - Outline Background
+/* Button - Outline Base
 --------------------------------------------- */
 
-.wp-block-button.is-style-outline-background .wp-element-button {
+.wp-block-button.is-style-outline-base .wp-element-button {
 	background-color: transparent;
 	border: 1px solid;
-	border-color: var(--wp--preset--color--background);
-	color: var(--wp--preset--color--background);
+	border-color: var(--wp--preset--color--base);
+	color: var(--wp--preset--color--base);
 }
 
-.wp-block-button.is-style-outline-background .wp-element-button:focus,
-.wp-block-button.is-style-outline-background .wp-element-button:hover {
-	background-color: var(--wp--preset--color--background);
-	color: var(--wp--preset--color--foreground);
+.wp-block-button.is-style-outline-base .wp-element-button:focus,
+.wp-block-button.is-style-outline-base .wp-element-button:hover {
+	background-color: var(--wp--preset--color--base);
+	color: var(--wp--preset--color--contrast);
 }
 
 /* Calendar
@@ -151,17 +151,17 @@ input[type="submit"]:hover,
 
 .wp-block-calendar table caption,
 .wp-block-calendar table tbody {
-	color: var(--wp--preset--color--foreground);
+	color: var(--wp--preset--color--contrast);
 }
 
 .wp-block-calendar table th {
-	background-color: var(--wp--preset--color--foreground);
-	color: var(--wp--preset--color--background);
+	background-color: var(--wp--preset--color--contrast);
+	color: var(--wp--preset--color--base);
 }
 
 .wp-block-calendar tbody td,
 .wp-block-calendar th {
-	border: 1px solid var(--wp--preset--color--foreground);
+	border: 1px solid var(--wp--preset--color--contrast);
 	padding: 10px;
 }
 
@@ -177,8 +177,8 @@ input[type="submit"]:hover,
 
 *:not(.wp-block-code) > code,
 kbd {
-	background-color: var(--wp--preset--color--foreground);
-	color: var(--wp--preset--color--background);
+	background-color: var(--wp--preset--color--contrast);
+	color: var(--wp--preset--color--base);
 	font-size: var(--wp--preset--font-size--small);
 	padding: 5px 8px;
 	position: relative;
@@ -203,11 +203,11 @@ kbd {
 
 .wp-block-post-comments-form input:not([type=submit]),
 .wp-block-post-comments-form textarea {
-	border-color: var(--wp--preset--color--foreground);
+	border-color: var(--wp--preset--color--contrast);
 }
 
 .wp-block-post-comments-form input[type=submit] {
-	border: 1px solid var(--wp--preset--color--foreground);
+	border: 1px solid var(--wp--preset--color--contrast);
 }
 
 .wp-block-post-comments-form .form-submit {
@@ -228,7 +228,7 @@ kbd {
 }
 
 .wp-block-group.is-style-shadow-solid {
-	box-shadow: 5px 5px var(--wp--preset--color--foreground);
+	box-shadow: 5px 5px var(--wp--preset--color--contrast);
 }
 
 /* Image
@@ -283,17 +283,17 @@ ul li:where(.wp-block-list) {
 
 .wp-block-navigation__responsive-container-close,
 .wp-block-navigation__responsive-container-open {
-	border: 1px solid var(--wp--preset--color--foreground);
+	border: 1px solid var(--wp--preset--color--contrast);
 	padding: 2px;
 }
 
 .has-background .wp-block-navigation__responsive-container-open {
-	border: 1px solid var(--wp--preset--color--background);
+	border: 1px solid var(--wp--preset--color--base);
 }
 
 .has-background .wp-block-navigation__responsive-container-open:focus,
 .has-background .wp-block-navigation__responsive-container-open:hover {
-	color: var(--wp--preset--color--background);
+	color: var(--wp--preset--color--base);
 }
 
 .wp-block-navigation:not([style*=text-decoration]) a,
@@ -306,9 +306,9 @@ ul li:where(.wp-block-list) {
 --------------------------------------------- */
 
 .wp-block-navigation:not(.has-background) .wp-block-navigation__submenu-container {
-	background-color: var(--wp--preset--color--foreground);
-	border: var(--wp--preset--color--foreground);
-	color: var(--wp--preset--color--background);
+	background-color: var(--wp--preset--color--contrast);
+	border: var(--wp--preset--color--contrast);
+	color: var(--wp--preset--color--base);
 	padding: 10px;
 }
 
@@ -384,11 +384,11 @@ p.has-background {
 }
 
 .wp-block-table thead {
-	border-bottom: 3px solid var(--wp--preset--color--foreground);
+	border-bottom: 3px solid var(--wp--preset--color--contrast);
 }
 
 .wp-block-table tfoot {
-	border-top: 3px solid var(--wp--preset--color--foreground);
+	border-top: 3px solid var(--wp--preset--color--contrast);
 }
 
 .wp-block-table td,
@@ -397,7 +397,7 @@ p.has-background {
 .wp-block-table.is-style-stripes td,
 .wp-block-table.is-style-stripes th,
 .wp-block-table.is-style-stripes tr {
-	border: 1px solid var(--wp--preset--color--foreground);
+	border: 1px solid var(--wp--preset--color--contrast);
 }
 
 .wp-block-table th {
@@ -423,10 +423,10 @@ input,
 select,
 textarea,
 .wp-block-search__input {
-	background-color: var(--wp--preset--color--background);
-	border: 1px solid var(--wp--preset--color--foreground);
+	background-color: var(--wp--preset--color--base);
+	border: 1px solid var(--wp--preset--color--contrast);
 	border-radius: 0;
-	color: var(--wp--preset--color--foreground);
+	color: var(--wp--preset--color--contrast);
 	font-family: var(--wp--preset--font-family--primary);
 	font-size: var(--wp--preset--font-size--medium);
 	font-weight: var(--wp--custom--font-weight--light);
@@ -451,7 +451,7 @@ textarea {
 }
 
 ::placeholder {
-	color: var(--wp--preset--color--foreground);
+	color: var(--wp--preset--color--contrast);
 	font-size: var(--wp--preset--font-size--small);
 	opacity: 0.6;
 }
@@ -492,58 +492,58 @@ textarea {
 	--------------------------------------------- */
 
 	.wp-block-navigation-item.is-style-fill a,
-	.wp-block-navigation-item.is-style-fill-background a,
+	.wp-block-navigation-item.is-style-fill-base a,
 	.wp-block-navigation-item.is-style-outline a,
-	.wp-block-navigation-item.is-style-outline-background a {
+	.wp-block-navigation-item.is-style-outline-base a {
 		padding: 5px 15px;
 	}
 
 	.wp-block-navigation-item.is-style-fill a,
 	.wp-block-navigation-item.is-style-outline a:focus,
 	.wp-block-navigation-item.is-style-outline a:hover {
-		background-color: var(--wp--preset--color--foreground);
+		background-color: var(--wp--preset--color--contrast);
 	}
 
-	.wp-block-navigation-item.is-style-fill-background a,
-	.wp-block-navigation-item.is-style-outline-background a:focus,
-	.wp-block-navigation-item.is-style-outline-background a:hover {
-		background-color: var(--wp--preset--color--background);
+	.wp-block-navigation-item.is-style-fill-base a,
+	.wp-block-navigation-item.is-style-outline-base a:focus,
+	.wp-block-navigation-item.is-style-outline-base a:hover {
+		background-color: var(--wp--preset--color--base);
 	}
 
 	.wp-block-navigation-item.is-style-fill a,
 	.wp-block-navigation-item.is-style-outline a {
-		border: 1px solid var(--wp--preset--color--foreground);
+		border: 1px solid var(--wp--preset--color--contrast);
 	}
 
-	.wp-block-navigation-item.is-style-fill-background a,
-	.wp-block-navigation-item.is-style-outline-background a {
-		border: 1px solid var(--wp--preset--color--background);
+	.wp-block-navigation-item.is-style-fill-base a,
+	.wp-block-navigation-item.is-style-outline-base a {
+		border: 1px solid var(--wp--preset--color--base);
 	}
 
 	.wp-block-navigation-item.is-style-fill a:focus,
 	.wp-block-navigation-item.is-style-fill a:hover,
-	.wp-block-navigation-item.is-style-fill-background a,
+	.wp-block-navigation-item.is-style-fill-base a,
 	.wp-block-navigation-item.is-style-outline a,
-	.wp-block-navigation-item.is-style-outline-background a:focus,
-	.wp-block-navigation-item.is-style-outline-background a:hover {
-		color: var(--wp--preset--color--foreground);
+	.wp-block-navigation-item.is-style-outline-base a:focus,
+	.wp-block-navigation-item.is-style-outline-base a:hover {
+		color: var(--wp--preset--color--contrast);
 	}
 
 	.wp-block-navigation-item.is-style-fill a,
-	.wp-block-navigation-item.is-style-fill-background a:focus,
-	.wp-block-navigation-item.is-style-fill-background a:hover,
+	.wp-block-navigation-item.is-style-fill-base a:focus,
+	.wp-block-navigation-item.is-style-fill-base a:hover,
 	.wp-block-navigation-item.is-style-outline a:focus,
 	.wp-block-navigation-item.is-style-outline a:hover,
-	.wp-block-navigation-item.is-style-outline-background a {
-		color: var(--wp--preset--color--background);
+	.wp-block-navigation-item.is-style-outline-base a {
+		color: var(--wp--preset--color--base);
 	}
 
 	.wp-block-navigation-item.is-style-fill a:focus,
 	.wp-block-navigation-item.is-style-fill a:hover,
-	.wp-block-navigation-item.is-style-fill-background a:focus,
-	.wp-block-navigation-item.is-style-fill-background a:hover,
+	.wp-block-navigation-item.is-style-fill-base a:focus,
+	.wp-block-navigation-item.is-style-fill-base a:hover,
 	.wp-block-navigation-item.is-style-outline a,
-	.wp-block-navigation-item.is-style-outline-background a {
+	.wp-block-navigation-item.is-style-outline-base a {
 		background-color: transparent;
 	}
 
diff --git a/theme.json b/theme.json
index f62646c1..7637d864 100644
--- a/theme.json
+++ b/theme.json
@@ -43,6 +43,16 @@
 				}
 			],
 			"palette": [
+				{
+					"color": "#ffffff",
+					"name": "Base",
+					"slug": "base"
+				},
+				{
+					"color": "#000000",
+					"name": "Contrast",
+					"slug": "contrast"
+				},
 				{
 					"color": "#990099",
 					"name": "Primary",
@@ -57,16 +67,6 @@
 					"color": "#009999",
 					"name": "Tertiary",
 					"slug": "tertiary"
-				},
-				{
-					"color": "#000",
-					"name": "Foreground",
-					"slug": "foreground"
-				},
-				{
-					"color": "#fff",
-					"name": "Background",
-					"slug": "background"
 				}
 			]
 		},
@@ -251,8 +251,8 @@
 					"width": "0"
 				},
 				"color": {
-					"background": "var(--wp--preset--color--foreground)",
-					"text": "var(--wp--preset--color--background)"
+					"background": "var(--wp--preset--color--contrast)",
+					"text": "var(--wp--preset--color--base)"
 				},
 				"spacing": {
 					"padding": {
@@ -350,12 +350,12 @@
 			},
 			"core/preformatted": {
 				"border": {
-					"color": "var(--wp--preset--color--foreground)",
+					"color": "var(--wp--preset--color--contrast)",
 					"radius": "0"
 				},
 				"color": {
-					"background": "var(--wp--preset--color--foreground)",
-					"text": "var(--wp--preset--color--background)"
+					"background": "var(--wp--preset--color--contrast)",
+					"text": "var(--wp--preset--color--base)"
 				},
 				"spacing": {
 					"padding": {
@@ -372,7 +372,7 @@
 			},
 			"core/pullquote": {
 				"border": {
-					"color": "var(--wp--preset--color--foreground)",
+					"color": "var(--wp--preset--color--contrast)",
 					"style": "solid",
 					"width": "1px"
 				},
@@ -391,7 +391,7 @@
 			},
 			"core/quote": {
 				"border": {
-					"color": "var(--wp--preset--color--foreground)",
+					"color": "var(--wp--preset--color--contrast)",
 					"style": "solid",
 					"width": "1px"
 				},
@@ -416,7 +416,7 @@
 					"width": "0"
 				},
 				"color": {
-					"text": "var(--wp--preset--color--foreground)"
+					"text": "var(--wp--preset--color--contrast)"
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--large)"
@@ -472,20 +472,20 @@
 			}
 		},
 		"color": {
-			"background": "var(--wp--preset--color--background)",
-			"text": "var(--wp--preset--color--foreground)"
+			"background": "var(--wp--preset--color--base)",
+			"text": "var(--wp--preset--color--contrast)"
 		},
 		"elements": {
 			"button": {
 				"border": {
-					"color": "var(--wp--preset--color--foreground)",
+					"color": "var(--wp--preset--color--contrast)",
 					"radius": "0",
 					"style": "solid",
 					"width": "1px"
 				},
 				"color": {
-					"background": "var(--wp--preset--color--foreground)",
-					"text": "var(--wp--preset--color--background)"
+					"background": "var(--wp--preset--color--contrast)",
+					"text": "var(--wp--preset--color--base)"
 				},
 				"spacing": {
 					"padding": {
@@ -502,7 +502,7 @@
 			},
 			"caption": {
 				"color": {
-					"text": "var(--wp--preset--color--foreground)"
+					"text": "var(--wp--preset--color--contrast)"
 				},
 				"spacing": {
 					"margin": {
@@ -552,7 +552,7 @@
 			},
 			"link": {
 				"color": {
-					"text": "var(--wp--preset--color--foreground)"
+					"text": "var(--wp--preset--color--contrast)"
 				}
 			}
 		},