diff --git a/creatio-2/parts/header.html b/creatio-2/parts/header.html
index f25ccf265..7ffcd328c 100644
--- a/creatio-2/parts/header.html
+++ b/creatio-2/parts/header.html
@@ -1,5 +1,5 @@
-<!-- wp:group {"style":{"color":{"background":"#ffffff"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group has-background" style="background-color:#ffffff"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|60","top":"var:preset|spacing|60","right":"0px","left":"0px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<!-- wp:group {"layout":{"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|60","top":"var:preset|spacing|60","right":"0px","left":"0px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 <div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--60);padding-right:0px;padding-bottom:var(--wp--preset--spacing--60);padding-left:0px"><!-- wp:group {"layout":{"type":"flex"}} -->
 <div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"0px"}}} -->
 <div class="wp-block-group"><!-- wp:site-title /--></div>
@@ -7,9 +7,7 @@
 <!-- /wp:group -->
 
 <!-- wp:group {"style":{"spacing":{"blockGap":"40px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group">
-	<!-- wp:navigation {"overlayBackgroundColor":"secondary","overlayTextColor":"background","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->
-</div>
+<div class="wp-block-group"><!-- wp:navigation {"overlayBackgroundColor":"secondary","overlayTextColor":"background","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|40"}}} /--></div>
 <!-- /wp:group --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/creatio-2/templates/single.html b/creatio-2/templates/single.html
index 0564036ef..886e02690 100644
--- a/creatio-2/templates/single.html
+++ b/creatio-2/templates/single.html
@@ -51,9 +51,9 @@
 
 <!-- wp:group {"style":{"spacing":{"margin":{"top":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--60)"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","label":"Previous Post<br>","showTitle":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}}} /-->
+<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","label":"Previous Post<br>","showTitle":true} /-->
 
-<!-- wp:post-navigation-link {"textAlign":"right","label":"Next Post<br>","showTitle":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}}} /--></div>
+<!-- wp:post-navigation-link {"textAlign":"right","label":"Next Post<br>","showTitle":true} /--></div>
 <!-- /wp:group --></div>
 <!-- /wp:group --></main>
 <!-- /wp:group -->
diff --git a/creatio-2/theme.json b/creatio-2/theme.json
index 7ee60813e..b72d10a48 100644
--- a/creatio-2/theme.json
+++ b/creatio-2/theme.json
@@ -315,12 +315,12 @@
 			},
 			"core/heading": {
 				"color": {
-					"text": "var(--wp--preset--color--primary)"
+					"text": "var(--wp--preset--color--foreground)"
 				},
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var(--wp--preset--color--primary)"
+							"text": "var(--wp--preset--color--foreground)"
 						}
 					}
 				}
@@ -390,20 +390,20 @@
 			},
 			"core/post-title": {
 				"color": {
-					"text": "var(--wp--preset--color--primary)"
+					"text": "var(--wp--preset--color--foreground)"
 				},
 				"elements": {
 					"link": {
 						":hover": {
 							"color": {
-								"text": "var(--wp--preset--color--secondary)"
+								"text": "var(--wp--preset--color--primary)"
 							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
 						"color": {
-							"text": "var(--wp--preset--color--primary)"
+							"text": "var(--wp--preset--color--foreground)"
 						},
 						"typography": {
 							"textDecoration": "none"
@@ -496,7 +496,7 @@
 							}
 						},
 						"color": {
-							"text": "var(--wp--preset--color--primary)"
+							"text": "var(--wp--preset--color--foreground)"
 						},
 						"typography": {
 							"textDecoration": "none"
@@ -602,7 +602,7 @@
 					}
 				},
 				"color": {
-					"text": "var(--wp--preset--color--secondary)"
+					"text": "var(--wp--preset--color--foreground)"
 				}
 			}
 		},