diff --git a/parts/footer-copy.html b/parts/footer-copy.html
index 6bf74c37..142a5aa2 100644
--- a/parts/footer-copy.html
+++ b/parts/footer-copy.html
@@ -58,8 +58,8 @@
 <div style="height:7vh" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} -->
-<p class="has-text-align-left has-secondary-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
+<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} -->
+<p class="has-text-align-left has-base-2-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
 <!-- /wp:paragraph --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
diff --git a/parts/footer-portfolio.html b/parts/footer-portfolio.html
index fde3242c..33c04a14 100644
--- a/parts/footer-portfolio.html
+++ b/parts/footer-portfolio.html
@@ -3,7 +3,7 @@
 <!-- /wp:spacer -->
 
 <!-- wp:group {"style":{"border":{"top":{"color":"var:preset|color|custom-borders","width":"1px"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--custom-borders);border-top-width:1px"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"7vh","bottom":"7vh"}}}} -->
+<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--base-3);border-top-width:1px"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"7vh","bottom":"7vh"}}}} -->
 <div class="wp-block-group alignwide" style="padding-top:7vh;padding-bottom:7vh"><!-- wp:columns -->
 <div class="wp-block-columns"><!-- wp:column {"width":"30%"} -->
 <div class="wp-block-column" style="flex-basis:30%"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|40"}},"layout":{"type":"flex","orientation":"vertical"}} -->
@@ -62,8 +62,8 @@
 <div style="height:7vh" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} -->
-<p class="has-text-align-left has-secondary-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
+<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} -->
+<p class="has-text-align-left has-base-2-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
 <!-- /wp:paragraph --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
diff --git a/parts/footer-writer.html b/parts/footer-writer.html
index 19c399ca..7760cfdf 100644
--- a/parts/footer-writer.html
+++ b/parts/footer-writer.html
@@ -6,17 +6,17 @@
 	<div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontSize":"1.8rem"}}} -->
 	<p style="font-size:1.8rem">✦</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:site-title {"level":0} /-->
-	
+
 	<!-- wp:site-tagline /--></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column {"width":"40%"} -->
 	<div class="wp-block-column" style="flex-basis:40%"></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column {"width":"30%"} -->
 	<div class="wp-block-column" style="flex-basis:30%"><!-- wp:columns {"isStackedOnMobile":false} -->
 	<div class="wp-block-columns is-not-stacked-on-mobile"><!-- wp:column -->
@@ -24,27 +24,27 @@
 	<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--70);font-size:0.8rem"><!-- wp:paragraph {"style":{"typography":{"fontSize":"0.9rem","fontStyle":"normal","fontWeight":"500"}}} -->
 	<p style="font-size:0.9rem;font-style:normal;font-weight:500">Home</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.9rem","fontStyle":"normal","fontWeight":"500"}}} -->
 	<p style="font-size:0.9rem;font-style:normal;font-weight:500">Pages</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.9rem","fontStyle":"normal","fontWeight":"500"}}} -->
 	<p style="font-size:0.9rem;font-style:normal;font-weight:500">Posts</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30","padding":{"top":"var:preset|spacing|70"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
 	<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--70)"><!-- wp:paragraph {"style":{"typography":{"fontSize":"0.9rem","fontStyle":"normal","fontWeight":"500"}}} -->
 	<p style="font-size:0.9rem;font-style:normal;font-weight:500">Patterns</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.9rem","fontStyle":"normal","fontWeight":"500"}}} -->
 	<p style="font-size:0.9rem;font-style:normal;font-weight:500">Templates</p>
 	<!-- /wp:paragraph -->
-	
+
 	<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.9rem","fontStyle":"normal","fontWeight":"500"}}} -->
 	<p style="font-size:0.9rem;font-style:normal;font-weight:500">Contact</p>
 	<!-- /wp:paragraph --></div>
@@ -53,13 +53,13 @@
 	<!-- /wp:columns --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
-	
+
 	<!-- wp:spacer {"height":"7vh"} -->
 	<div style="height:7vh" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
-	<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} -->
-	<p class="has-text-align-left has-secondary-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
+
+	<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} -->
+	<p class="has-text-align-left has-base-2-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:group -->
diff --git a/parts/footer.html b/parts/footer.html
index 16253711..549ed007 100644
--- a/parts/footer.html
+++ b/parts/footer.html
@@ -1,5 +1,5 @@
 <!-- wp:group {"style":{"border":{"top":{"color":"var:preset|color|custom-borders","width":"1px"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--custom-borders);border-top-width:1px"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"7vh","bottom":"7vh"}}}} -->
+<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--base-3);border-top-width:1px"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"7vh","bottom":"7vh"}}}} -->
 <div class="wp-block-group alignwide" style="padding-top:7vh;padding-bottom:7vh"><!-- wp:columns -->
 <div class="wp-block-columns"><!-- wp:column {"width":"30%"} -->
 <div class="wp-block-column" style="flex-basis:30%"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|40"}},"layout":{"type":"flex","orientation":"vertical"}} -->
@@ -58,8 +58,8 @@
 <div style="height:7vh" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} -->
-<p class="has-text-align-left has-secondary-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
+<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} -->
+<p class="has-text-align-left has-base-2-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
 <!-- /wp:paragraph --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
diff --git a/parts/header.html b/parts/header.html
index 6028e580..baca622b 100644
--- a/parts/header.html
+++ b/parts/header.html
@@ -1,5 +1,5 @@
 <!-- wp:group {"style":{"border":{"bottom":{"color":"var:preset|color|custom-borders","width":"1px"},"top":[],"right":[],"left":[]}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="border-bottom-color:var(--wp--preset--color--custom-borders);border-bottom-width:1px"><!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="border-bottom-color:var(--wp--preset--color--base-3);border-bottom-width:1px"><!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignwide"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"1vh","top":"1vh","right":"0","left":"0"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 <div class="wp-block-group alignfull" style="padding-top:1vh;padding-right:0;padding-bottom:1vh;padding-left:0"><!-- wp:group {"layout":{"type":"flex"}} -->
 <div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontSize":"1.5rem"}}} -->
diff --git a/parts/post-meta.html b/parts/post-meta.html
index 0c6c34c8..cc85afd0 100644
--- a/parts/post-meta.html
+++ b/parts/post-meta.html
@@ -2,12 +2,12 @@
 <div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex"}} -->
 <div class="wp-block-group"><!-- wp:post-date {"format":"M j, Y"} /-->
 
-<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-<p class="has-secondary-color has-text-color has-link-color">—</p>
+<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+<p class="has-base-2-color has-text-color has-link-color">—</p>
 <!-- /wp:paragraph -->
 
 <!-- wp:post-author-name /-->
 
-<!-- wp:post-terms {"term":"category","prefix":"in ","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} /--></div>
+<!-- wp:post-terms {"term":"category","prefix":"in ","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} /--></div>
 <!-- /wp:group --></div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- /wp:group -->
diff --git a/patterns/home.php b/patterns/home.php
index 7bdb5754..38207378 100644
--- a/patterns/home.php
+++ b/patterns/home.php
@@ -30,8 +30,8 @@
 <!-- /wp:group -->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"6vh","bottom":"10vh"}},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"backgroundColor":"tertiary","textColor":"contrast","layout":{"type":"constrained"}} -->
-<div class="wp-block-group has-contrast-color has-tertiary-background-color has-text-color has-background has-link-color" style="padding-top:6vh;padding-bottom:10vh"><!-- wp:paragraph {"align":"center","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-center has-custom-borders-color has-text-color has-link-color has-large-font-size" style="padding-right:0;padding-left:0"><?php echo esc_html__( '✳︎', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group has-contrast-color has-tertiary-background-color has-text-color has-background has-link-color" style="padding-top:6vh;padding-bottom:10vh"><!-- wp:paragraph {"align":"center","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-center has-base-3-color has-text-color has-link-color has-large-font-size" style="padding-right:0;padding-left:0"><?php echo esc_html__( '✳︎', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|40"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
@@ -51,8 +51,8 @@
 <!-- wp:columns {"align":"wide","style":{"spacing":{"padding":{"top":"0px","bottom":"0px"}}}} -->
 <div class="wp-block-columns alignwide" style="padding-top:0px;padding-bottom:0px"><!-- wp:column -->
 <div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"left"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-center has-custom-borders-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-center has-base-3-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
@@ -67,8 +67,8 @@
 
 <!-- wp:column -->
 <div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"left"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-center has-custom-borders-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-center has-base-3-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
@@ -83,8 +83,8 @@
 
 <!-- wp:column -->
 <div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"left"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-center has-custom-borders-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-center has-base-3-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
@@ -101,8 +101,8 @@
 <!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"0"},"padding":{"top":"0px","bottom":"0px"}}}} -->
 <div class="wp-block-columns alignwide" style="padding-top:0px;padding-bottom:0px"><!-- wp:column -->
 <div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"left"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-center has-custom-borders-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-center has-base-3-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
@@ -117,8 +117,8 @@
 
 <!-- wp:column -->
 <div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"left"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-center has-custom-borders-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-center has-base-3-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
@@ -133,8 +133,8 @@
 
 <!-- wp:column -->
 <div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"left"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-center has-custom-borders-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-center has-base-3-color has-text-color has-link-color has-large-font-size"><?php echo esc_html__( '✳', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
@@ -151,8 +151,8 @@
 
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"6vh","bottom":"8vh"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="padding-top:6vh;padding-bottom:8vh"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|40"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-center has-custom-borders-color has-text-color has-link-color has-large-font-size" style="padding-right:0;padding-left:0"><?php echo esc_html__( '✳︎', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"center","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-center has-base-3-color has-text-color has-link-color has-large-font-size" style="padding-right:0;padding-left:0"><?php echo esc_html__( '✳︎', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:heading {"textAlign":"center"} -->
@@ -171,8 +171,8 @@
 <!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|50","left":"var:preset|spacing|80"}}}} -->
 <div class="wp-block-columns alignwide"><!-- wp:column {"verticalAlignment":"center"} -->
 <div class="wp-block-column is-vertically-aligned-center"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","orientation":"vertical"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-left has-custom-borders-color has-text-color has-link-color has-large-font-size" style="padding-right:0;padding-left:0"><?php echo esc_html__( '✳︎', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-left has-base-3-color has-text-color has-link-color has-large-font-size" style="padding-right:0;padding-left:0"><?php echo esc_html__( '✳︎', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:heading {"level":3,"fontSize":"large"} -->
@@ -215,8 +215,8 @@
 
 <!-- wp:column {"verticalAlignment":"center"} -->
 <div class="wp-block-column is-vertically-aligned-center"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","orientation":"vertical"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"custom-borders","fontSize":"large"} -->
-<p class="has-text-align-left has-custom-borders-color has-text-color has-link-color has-large-font-size" style="padding-right:0;padding-left:0"><?php echo esc_html__( '✳︎', 'twentytwentyfour' ); ?></p>
+<div class="wp-block-group"><!-- wp:paragraph {"align":"left","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|custom-borders"}}}},"textColor":"base-3","fontSize":"large"} -->
+<p class="has-text-align-left has-base-3-color has-text-color has-link-color has-large-font-size" style="padding-right:0;padding-left:0"><?php echo esc_html__( '✳︎', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:heading {"level":3,"fontSize":"large"} -->
@@ -257,8 +257,8 @@
 <p style="font-size:0.9rem"><strong><?php echo esc_html__( 'Annie Steiner', 'twentytwentyfour' ); ?></strong></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}},"typography":{"fontSize":"0.9rem"}},"textColor":"secondary"} -->
-<p class="has-secondary-color has-text-color has-link-color" style="font-size:0.9rem"><?php echo esc_html__( 'CEO, Greenprint', 'twentytwentyfour' ); ?></p>
+<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}},"typography":{"fontSize":"0.9rem"}},"textColor":"contrast-2"} -->
+<p class="has-base-2-color has-text-color has-link-color" style="font-size:0.9rem"><?php echo esc_html__( 'CEO, Greenprint', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
@@ -281,13 +281,13 @@
 <!-- wp:group {"style":{"spacing":{"blockGap":"0.3em","padding":{"top":"0","bottom":"0"}}},"layout":{"type":"flex","flexWrap":"wrap"}} -->
 <div class="wp-block-group" style="padding-top:0;padding-bottom:0"><!-- wp:post-date {"format":"M j, Y"} /-->
 
-<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-<p class="has-secondary-color has-text-color has-link-color"><?php echo esc_html__( '—', 'twentytwentyfour' ); ?></p>
+<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+<p class="has-base-2-color has-text-color has-link-color"><?php echo esc_html__( '—', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:post-author-name /-->
 
-<!-- wp:post-terms {"term":"category","prefix":"in ","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} /--></div>
+<!-- wp:post-terms {"term":"category","prefix":"in ","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:post-excerpt {"moreText":"","fontSize":"small"} /--></div>
@@ -309,13 +309,13 @@
 <!-- wp:group {"style":{"spacing":{"blockGap":"0.3em","padding":{"top":"0","bottom":"0"}}},"layout":{"type":"flex","flexWrap":"wrap"}} -->
 <div class="wp-block-group" style="padding-top:0;padding-bottom:0"><!-- wp:post-date {"format":"M j, Y"} /-->
 
-<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-<p class="has-secondary-color has-text-color has-link-color"><?php echo esc_html__( '—', 'twentytwentyfour' ); ?></p>
+<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+<p class="has-base-2-color has-text-color has-link-color"><?php echo esc_html__( '—', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:post-author-name /-->
 
-<!-- wp:post-terms {"term":"category","prefix":"in ","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} /--></div>
+<!-- wp:post-terms {"term":"category","prefix":"in ","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:post-excerpt {"moreText":"","style":{"typography":{"fontSize":"0.9rem"}}} /--></div>
diff --git a/patterns/sidebar-writer.php b/patterns/sidebar-writer.php
index 413d1d55..6907463f 100644
--- a/patterns/sidebar-writer.php
+++ b/patterns/sidebar-writer.php
@@ -21,8 +21,8 @@
 <!-- /wp:paragraph --></div>
 <!-- /wp:group -->
 
-<!-- wp:separator {"backgroundColor":"custom-borders"} -->
-<hr class="wp-block-separator has-text-color has-custom-borders-color has-alpha-channel-opacity has-custom-borders-background-color has-background"/>
+<!-- wp:separator {"backgroundColor":"base-3"} -->
+<hr class="wp-block-separator has-text-color has-base-3-color has-alpha-channel-opacity has-custom-borders-background-color has-background"/>
 <!-- /wp:separator -->
 
 <!-- wp:heading {"style":{"typography":{"fontSize":"1.6rem"}}} -->
@@ -37,8 +37,8 @@
 <!-- wp:group {"style":{"spacing":{"blockGap":"0.22em"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group"><!-- wp:post-date {"format":"M j, Y"} /-->
 
-<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-<p class="has-secondary-color has-text-color has-link-color" style="font-size:0.8rem"><?php echo esc_html__( '—', 'twentytwentyfour' ); ?></p>
+<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+<p class="has-base-2-color has-text-color has-link-color" style="font-size:0.8rem"><?php echo esc_html__( '—', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:post-author-name /-->
@@ -53,8 +53,8 @@
 <!-- /wp:post-template --></div>
 <!-- /wp:query -->
 
-<!-- wp:separator {"backgroundColor":"custom-borders"} -->
-<hr class="wp-block-separator has-text-color has-custom-borders-color has-alpha-channel-opacity has-custom-borders-background-color has-background"/>
+<!-- wp:separator {"backgroundColor":"base-3"} -->
+<hr class="wp-block-separator has-text-color has-base-3-color has-alpha-channel-opacity has-custom-borders-background-color has-background"/>
 <!-- /wp:separator -->
 
 <!-- wp:group {"style":{"spacing":{"blockGap":"1.6rem"}},"layout":{"type":"flex","orientation":"vertical"}} -->
diff --git a/patterns/sidebar.php b/patterns/sidebar.php
index 88f89272..2f4512e6 100644
--- a/patterns/sidebar.php
+++ b/patterns/sidebar.php
@@ -21,8 +21,8 @@
 <!-- /wp:paragraph --></div>
 <!-- /wp:group -->
 
-<!-- wp:separator {"backgroundColor":"custom-borders"} -->
-<hr class="wp-block-separator has-text-color has-custom-borders-color has-alpha-channel-opacity has-custom-borders-background-color has-background"/>
+<!-- wp:separator {"backgroundColor":"base-3"} -->
+<hr class="wp-block-separator has-text-color has-base-3-color has-alpha-channel-opacity has-custom-borders-background-color has-background"/>
 <!-- /wp:separator -->
 
 <!-- wp:heading {"style":{"typography":{"fontSize":"1.6rem"}}} -->
@@ -37,8 +37,8 @@
 <!-- wp:group {"style":{"spacing":{"blockGap":"0.22em"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group"><!-- wp:post-date {"format":"M j, Y"} /-->
 
-<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-<p class="has-secondary-color has-text-color has-link-color" style="font-size:0.8rem"><?php echo esc_html__( '—', 'twentytwentyfour' ); ?></p>
+<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+<p class="has-base-2-color has-text-color has-link-color" style="font-size:0.8rem"><?php echo esc_html__( '—', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:post-author-name /-->
@@ -53,8 +53,8 @@
 <!-- /wp:post-template --></div>
 <!-- /wp:query -->
 
-<!-- wp:separator {"backgroundColor":"custom-borders"} -->
-<hr class="wp-block-separator has-text-color has-custom-borders-color has-alpha-channel-opacity has-custom-borders-background-color has-background"/>
+<!-- wp:separator {"backgroundColor":"base-3"} -->
+<hr class="wp-block-separator has-text-color has-base-3-color has-alpha-channel-opacity has-custom-borders-background-color has-background"/>
 <!-- /wp:separator -->
 
 <!-- wp:heading {"style":{"typography":{"fontSize":"1.6rem"}}} -->
diff --git a/style.css b/style.css
index fba93443..86c147e5 100644
--- a/style.css
+++ b/style.css
@@ -20,9 +20,9 @@ Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, feature
  * https://github.com/WordPress/gutenberg/issues/42794
  */
 .wp-block-button.is-style-outline>.wp-block-button__link:not(.has-background):hover {
-	background-color: var(--wp--preset--color--secondary);
+	background-color: var(--wp--preset--color--contrast-2);
 	color: var(--wp--preset--color--base);
-	border-color: var(--wp--preset--color--secondary);
+	border-color: var(--wp--preset--color--contrast-2);
 }
 
 /*
@@ -32,4 +32,4 @@ Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, feature
 a {
 	text-decoration-thickness: .0625em !important;
 	text-underline-offset: .15em;
-}
\ No newline at end of file
+}
diff --git a/templates/home-portfolio.html b/templates/home-portfolio.html
index 88fdb8f7..b4c4856d 100644
--- a/templates/home-portfolio.html
+++ b/templates/home-portfolio.html
@@ -2,7 +2,7 @@
 <div class="wp-block-group" style="margin-top:0;margin-bottom:0;padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:group {"style":{"position":{"type":""},"border":{"bottom":{"width":"0px","style":"none"}}},"layout":{"type":"default"}} -->
 	<div class="wp-block-group" style="border-bottom-style:none;border-bottom-width:0px"><!-- wp:template-part {"slug":"header-portfolio"} /--></div>
 	<!-- /wp:group -->
-	
+
 	<!-- wp:group {"style":{"spacing":{"padding":{"top":"8vh","bottom":"8vh"}}},"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group" style="padding-top:8vh;padding-bottom:8vh"><!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"70%"} -->
@@ -10,13 +10,13 @@
 	<h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa appassionata che trova ispirazione nel catturare la bellezza fugace della vita.</h2>
 	<!-- /wp:heading --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div>
 	<!-- /wp:group -->
-	
+
 	<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70","top":"6vh","bottom":"6vh"}}},"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group" style="padding-top:6vh;padding-right:var(--wp--preset--spacing--70);padding-bottom:6vh;padding-left:var(--wp--preset--spacing--70)"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"4rem","left":"4rem"}}}} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column -->
@@ -26,19 +26,19 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer {"height":"7vh"} -->
 	<div style="height:7vh" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
+
 	<!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":1,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
 	<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":2,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
@@ -46,12 +46,12 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer {"height":"12vh"} -->
 	<div style="height:12vh" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
+
 	<!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":3,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
 	<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->
@@ -59,7 +59,7 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:query --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
-	
+
 	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"4rem","left":"4rem"}}}} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":4,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
@@ -68,19 +68,19 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer {"height":"9vh"} -->
 	<div style="height:9vh" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
+
 	<!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":5,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
 	<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":6,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
@@ -88,12 +88,12 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer {"height":"11vh"} -->
 	<div style="height:11vh" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
+
 	<!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":7,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
 	<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->
@@ -101,7 +101,7 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:query --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
-	
+
 	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"4rem","left":"4rem"}}}} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":8,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
@@ -110,19 +110,19 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer {"height":"9vh"} -->
 	<div style="height:9vh" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
+
 	<!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":9,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
 	<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":10,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
@@ -130,12 +130,12 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:post-template --></div>
 	<!-- /wp:query --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column -->
 	<div class="wp-block-column"><!-- wp:spacer {"height":"11vh"} -->
 	<div style="height:11vh" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
+
 	<!-- wp:query {"queryId":14,"query":{"perPage":1,"pages":0,"offset":11,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 	<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
 	<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->
@@ -145,36 +145,36 @@ <h2 class="wp-block-heading alignwide">Sono <em>Leia Acosta</em>, una fotografa
 	<!-- /wp:columns --></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:group -->
-	
+
 	<!-- wp:group {"style":{"border":{"top":{"width":"0px","style":"none"},"right":[],"bottom":[],"left":[]}},"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group" style="border-top-style:none;border-top-width:0px"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"7vh","bottom":"7vh"}}}} -->
 	<div class="wp-block-group alignwide" style="padding-top:7vh;padding-bottom:7vh"><!-- wp:image {"id":56,"width":40,"sizeSlug":"full","linkDestination":"none"} -->
 	<figure class="wp-block-image size-full is-resized"><img src="https://tt4portfolio.mystagingwebsite.com/wp-content/uploads/2023/08/message_icon.png" alt="" class="wp-image-56" style="width:40px" width="40"/></figure>
 	<!-- /wp:image -->
-	
+
 	<!-- wp:separator -->
 	<hr class="wp-block-separator has-alpha-channel-opacity"/>
 	<!-- /wp:separator -->
-	
+
 	<!-- wp:columns {"style":{"spacing":{"padding":{"top":"2vh"}}}} -->
 	<div class="wp-block-columns" style="padding-top:2vh"><!-- wp:column {"width":"57%"} -->
 	<div class="wp-block-column" style="flex-basis:57%"><!-- wp:heading -->
 	<h2 class="wp-block-heading">Resta al passo, contattaci.</h2>
 	<!-- /wp:heading --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column {"width":"30%"} -->
 	<div class="wp-block-column" style="flex-basis:30%"><!-- wp:group {"style":{"spacing":{"blockGap":"2px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
 	<div class="wp-block-group"><!-- wp:paragraph -->
 	<p>Contattami</p>
 	<!-- /wp:paragraph -->
-	
-	<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-	<p class="has-secondary-color has-text-color has-link-color">example@wordpress.org</p>
+
+	<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+	<p class="has-base-2-color has-text-color has-link-color">example@wordpress.org</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:column -->
-	
+
 	<!-- wp:column {"width":"30%"} -->
 	<div class="wp-block-column" style="flex-basis:30%"><!-- wp:columns {"isStackedOnMobile":false} -->
 	<div class="wp-block-columns is-not-stacked-on-mobile"><!-- wp:column -->
@@ -182,28 +182,28 @@ <h2 class="wp-block-heading">Resta al passo, contattaci.</h2>
 	<div class="wp-block-group"><!-- wp:paragraph -->
 	<p>Seguimi</p>
 	<!-- /wp:paragraph -->
-	
-	<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-	<p class="has-secondary-color has-text-color has-link-color">Instagram / Facebook</p>
+
+	<!-- wp:paragraph {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+	<p class="has-base-2-color has-text-color has-link-color">Instagram / Facebook</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns --></div>
 	<!-- /wp:column --></div>
 	<!-- /wp:columns -->
-	
+
 	<!-- wp:spacer {"height":"7vh"} -->
 	<div style="height:7vh" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
-	
+
 	<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-	<div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-	<p class="has-secondary-color has-text-color has-link-color" style="font-size:0.8rem">© 2024 Twenty Twenty Four</p>
+	<div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+	<p class="has-base-2-color has-text-color has-link-color" style="font-size:0.8rem">© 2024 Twenty Twenty Four</p>
 	<!-- /wp:paragraph -->
-	
-	<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} -->
-	<p class="has-text-align-left has-secondary-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
+
+	<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} -->
+	<p class="has-text-align-left has-base-2-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:group --></div>
-	<!-- /wp:group -->
\ No newline at end of file
+	<!-- /wp:group -->
diff --git a/templates/home-writer.html b/templates/home-writer.html
index e8bc8ebe..3620e72d 100644
--- a/templates/home-writer.html
+++ b/templates/home-writer.html
@@ -26,8 +26,8 @@ <h2 class="wp-block-heading has-text-align-center has-large-font-size"><em>J'éc
 	<!-- wp:group {"style":{"spacing":{"blockGap":"0.22em"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 	<div class="wp-block-group"><!-- wp:post-date {"format":"M j, Y"} /-->
 
-	<!-- wp:paragraph {"style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"textColor":"secondary"} -->
-	<p class="has-secondary-color has-text-color has-link-color" style="font-size:0.8rem">—</p>
+  <!-- wp:paragraph {"style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
+	<p class="has-base-2-color has-text-color has-link-color" style="font-size:0.8rem">—</p>
 	<!-- /wp:paragraph -->
 
 	<!-- wp:post-author-name /-->
@@ -98,8 +98,8 @@ <h2 class="wp-block-heading">Rejoignez plus de 900 abonnés</h2>
 
 	<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"center"},"style":{"typography":{"fontSize":"0.9rem"}}} /-->
 
-	<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"secondary"} -->
-	<p class="has-text-align-center has-secondary-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a href="http://wordpress.org" data-type="link" data-id="wordpress.org">WordPress</a></p>
+	<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"0.8rem"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast-2"} -->
+	<p class="has-text-align-center has-base-2-color has-text-color has-link-color" style="font-size:0.8rem">Designed with <a href="http://wordpress.org" data-type="link" data-id="wordpress.org">WordPress</a></p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:group -->
diff --git a/theme.json b/theme.json
index 092d8cbc..85edb8b5 100644
--- a/theme.json
+++ b/theme.json
@@ -10,104 +10,54 @@
 					"slug": "base"
 				},
 				{
-					"color": "#000000",
-					"name": "Contrast",
-					"slug": "contrast"
-				},
-				{
-					"color": "#000000",
-					"name": "Primary",
-					"slug": "primary"
-				},
-				{
-					"color": "#636363",
-					"name": "Secondary",
-					"slug": "secondary"
+					"color": "#ffffff",
+					"name": "Base / Two",
+					"slug": "base-2"
 				},
 				{
-					"color": "#ffffff",
-					"name": "Tertiary",
-					"slug": "tertiary"
+					"color": "#00000025",
+					"name": "Base / Three",
+					"slug": "base-3"
 				},
 				{
-					"color": "#00000029",
-					"name": "Borders",
-					"slug": "custom-borders"
+					"color": "#000000",
+					"name": "Contrast",
+					"slug": "contrast"
 				},
 				{
-					"color": "#b5bdbc",
-					"name": "Mint",
-					"slug": "custom-mint"
+					"color": "#636363",
+					"name": "Contrast / Two",
+					"slug": "contrast-2"
 				},
 				{
-					"color": "#c2a990",
-					"name": "Brown",
-					"slug": "custom-brown"
+					"color": "#A4A4A4",
+					"name": "Contrast / Three",
+					"slug": "contrast-3"
 				},
 				{
 					"color": "#cfcabe",
-					"name": "Beige",
-					"slug": "custom-beige"
+					"name": "Accent",
+					"slug": "accent"
 				},
 				{
-					"color": "#e8edf1",
-					"name": "Light Blue",
-					"slug": "custom-light-blue"
+					"color": "#c2a990",
+					"name": "Accent / Two",
+					"slug": "accent-2"
 				},
 				{
 					"color": "#d26e57",
-					"name": "Brick",
-					"slug": "custom-brick"
+					"name": "Accent / Three",
+					"slug": "accent-3"
 				},
 				{
 					"color": "#b1c5a4",
-					"name": "Dark Green",
-					"slug": "custom-dark-green"
+					"name": "Accent / Four",
+					"slug": "accent-4"
 				},
 				{
-					"color": "#18182d",
-					"name": "Purple - Background",
-					"slug": "custom-purple-background"
-				},
-				{
-					"color": "#232339",
-					"name": "Purple - Tertiary",
-					"slug": "custom-purple-tertiary"
-				},
-				{
-					"color": "#b3b3dc",
-					"name": "Purple - Secondary",
-					"slug": "custom-purple-secondary"
-				},
-				{
-					"color": "#c8cddf",
-					"name": "Purple - Primary/Contrast",
-					"slug": "custom-purple-primary-contrast"
-				},
-				{
-					"color": "#6640d6",
-					"name": "Purple - Buttons",
-					"slug": "custom-purple-buttons"
-				},
-				{
-					"color": "#eceae4",
-					"name": "Beige - Background",
-					"slug": "custom-beige-background"
-				},
-				{
-					"color": "#37392f",
-					"name": "Beige - Primary/Contrast",
-					"slug": "custom-beige-primary-contrast"
-				},
-				{
-					"color": "#73746d",
-					"name": "Beige - Secondary",
-					"slug": "custom-beige-secondary"
-				},
-				{
-					"color": "#f8f6f2",
-					"name": "Beige - Tertiary",
-					"slug": "custom-beige-tertiary"
+					"color": "#b5bdbc",
+					"name": "Accent / Five",
+					"slug": "accent-5"
 				}
 			]
 		},
@@ -368,12 +318,12 @@
 			},
 			"core/comment-date": {
 				"color": {
-					"text": "var(--wp--preset--color--secondary)"
+					"text": "var(--wp--preset--color--contrast-2)"
 				},
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var(--wp--preset--color--secondary)"
+							"text": "var(--wp--preset--color--contrast-2)"
 						}
 					}
 				},
@@ -385,7 +335,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var(--wp--preset--color--secondary)"
+							"text": "var(--wp--preset--color--contrast-2)"
 						}
 					}
 				},
@@ -397,7 +347,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var(--wp--preset--color--secondary)"
+							"text": "var(--wp--preset--color--contrast-2)"
 						}
 					}
 				},
@@ -489,7 +439,7 @@
 			},
 			"core/post-date": {
 				"color": {
-					"text": "var(--wp--preset--color--secondary)"
+					"text": "var(--wp--preset--color--contrast-2)"
 				},
 				"elements": {
 					"link": {
@@ -499,7 +449,7 @@
 							}
 						},
 						"color": {
-							"text": "var(--wp--preset--color--secondary)"
+							"text": "var(--wp--preset--color--contrast-2)"
 						},
 						"typography": {
 							"textDecoration": "none"
@@ -679,7 +629,7 @@
 				},
 				":hover": {
 					"color": {
-						"background": "var(--wp--preset--color--secondary)",
+						"background": "var(--wp--preset--color--contrast-2)",
 						"text": "var(--wp--preset--color--base)"
 					}
 				},
@@ -693,7 +643,7 @@
 			},
 			"caption": {
 				"color": {
-					"text": "var(--wp--preset--color--secondary)"
+					"text": "var(--wp--preset--color--contrast-2)"
 				},
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--system-font)",