Update theme ron (#7563)

* Changes from WordPress Playground

* Remove nav refs

* Remove reference to local URL

---------

Co-authored-by: Sarah Norris <sarah@sekai.co.uk>

ron/parts/header.html

@@ -1,5 +1,5 @@
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"9rem"}},"border":{"top":{"color":"var:preset|color|tertiary","style":"solid","width":"1px"},"right":{"width":"0px","style":"none"},"bottom":{"width":"0px","style":"none"},"left":{"width":"0px","style":"none"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-style:solid;border-top-width:1px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;padding-top:var(--wp--preset--spacing--70);padding-bottom:9rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"0","top":"0","right":"0","left":"0"}}},"layout":{"type":"flex","justifyContent":"space-between","verticalAlignment":"top"}} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"6rem"}},"border":{"top":{"color":"var:preset|color|tertiary","style":"solid","width":"1px"},"right":{"width":"0px","style":"none"},"bottom":{"width":"0px","style":"none"},"left":{"width":"0px","style":"none"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-style:solid;border-top-width:1px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;padding-top:var(--wp--preset--spacing--70);padding-bottom:6rem"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"0","top":"0","right":"0","left":"0"}}},"layout":{"type":"flex","justifyContent":"space-between","verticalAlignment":"top"}} -->
 <div class="wp-block-group alignwide" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 <div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}}} -->
 <div class="wp-block-group"><!-- wp:site-title /-->

ron/templates/404.html

@@ -1,17 +1,13 @@
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"12rem","bottom":"12rem"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-top: 12rem; padding-bottom: 12rem">
-	<!-- wp:heading {"align":"wide","fontSize":"x-large"} -->
-	<h2 class="wp-block-heading alignwide has-x-large-font-size">
-		Something went wrong.
-	</h2>
-	<!-- /wp:heading -->
+<div class="wp-block-group" style="padding-top:12rem;padding-bottom:12rem"><!-- wp:heading {"align":"wide","fontSize":"x-large"} -->
+<h2 class="wp-block-heading alignwide has-x-large-font-size">Something went wrong. </h2>
+<!-- /wp:heading -->
 
-	<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
-	<div class="wp-block-group alignwide">
-		<!-- wp:pattern {"slug":"ron/go-back-home"} /-->
-	</div>
-	<!-- /wp:group -->
-</div>
+<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
+<div class="wp-block-group alignwide"><!-- wp:paragraph -->
+<p><a href="/" rel="home">Go back</a></p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"header"} /-->
+<!-- wp:template-part {"slug":"header"} /-->

ron/templates/archive.html

@@ -1,7 +1,7 @@
 <!-- wp:template-part {"slug":"header"} /-->
 
-<!-- wp:group {"style":{"spacing":{"blockGap":"2rem","padding":{"top":"8vh","bottom":"8vh"}},"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"},"right":{"width":"0px","style":"none"},"bottom":{"width":"0px","style":"none"},"left":{"width":"0px","style":"none"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-width:1px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;padding-top:8vh;padding-bottom:8vh"><!-- wp:query-title {"type":"archive"} /-->
+<!-- wp:group {"style":{"spacing":{"blockGap":"2rem","padding":{"top":"8vh","bottom":"8vh"}},"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"},"right":{"width":"0px","style":"none"},"bottom":{"width":"0px","style":"none"},"left":{"width":"0px","style":"none"}},"dimensions":{"minHeight":"700px"}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-width:1px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;min-height:700px;padding-top:8vh;padding-bottom:8vh"><!-- wp:query-title {"type":"archive","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|50"}}}} /-->
 
 <!-- wp:query {"queryId":12,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
 <div class="wp-block-query"><!-- wp:post-template -->
@@ -11,10 +11,16 @@
 <!-- wp:post-date {"style":{"typography":{"fontSize":"0.9rem"}}} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:separator -->
-<hr class="wp-block-separator has-alpha-channel-opacity"/>
+<!-- wp:separator {"backgroundColor":"tertiary","className":"is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-tertiary-color has-alpha-channel-opacity has-tertiary-background-color has-background is-style-wide"/>
 <!-- /wp:separator -->
-<!-- /wp:post-template --></div>
+<!-- /wp:post-template -->
+
+<!-- wp:query-no-results -->
+<!-- wp:paragraph -->
+<p>Sorry, but nothing matched your search terms. Please try again with some different keywords.</p>
+<!-- /wp:paragraph -->
+<!-- /wp:query-no-results --></div>
 <!-- /wp:query --></div>
 <!-- /wp:group -->
 

ron/templates/page.html

@@ -1,11 +1,17 @@
 <!-- wp:template-part {"slug":"header"} /-->
 
-<!-- wp:group {"lock":{"move":false,"remove":true},"style":{"spacing":{"blockGap":"2rem","padding":{"top":"8vh","bottom":"8vh"}},"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"},"right":{"width":"0px","style":"none"},"bottom":{"width":"0px","style":"none"},"left":{"width":"0px","style":"none"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-width:1px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;padding-top:8vh;padding-bottom:8vh"><!-- wp:post-title {"textAlign":"left"} /-->
+<!-- wp:group {"lock":{"move":false,"remove":true},"style":{"spacing":{"blockGap":"2rem","padding":{"top":"8vh","bottom":"8vh","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}},"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"},"right":{"width":"0px","style":"none"},"bottom":{"width":"0px","style":"none"},"left":{"width":"0px","style":"none"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-width:1px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;padding-top:8vh;padding-right:var(--wp--preset--spacing--50);padding-bottom:8vh;padding-left:var(--wp--preset--spacing--50)"><!-- wp:post-title /-->
 
-<!-- wp:post-content {"align":"wide","layout":{"type":"constrained"}} /--></div>
+<!-- wp:post-featured-image {"isLink":true} /-->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"0","left":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="padding-right:0;padding-left:0"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group alignfull" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:post-content {"align":"full","style":{"dimensions":{"minHeight":"500px"}},"layout":{"type":"constrained"}} /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"style":{"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"}},"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-width:1px;padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:navigation {"overlayMenu":"never","align":"wide","layout":{"type":"flex","flexWrap":"wrap"}} /--></div>
-<!-- /wp:group -->
+<!-- /wp:group -->

ron/templates/search.html

@@ -1,7 +1,7 @@
 <!-- wp:template-part {"slug":"header"} /-->
 
-<!-- wp:group {"style":{"spacing":{"blockGap":"2rem","padding":{"top":"8vh","bottom":"8vh"}},"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"},"right":{"width":"0px","style":"none"},"bottom":{"width":"0px","style":"none"},"left":{"width":"0px","style":"none"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-width:1px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;padding-top:8vh;padding-bottom:8vh"><!-- wp:query-title {"type":"search"} /-->
+<!-- wp:group {"style":{"spacing":{"blockGap":"2rem","padding":{"top":"8vh","bottom":"8vh"}},"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"},"right":{"width":"0px","style":"none"},"bottom":{"width":"0px","style":"none"},"left":{"width":"0px","style":"none"}},"dimensions":{"minHeight":"700px"}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-width:1px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;min-height:700px;padding-top:8vh;padding-bottom:8vh"><!-- wp:query-title {"type":"search","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|50"}}}} /-->
 
 <!-- wp:query {"queryId":12,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
 <div class="wp-block-query"><!-- wp:post-template -->
@@ -11,17 +11,19 @@
 <!-- wp:post-date {"style":{"typography":{"fontSize":"0.9rem"}}} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:separator -->
-<hr class="wp-block-separator has-alpha-channel-opacity"/>
+<!-- wp:separator {"backgroundColor":"tertiary","className":"is-style-wide"} -->
+<hr class="wp-block-separator has-text-color has-tertiary-color has-alpha-channel-opacity has-tertiary-background-color has-background is-style-wide"/>
 <!-- /wp:separator -->
 <!-- /wp:post-template -->
 
 <!-- wp:query-no-results -->
-<!-- wp:pattern {"slug":"ron/no-results-content"} -->
+<!-- wp:paragraph -->
+<p>Sorry, but nothing matched your search terms. Please try again with some different keywords.</p>
+<!-- /wp:paragraph -->
 <!-- /wp:query-no-results --></div>
 <!-- /wp:query --></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"style":{"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"}},"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"type":"constrained"}} -->
+<!-- wp:group {"lock":{"move":true,"remove":true},"style":{"border":{"top":{"color":"var:preset|color|tertiary","width":"1px"}},"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="border-top-color:var(--wp--preset--color--tertiary);border-top-width:1px;padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:navigation {"overlayMenu":"never","align":"wide","layout":{"type":"flex","flexWrap":"wrap"}} /--></div>
 <!-- /wp:group -->

ron/templates/single.html

@@ -1,9 +1,9 @@
 <!-- wp:group {"style":{"position":{"type":"sticky","top":"0px"},"spacing":{"padding":{"top":"20px","bottom":"20px"}},"border":{"top":{"style":"none","width":"0px"},"right":{"style":"none","width":"0px"},"bottom":{"color":"var:preset|color|tertiary","style":"solid","width":"1px"},"left":{"style":"none","width":"0px"}}},"backgroundColor":"background","layout":{"type":"constrained","wideSize":"1100px"}} -->
 <div class="wp-block-group has-background-background-color has-background" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-color:var(--wp--preset--color--tertiary);border-bottom-style:solid;border-bottom-width:1px;border-left-style:none;border-left-width:0px;padding-top:20px;padding-bottom:20px"><!-- wp:group {"style":{"spacing":{"blockGap":"10px"}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
 <div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"20px"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left"}} -->
-<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","showTitle":true,"arrow":"arrow"} /-->
+<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","arrow":"arrow"} /-->
 
-<!-- wp:post-navigation-link {"showTitle":true,"arrow":"arrow"} /--></div>
+<!-- wp:post-navigation-link {"arrow":"arrow"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:navigation {"overlayMenu":"never","hasIcon":false,"layout":{"type":"flex","justifyContent":"right"}} /--></div>
@@ -13,7 +13,7 @@
 <!-- wp:group {"style":{"border":{"top":{"style":"none","width":"0px"},"right":{"style":"none","width":"0px"},"bottom":{"style":"none","width":"0px"},"left":{"style":"none","width":"0px"}},"spacing":{"padding":{"top":"var:preset|spacing|80"}}},"layout":{"type":"constrained","wideSize":"1100px"}} -->
 <div class="wp-block-group" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;padding-top:var(--wp--preset--spacing--80)"><!-- wp:columns -->
 <div class="wp-block-columns"><!-- wp:column {"width":"66.66%"} -->
-<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-title {"isLink":true} /-->
+<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-title /-->
 
 <!-- wp:post-date /--></div>
 <!-- /wp:column -->
@@ -23,8 +23,8 @@
 <!-- /wp:column --></div>
 <!-- /wp:columns -->
 
-<!-- wp:columns {"style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}}} -->
-<div class="wp-block-columns" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)"><!-- wp:column {"width":"66.66%"} -->
+<!-- wp:columns {"style":{"spacing":{"padding":{"top":"0","bottom":"0"}}}} -->
+<div class="wp-block-columns" style="padding-top:0;padding-bottom:0"><!-- wp:column {"width":"66.66%"} -->
 <div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>
 <!-- /wp:column -->
 
@@ -39,7 +39,45 @@
 <!-- /wp:column -->
 
 <!-- wp:column {"width":"70%"} -->
-<div class="wp-block-column" style="flex-basis:70%"><!-- wp:post-content {"style":{"dimensions":{"minHeight":"500px"}}} /--></div>
+<div class="wp-block-column" style="flex-basis:70%"><!-- wp:post-content {"style":{"dimensions":{"minHeight":"500px"}}} /-->
+
+<!-- wp:comments {"style":{"spacing":{"margin":{"top":"var:preset|spacing|80","bottom":"var:preset|spacing|80"}}}} -->
+<div class="wp-block-comments" style="margin-top:var(--wp--preset--spacing--80);margin-bottom:var(--wp--preset--spacing--80)"><!-- wp:comments-title /-->
+
+<!-- wp:comment-template -->
+<!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"width":"40px"} -->
+<div class="wp-block-column" style="flex-basis:40px"><!-- wp:avatar {"size":40,"style":{"border":{"radius":"20px"}}} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}}} -->
+<div class="wp-block-column"><!-- wp:comment-author-name {"fontSize":"small"} /-->
+
+<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"flex"}} -->
+<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px"><!-- wp:comment-date {"isLink":false} /--></div>
+<!-- /wp:group -->
+
+<!-- wp:comment-content /-->
+
+<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<div class="wp-block-group"><!-- wp:comment-edit-link /-->
+
+<!-- wp:comment-reply-link /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+<!-- /wp:comment-template -->
+
+<!-- wp:comments-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<!-- wp:comments-pagination-previous /-->
+
+<!-- wp:comments-pagination-numbers /-->
+
+<!-- wp:comments-pagination-next /-->
+<!-- /wp:comments-pagination -->
+
+<!-- wp:post-comments-form /--></div>
+<!-- /wp:comments --></div>
 <!-- /wp:column --></div>
 <!-- /wp:columns -->
 

ron/theme.json

@@ -42,143 +42,6 @@
 		},
 		"layout": {
 			"contentSize": "620px",
-			"definitions": {
-				"constrained": {
-					"baseStyles": [
-						{
-							"rules": {
-								"float": "left",
-								"margin-inline-end": "2em",
-								"margin-inline-start": "0"
-							},
-							"selector": " > .alignleft"
-						},
-						{
-							"rules": {
-								"float": "right",
-								"margin-inline-end": "0",
-								"margin-inline-start": "2em"
-							},
-							"selector": " > .alignright"
-						},
-						{
-							"rules": {
-								"margin-left": "auto !important",
-								"margin-right": "auto !important"
-							},
-							"selector": " > .aligncenter"
-						},
-						{
-							"rules": {
-								"margin-left": "auto !important",
-								"margin-right": "auto !important",
-								"max-width": "var(--wp--style--global--content-size)"
-							},
-							"selector": " > :where(:not(.alignleft):not(.alignright):not(.alignfull))"
-						},
-						{
-							"rules": {
-								"max-width": "var(--wp--style--global--wide-size)"
-							},
-							"selector": " > .alignwide"
-						}
-					],
-					"className": "is-layout-constrained",
-					"name": "constrained",
-					"slug": "constrained",
-					"spacingStyles": [
-						{
-							"rules": {
-								"margin-block-end": "0",
-								"margin-block-start": "0"
-							},
-							"selector": " > *"
-						},
-						{
-							"rules": {
-								"margin-block-end": "0",
-								"margin-block-start": null
-							},
-							"selector": " > * + *"
-						}
-					]
-				},
-				"default": {
-					"baseStyles": [
-						{
-							"rules": {
-								"float": "left",
-								"margin-inline-end": "2em",
-								"margin-inline-start": "0"
-							},
-							"selector": " > .alignleft"
-						},
-						{
-							"rules": {
-								"float": "right",
-								"margin-inline-end": "0",
-								"margin-inline-start": "2em"
-							},
-							"selector": " > .alignright"
-						},
-						{
-							"rules": {
-								"margin-left": "auto !important",
-								"margin-right": "auto !important"
-							},
-							"selector": " > .aligncenter"
-						}
-					],
-					"className": "is-layout-flow",
-					"name": "default",
-					"slug": "flow",
-					"spacingStyles": [
-						{
-							"rules": {
-								"margin-block-end": "0",
-								"margin-block-start": "0"
-							},
-							"selector": " > *"
-						},
-						{
-							"rules": {
-								"margin-block-end": "0",
-								"margin-block-start": null
-							},
-							"selector": " > * + *"
-						}
-					]
-				},
-				"flex": {
-					"baseStyles": [
-						{
-							"rules": {
-								"align-items": "center",
-								"flex-wrap": "wrap"
-							},
-							"selector": ""
-						},
-						{
-							"rules": {
-								"margin": "0"
-							},
-							"selector": " > *"
-						}
-					],
-					"className": "is-layout-flex",
-					"displayMode": "flex",
-					"name": "flex",
-					"slug": "flex",
-					"spacingStyles": [
-						{
-							"rules": {
-								"gap": null
-							},
-							"selector": ""
-						}
-					]
-				}
-			},
 			"wideSize": "1100px"
 		},
 		"shadow": {
@@ -559,17 +422,27 @@
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/comment-date": {
+			"core/comment-content": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
+			"core/comment-date": {
+				"typography": {
+					"fontSize": "0.8rem"
+				}
+			},
 			"core/comment-edit-link": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "0.8rem"
 				}
 			},
 			"core/comment-reply-link": {
+				"typography": {
+					"fontSize": "0.8rem"
+				}
+			},
+			"core/comments-pagination": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
@@ -602,7 +475,7 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var:preset|font-size|small"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/post-author-name": {
@@ -644,13 +517,16 @@
 					"link": {
 						":hover": {
 							"color": {
-								"text": "var:preset|color|primary"
+								"text": "var(--wp--preset--color--primary)"
 							}
 						},
 						"color": {
-							"text": "var:preset|color|foreground"
+							"text": "var(--wp--preset--color--foreground)"
 						}
 					}
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/post-title": {
@@ -658,7 +534,7 @@
 					"link": {
 						":hover": {
 							"color": {
-								"text": "var:preset|color|foreground"
+								"text": "var(--wp--preset--color--foreground)"
 							},
 							"typography": {
 								"textDecoration": "underline"
@@ -675,7 +551,7 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var:preset|font-size|x-large"
+					"fontSize": "var(--wp--preset--font-size--x-large)"
 				}
 			},
 			"core/pullquote": {
@@ -749,7 +625,7 @@
 			},
 			"core/site-tagline": {
 				"typography": {
-					"fontSize": "var:preset|font-size|small"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/site-title": {
@@ -757,14 +633,14 @@
 					"link": {
 						":hover": {
 							"color": {
-								"text": "var:preset|color|foreground"
+								"text": "var(--wp--preset--color--foreground)"
 							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
 						"color": {
-							"text": "var:preset|color|primary"
+							"text": "var(--wp--preset--color--primary)"
 						},
 						"typography": {
 							"textDecoration": "none"
@@ -772,8 +648,8 @@
 					}
 				},
 				"typography": {
-					"fontFamily": "var:preset|font-family|uncut-sans-light",
-					"fontSize": "var:preset|font-size|large",
+					"fontFamily": "var(--wp--preset--font-family--uncut-sans-light)",
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"fontStyle": "normal",
 					"fontWeight": "300",
 					"textTransform": "none"
@@ -850,7 +726,7 @@
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var:preset|font-family|crimson-pro",
+					"fontFamily": "var(--wp--preset--font-family--crimson-pro)",
 					"fontStyle": "normal",
 					"fontWeight": "500",
 					"lineHeight": "1.125"
@@ -877,7 +753,7 @@
 			}
 		},
 		"typography": {
-			"fontFamily": "var:preset|font-family|uncut-sans-light",
+			"fontFamily": "var(--wp--preset--font-family--uncut-sans-light)",
 			"fontSize": "var(--wp--preset--font-size--medium)",
 			"lineHeight": "1.6"
 		}