diff --git a/purr/patterns/right-sidebar.php b/purr/patterns/right-sidebar.php
index ef502250..c86fc3be 100644
--- a/purr/patterns/right-sidebar.php
+++ b/purr/patterns/right-sidebar.php
@@ -11,7 +11,7 @@
 
 <!-- wp:group {"style":{"position":{"type":""},"layout":{"selfStretch":"fixed","flexSize":"25%"},"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"flex","orientation":"vertical","flexWrap":"nowrap","justifyContent":"stretch"}} -->
 <div class="wp-block-group" style="margin-top:0;margin-bottom:0">
-	<!-- wp:search {"label":"Search","showLabel":false,"placeholder":"Search posts","widthUnit":"%","buttonText":"Search","buttonPosition":"no-button","style":{"layout":{"selfStretch":"fit","flexSize":null},"border":{"radius":"10px","width":"1px"}},"borderColor":"custom-gray-light"} /-->
+	<!-- wp:search {"label":"Search","showLabel":false,"placeholder":"Search posts","widthUnit":"%","buttonText":"Search","buttonPosition":"no-button","style":{"layout":{"selfStretch":"fit","flexSize":null},"border":{"radius":"10px","width":"1px"}},"borderColor":"accent"} /-->
 
 	<!-- wp:tag-cloud {"showTagCounts":true} /-->
 </div>
diff --git a/purr/templates/archive.html b/purr/templates/archive.html
index 7f7e3b32..f0b7e72c 100644
--- a/purr/templates/archive.html
+++ b/purr/templates/archive.html
@@ -21,8 +21,8 @@
 <div class="wp-block-group" style="border-bottom-color:#f2f2f2;border-bottom-width:1px;margin-top:0;margin-bottom:var(--wp--preset--spacing--40);padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:group {"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|50"}}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--50)"><!-- wp:post-author-name {"isLink":true} /-->
 
-<!-- wp:separator {"style":{"spacing":{"margin":{"top":"0","bottom":"0"}},"layout":{"selfStretch":"fill","flexSize":null}},"backgroundColor":"custom-gray-lightest","className":"is-style-default"} -->
-<hr class="wp-block-separator has-text-color has-custom-gray-lightest-color has-alpha-channel-opacity has-custom-gray-lightest-background-color has-background is-style-default" style="margin-top:0;margin-bottom:0"/>
+<!-- wp:separator {"style":{"spacing":{"margin":{"top":"0","bottom":"0"}},"layout":{"selfStretch":"fill","flexSize":null}},"backgroundColor":"base","className":"is-style-default"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background is-style-default" style="margin-top:0;margin-bottom:0"/>
 <!-- /wp:separator -->
 
 <!-- wp:post-date /--></div>
diff --git a/purr/templates/index.html b/purr/templates/index.html
index 7434de9f..ca2ecd45 100644
--- a/purr/templates/index.html
+++ b/purr/templates/index.html
@@ -19,8 +19,8 @@
 <div class="wp-block-group" style="border-bottom-color:#f2f2f2;border-bottom-width:1px;margin-top:0;margin-bottom:var(--wp--preset--spacing--40);padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:group {"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|50"}}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--50)"><!-- wp:post-author-name {"isLink":true} /-->
 
-<!-- wp:separator {"style":{"spacing":{"margin":{"top":"0","bottom":"0"}},"layout":{"selfStretch":"fill","flexSize":null}},"backgroundColor":"custom-gray-lightest","className":"is-style-default"} -->
-<hr class="wp-block-separator has-text-color has-custom-gray-lightest-color has-alpha-channel-opacity has-custom-gray-lightest-background-color has-background is-style-default" style="margin-top:0;margin-bottom:0"/>
+<!-- wp:separator {"style":{"spacing":{"margin":{"top":"0","bottom":"0"}},"layout":{"selfStretch":"fill","flexSize":null}},"backgroundColor":"base","className":"is-style-default"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background is-style-default" style="margin-top:0;margin-bottom:0"/>
 <!-- /wp:separator -->
 
 <!-- wp:post-date /--></div>
diff --git a/purr/templates/search.html b/purr/templates/search.html
index 6554cba8..95b01218 100644
--- a/purr/templates/search.html
+++ b/purr/templates/search.html
@@ -23,8 +23,8 @@
 <div class="wp-block-group" style="border-bottom-color:#f2f2f2;border-bottom-width:1px;margin-top:0;margin-bottom:var(--wp--preset--spacing--40);padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:group {"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|50"}}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--50)"><!-- wp:post-author-name {"isLink":true} /-->
 
-<!-- wp:separator {"style":{"spacing":{"margin":{"top":"0","bottom":"0"}},"layout":{"selfStretch":"fill","flexSize":null}},"backgroundColor":"custom-gray-lightest","className":"is-style-default"} -->
-<hr class="wp-block-separator has-text-color has-custom-gray-lightest-color has-alpha-channel-opacity has-custom-gray-lightest-background-color has-background is-style-default" style="margin-top:0;margin-bottom:0"/>
+<!-- wp:separator {"style":{"spacing":{"margin":{"top":"0","bottom":"0"}},"layout":{"selfStretch":"fill","flexSize":null}},"backgroundColor":"base","className":"is-style-default"} -->
+<hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background is-style-default" style="margin-top:0;margin-bottom:0"/>
 <!-- /wp:separator -->
 
 <!-- wp:post-date /--></div>
diff --git a/purr/templates/single.html b/purr/templates/single.html
index 4525d85b..ac62a367 100644
--- a/purr/templates/single.html
+++ b/purr/templates/single.html
@@ -6,10 +6,10 @@
 <!-- /wp:group --></div>
 <!-- /wp:column -->
 
-<!-- wp:column {"width":"50%","style":{"spacing":{"padding":{"right":"0","left":"0"}},"border":{"right":{"color":"var:preset|color|custom-gray-lightest","width":"1px"},"top":{},"bottom":{},"left":{"color":"var:preset|color|custom-gray-lightest","width":"1px"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-column" style="border-right-color:var(--wp--preset--color--custom-gray-lightest);border-right-width:1px;border-left-color:var(--wp--preset--color--custom-gray-lightest);border-left-width:1px;padding-right:0;padding-left:0;flex-basis:50%"><!-- wp:group {"style":{"layout":{"selfStretch":"fill","flexSize":null}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"border":{"bottom":{"color":"var:preset|color|custom-gray-lightest","width":"1px"},"top":{},"right":{},"left":{}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="border-bottom-color:var(--wp--preset--color--custom-gray-lightest);border-bottom-width:1px"><!-- wp:template-part {"slug":"header","theme":"community-themes/purr","tagName":"header"} /--></div>
+<!-- wp:column {"width":"50%","style":{"spacing":{"padding":{"right":"0","left":"0"}},"border":{"right":{"color":"var:preset|color|base","width":"1px"},"top":{},"bottom":{},"left":{"color":"var:preset|color|base","width":"1px"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-column" style="border-right-color:var(--wp--preset--color--base);border-right-width:1px;border-left-color:var(--wp--preset--color--base);border-left-width:1px;padding-right:0;padding-left:0;flex-basis:50%"><!-- wp:group {"style":{"layout":{"selfStretch":"fill","flexSize":null}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:group {"style":{"border":{"bottom":{"color":"var:preset|color|base","width":"1px"},"top":{},"right":{},"left":{}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="border-bottom-color:var(--wp--preset--color--base);border-bottom-width:1px"><!-- wp:template-part {"slug":"header","theme":"community-themes/purr","tagName":"header"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}},"layout":{"type":"constrained"}} -->
@@ -17,8 +17,8 @@
 <div class="wp-block-group"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
 <div class="wp-block-group"><!-- wp:post-author-name /-->
 
-<!-- wp:separator {"style":{"layout":{"selfStretch":"fill","flexSize":null}},"backgroundColor":"custom-light-blue"} -->
-<hr class="wp-block-separator has-text-color has-custom-light-blue-color has-alpha-channel-opacity has-custom-light-blue-background-color has-background"/>
+<!-- wp:separator {"style":{"layout":{"selfStretch":"fill","flexSize":null}},"backgroundColor":"contrast-2"} -->
+<hr class="wp-block-separator has-text-color has-contrast-2-color has-alpha-channel-opacity has-contrast-2-background-color has-background"/>
 <!-- /wp:separator -->
 
 <!-- wp:post-date /--></div>