From 99989afa24e295851adb027557aeec0900ee71d6 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Tue, 4 Oct 2022 01:10:12 +0000
Subject: [PATCH] Twenty Twenty-Three: Bug fixes and improvements for beta 3.

This brings over the latest bug fixes and improvements ahead of WordPress 6.1 beta 3.

For a full list of changes being included, see the `twentytwentythree` repository on GitHub: https://github.com/WordPress/twentytwentythree/compare/ac96e8d545a69fc6515312d548b036f267ec7104...ca662828b7e3ae12e03f35903a83cf2cfaa4ce4f.

Props mikachan, poena, madhudollu, beafialho, colorful-tones, scruffian, tahmidulkarim, joen, taskotr, zoonini, mayuge, ndiego, collet.
See #56383.

git-svn-id: https://develop.svn.wordpress.org/trunk@54372 602fd350-edb4-49c9-b593-d223f7449a82
---
 patterns/hidden-no-results.php     |  14 ++++
 patterns/post-meta.php             |   2 +-
 styles/aubergine.json              |  16 ++---
 styles/block-out.json              |   5 ++
 styles/canary.json                 |  16 ++++-
 styles/electric.json               |  25 ++++++-
 styles/grapes.json                 |  18 ++++-
 styles/marigold.json               |  15 ++--
 styles/pilgrimage.json             |   7 +-
 styles/pitch.json                  |  42 ++++++++----
 styles/sherbet.json                | 106 +++++++++++++++++++++++------
 styles/whisper.json                |  54 ++++++++++++++-
 templates/home.html                |   5 --
 templates/page.html                |   1 +
 templates/search.html              |   6 +-
 templates/single.html              |   1 +
 templates/with-cover-block.html    |  19 ------
 templates/with-featured-image.html |  18 -----
 theme.json                         |  63 +++++------------
 19 files changed, 280 insertions(+), 153 deletions(-)
 create mode 100644 patterns/hidden-no-results.php
 delete mode 100644 templates/with-cover-block.html
 delete mode 100644 templates/with-featured-image.html

diff --git a/patterns/hidden-no-results.php b/patterns/hidden-no-results.php
new file mode 100644
index 0000000..d3f7ae0
--- /dev/null
+++ b/patterns/hidden-no-results.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Title: Hidden No Results Content
+ * Slug: twentytwentythree/hidden-no-results-content
+ * Inserter: no
+ */
+?>
+<!-- wp:paragraph -->
+<p>
+<?php echo esc_html_x( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'Message explaining that there are no results returned from a search', 'twentytwentythree' ); ?>
+</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:search {"label":"<?php echo esc_html_x( 'Search', 'label', 'twentytwentythree' ); ?>","placeholder":"<?php echo esc_attr_x( 'Search...', 'placeholder for search field', 'twentytwentythree' ); ?>","showLabel":false,"buttonText":"<?php esc_attr_e( 'Search', 'twentytwentythree' ); ?>","buttonUseIcon":true} /-->
diff --git a/patterns/post-meta.php b/patterns/post-meta.php
index 11e6ae7..4e3275b 100644
--- a/patterns/post-meta.php
+++ b/patterns/post-meta.php
@@ -49,7 +49,7 @@
 				</p>
 				<!-- /wp:paragraph -->
 
-				<!-- wp:post-author-name {"isLink":true} /-->
+				<!-- wp:post-author {"showAvatar":false} /-->
 			</div>
 			<!-- /wp:group -->
 		</div>
diff --git a/styles/aubergine.json b/styles/aubergine.json
index 8e298b2..eb45433 100644
--- a/styles/aubergine.json
+++ b/styles/aubergine.json
@@ -115,16 +115,12 @@
 					"fontSize": "var(--wp--preset--font-size--medium)"
 				}
 			},
-			"core/post-author-name": {
-				"elements": {
-					"link": {
-						"color": {
-							"text": "var(--wp--preset--color--primary)"
-						},
-						"typography": {
-							"fontStyle": "italic"
-						}
-					}
+			"core/post-author": {
+				"color": {
+					"text": "var(--wp--preset--color--primary)"
+				},
+				"typography": {
+					"fontStyle": "italic"
 				}
 			},
 			"core/post-content": {
diff --git a/styles/block-out.json b/styles/block-out.json
index 1112564..7748a19 100644
--- a/styles/block-out.json
+++ b/styles/block-out.json
@@ -170,6 +170,11 @@
 					"fontFamily": "var(--wp--preset--font-family--ibm-plex-mono)",
 					"fontStyle": "italic",
 					"fontWeight": "400"
+				},
+				":active": {
+					"color": {
+						"text": "var(--wp--preset--color--contrast)"
+					}
 				}
 			},
 			"h1": {
diff --git a/styles/canary.json b/styles/canary.json
index bc55358..741114d 100644
--- a/styles/canary.json
+++ b/styles/canary.json
@@ -131,8 +131,22 @@
 		},
 		"elements": {
 			"button": {
+				":hover": {
+					"color": {
+						"background": "var(--wp--preset--color--base)",
+						"text": "var(--wp--preset--color--contrast)"
+					},
+					"border": {
+						"color": "var(--wp--preset--color--contrast)",
+						"style": "solid",
+						"width": "2px"
+					}
+				},
 				"border": {
-					"radius": "5px"
+					"radius": "5px",
+					"color": "var(--wp--preset--color--contrast)",
+					"style": "solid",
+					"width": "2px"
 				},
 				"color": {
 					"text": "var(--wp--preset--color--base)"
diff --git a/styles/electric.json b/styles/electric.json
index 0d31ba8..374451a 100644
--- a/styles/electric.json
+++ b/styles/electric.json
@@ -34,15 +34,38 @@
 	"styles": {
 		"elements": {
 			"button": {
+				"border": {
+					"style": "solid",
+					"width": "2px",
+					"color": "var(--wp--preset--color--contrast)"
+				},
 				"color": {
 					"background": "var(--wp--preset--color--contrast)",
 					"text": "var(--wp--preset--color--base)"
 				},
+				"spacing": {
+					"padding": {
+						"top": ".667em",
+						"right": "1.333em",
+						"bottom": ".667em",
+						"left": "1.333em"
+					}
+				},
+				":active": {
+					"typography": {
+						"textDecoration": "underline dotted"
+					}
+				},
+				":focus": {
+					"typography": {
+						"textDecoration": "underline dotted"
+					}
+				},
 				":hover": {
 					"border": {
 						"color": "var(--wp--preset--color--contrast)",
 						"style": "solid",
-						"width": "1px"
+						"width": "2px"
 					},
 					"color": {
 						"background": "var(--wp--preset--color--base)",
diff --git a/styles/grapes.json b/styles/grapes.json
index 69ee7b6..5f7377c 100644
--- a/styles/grapes.json
+++ b/styles/grapes.json
@@ -33,6 +33,17 @@
 	},
 	"styles": {
 		"blocks": {
+			"core/post-comments": {
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "underline dashed"
+							}
+						}
+					}
+				}
+			},
 			"core/post-date": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--source-serif-pro)",
@@ -44,6 +55,11 @@
 					"fontFamily": "var(--wp--preset--font-family--source-serif-pro)",
 					"fontStyle": "italic"
 				}
+			},
+			"core/site-title": {
+				"typography": {
+					"textTransform": "lowercase"
+				}
 			}
 		},
 		"elements": {
@@ -65,7 +81,7 @@
 			"link": {
 				":hover": {
 					"typography": {
-						"textDecoration": "underline"
+						"textDecoration": "underline dashed"
 					}
 				}
 			}
diff --git a/styles/marigold.json b/styles/marigold.json
index 8859ace..2d62ac0 100644
--- a/styles/marigold.json
+++ b/styles/marigold.json
@@ -38,32 +38,32 @@
 	  "spacingSizes": [
 		{
 		  "size": "clamp(0.625rem, 0.434rem + 0.61vw, 0.938rem)",
-		  "name": "30",
+		  "name": "1",
 		  "slug": "30"
 		},
 		{
 		  "size": "clamp(1.25rem, 0.869rem + 1.22vw, 1.875rem)",
-		  "name": "40",
+		  "name": "2",
 		  "slug": "40"
 		},
 		{
 		  "size": "clamp(1.875rem, 1.303rem + 1.83vw, 2.813rem)",
-		  "name": "50",
+		  "name": "3",
 		  "slug": "50"
 		},
 		{
 		  "size": "clamp(2.5rem, 1.738rem + 2.44vw, 3.75rem)",
-		  "name": "60",
+		  "name": "4",
 		  "slug": "60"
 		},
 		{
 		  "size": "clamp(2.813rem, 1.098rem + 5.49vw, 5.625rem)",
-		  "name": "70",
+		  "name": "5",
 		  "slug": "70"
 		},
 		{
 		  "size": "clamp(3.75rem, 1.463rem + 7.32vw, 7.5rem)",
-		  "name": "80",
+		  "name": "6",
 		  "slug": "80"
 		}
 	  ]
@@ -202,6 +202,9 @@
 			  "fontSize": "var(--wp--preset--font-size--normal)"
 			}
 		  }
+		},
+		"typography": {
+			"textTransform": "lowercase"
 		}
 	  }
 	},
diff --git a/styles/pilgrimage.json b/styles/pilgrimage.json
index 219c0af..7635f49 100644
--- a/styles/pilgrimage.json
+++ b/styles/pilgrimage.json
@@ -203,6 +203,10 @@
 							}
 						}
 					}
+				},
+				"typography": {
+					"fontStyle": "italic",
+					"fontWeight": "700"
 				}
 			}
 		},
@@ -213,7 +217,8 @@
 			"button": {
 				":active": {
 					"color": {
-						"background": "var(--wp--preset--color--secondary)"
+						"background": "var(--wp--preset--color--secondary)",
+						"gradient": "none"
 					}
 				},
 				":focus": {
diff --git a/styles/pitch.json b/styles/pitch.json
index 6dd75f7..89b3a6a 100644
--- a/styles/pitch.json
+++ b/styles/pitch.json
@@ -42,37 +42,37 @@
 				{
 					"size": "calc(8px + 1.5625vw)",
 					"slug": "20",
-					"name": "Tiny"
+					"name": "1"
 				},
 				{
 					"size": "calc(12px + 1.5625vw)",
 					"slug": "30",
-					"name": "Small"
+					"name": "2"
 				},
 				{
 					"size": "calc(16px + 1.5625vw)",
 					"slug": "40",
-					"name": "Medium"
+					"name": "3"
 				},
 				{
 					"size": "calc(20px + 1.5625vw)",
 					"slug": "50",
-					"name": "Large"
+					"name": "4"
 				},
 				{
 					"size": "calc(24px + 1.5625vw)",
 					"slug": "60",
-					"name": "Extra Large"
+					"name": "5"
 				},
 				{
 					"size": "calc(28px + 1.5625vw)",
 					"slug": "70",
-					"name": "2X Large"
+					"name": "6"
 				},
 				{
 					"size": "calc(32px + 1.5625vw)",
 					"slug": "80",
-					"name": "3X Large"
+					"name": "7"
 				}
 			]
 		},
@@ -145,7 +145,10 @@
 		"elements": {
 			"button": {
 				"border": {
-					"radius": "0"
+					"radius": "0",
+					"style": "solid",
+					"width": "2px",
+					"color": "var(--wp--preset--color--primary)"
 				},
 				"color": {
 					"background": "var(--wp--preset--color--primary)",
@@ -153,10 +156,10 @@
 				},
 				"spacing": {
 					"padding": {
-						"top": "min(1.25rem, 3vw)",
-						"right": "min(2.25rem, 5vw)",
-						"bottom": "min(1.25rem, 3vw)",
-						"left": "min(2.25rem, 5vw)"
+						"top": "min(1.125rem, 3vw) !important",
+						"right": "min(2.125rem, 5vw) !important",
+						"bottom": "min(1.125rem, 3vw) !important",
+						"left": "min(2.125rem, 5vw) !important"
 					}
 				},
 				"typography": {
@@ -166,21 +169,30 @@
 					"letterSpacing": "0.01em"
 				},
 				":hover": {
+					"border": {
+						"color": "var(--wp--preset--color--contrast)"
+					},
 					"color": {
 						"background": "var(--wp--preset--color--contrast)",
-						"text": "var(--wp--preset--color--primary)"
+						"text": "var(--wp--preset--color--tertiary)"
 					}
 				},
 				":focus": {
+					"border": {
+						"color": "var(--wp--preset--color--contrast)"
+					},
 					"color": {
 						"background": "var(--wp--preset--color--contrast)",
-						"text": "var(--wp--preset--color--primary)"
+						"text": "var(--wp--preset--color--tertiary)"
 					}
 				},
 				":active": {
+					"border": {
+						"color": "var(--wp--preset--color--contrast)"
+					},
 					"color": {
 						"background": "var(--wp--preset--color--contrast)",
-						"text": "var(--wp--preset--color--primary)"
+						"text": "var(--wp--preset--color--tertiary)"
 					}
 				}
 			},
diff --git a/styles/sherbet.json b/styles/sherbet.json
index 890bd72..d6e2039 100644
--- a/styles/sherbet.json
+++ b/styles/sherbet.json
@@ -7,10 +7,9 @@
 			"duotone": [
 				{
 					"colors": [
-						"rgb(81, 82, 213)",
-						"rgb(121, 238, 196)",
-						"rgb(236, 249, 87)",
-						"rgb(247, 69, 204)"
+						"#FF99FF",
+						"#FFFF99",
+						"#99FFFF"
 					],
 					"name": "Default filter",
 					"slug": "default-filter"
@@ -21,6 +20,16 @@
 					"gradient": "linear-gradient(135deg, var(--wp--preset--color--primary) 0%, var(--wp--preset--color--secondary) 50%, var(--wp--preset--color--tertiary) 100%)",
 					"name": "Primary to Secondary to Tertiary",
 					"slug": "primary-secondary-tertiary"
+				},
+				{
+					"gradient": "linear-gradient(135deg, var(--wp--preset--color--primary) 0%, var(--wp--preset--color--secondary) 50%, var(--wp--preset--color--tertiary) 100%) fixed",
+					"name": "Primary to Secondary to Tertiary Fixed",
+					"slug": "primary-secondary-tertiary-fixed"
+				},
+				{
+					"gradient": "linear-gradient(135deg, var(--wp--preset--color--tertiary) 0%, var(--wp--preset--color--secondary) 50%, var(--wp--preset--color--primary) 100%) fixed",
+					"name": "Tertiary to Secondary to Primary Fixed",
+					"slug": "tertiary-secondary-primary-fixed"
 				}
 			],
 			"palette": [
@@ -54,32 +63,47 @@
 		"typography": {
 			"fontSizes": [
 				{
+					"fluid": false,
 					"size": "0.75rem",
 					"slug": "x-small"
 				},
 				{
 					"fluid": {
-						"min": "0.875rem"
+						"min": "0.875rem",
+						"max": "1rem"
 					},
 					"size": "1rem",
 					"slug": "small"
 				},
 				{
 					"fluid": {
-						"min": "1rem"
+						"min": "1rem",
+						"max": "1.125rem"
 					},
 					"size": "1.125rem",
 					"slug": "medium"
 				},
 				{
+					"fluid": {
+						"min": "1.5rem",
+						"max": "1.75rem"
+					},
 					"size": "1.75rem",
 					"slug": "large"
 				},
 				{
+					"fluid": {
+						"min": "2rem",
+						"max": "2.25rem"
+					},
 					"size": "2.25rem",
 					"slug": "x-large"
 				},
 				{
+					"fluid": {
+						"min": "2.5rem",
+						"max": "2.75rem"
+					},
 					"size": "2.75rem",
 					"slug": "xx-large"
 				}
@@ -88,14 +112,32 @@
 	},
 	"styles": {
 		"blocks": {
-			"core/heading": {
+			"core/comments": {
+				"elements": {
+					"link": {
+						":active": {
+							"color": {
+								"text": "var(--wp--preset--color--contrast)"
+							}
+						}
+					}
+				}
+			},
+			"core/comment-author-name": {
 				"typography": {
-					"fontWeight": "500"
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"textTransform": "initial"
+				}
+			},
+			"core/comment-content": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"textTransform": "initial"
 				}
 			},
 			"core/navigation": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--x-small)",
+					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": "500",
 					"textTransform": "uppercase"
 				}
@@ -105,10 +147,20 @@
 					"link": {
 						"color": {
 							"text": "var(--wp--preset--color--contrast)"
+						},
+						":active": {
+							"color": {
+								"text": "var(--wp--preset--color--contrast)"
+							}
 						}
 					}
 				}
 			},
+			"core/post-date": {
+				"typography": {
+					"textTransform": "uppercase"
+				}
+			},
 			"core/post-featured-image": {
 				"filter": {
 					"duotone": "var(--wp--preset--duotone--default-filter)"
@@ -142,29 +194,39 @@
 		},
 		"elements": {
 			"button": {
-				":active": {
-					"color": {
-						"text": "var(--wp--preset--color--base)"
-					}
-				},
-				":hover": {
-					"color": {
-						"gradient": "radial-gradient(ellipse at top left, rgba(236, 249, 87, 1) 15% , transparent 100%) fixed, radial-gradient(ellipse at bottom left, rgba(247, 69, 204, 1) 15% , transparent 100%) fixed, radial-gradient(ellipse at top right, rgba(121, 238, 196, 1) 15% , transparent 100%) fixed, radial-gradient(ellipse at bottom right, rgba(81, 82, 213, 1) 15% , transparent 100%) fixed",
-						"text": "var(--wp--preset--color--base)"
-					}
-				},
 				"border": {
-					"radius": "99999px"
+					"color": "var(--wp--preset--color--contrast)",
+					"radius": "99999px",
+					"style": "solid",
+					"width": "2px"
 				},
 				"color": {
 					"background": "var(--wp--preset--color--base)",
-					"gradient": "radial-gradient(ellipse at bottom right, rgba(236, 249, 87, 1) 15% , transparent 100%) fixed, radial-gradient(ellipse at top right, rgba(247, 69, 204, 1) 15% , transparent 100%) fixed, radial-gradient(ellipse at bottom left, rgba(121, 238, 196, 1) 15% , transparent 100%) fixed, radial-gradient(ellipse at bottom left, rgba(81, 82, 213, 1) 15% , transparent 100%) fixed",
+					"gradient": "var(--wp--preset--gradient--primary-secondary-tertiary-fixed)",
 					"text": "var(--wp--preset--color--contrast)"
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--x-small)",
 					"fontWeight": "400",
 					"textTransform": "uppercase"
+				},
+				":hover": {
+					"color": {
+						"gradient": "var(--wp--preset--gradient--tertiary-secondary-primary-fixed)",
+						"text": "var(--wp--preset--color--contrast)"
+					}
+				},
+				":focus": {
+					"color": {
+						"background": "var(--wp--preset--color--contrast)",
+						"gradient": "none"
+					}
+				},
+				":active": {
+					"color": {
+						"background": "var(--wp--preset--color--contrast)",
+						"gradient": "none"
+					}
 				}
 			},
 			"heading": {
diff --git a/styles/whisper.json b/styles/whisper.json
index 01a8252..a944e5b 100644
--- a/styles/whisper.json
+++ b/styles/whisper.json
@@ -256,7 +256,56 @@
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--large)",
-					"lineHeight": "1.4"
+					"lineHeight": "1.4",
+					"textTransform": "capitalize"
+				}
+			},
+			"core/comment-author-name":{
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "none"
+							}
+						},
+						":focus": {
+							"typography": {
+								"textDecoration": "none"
+							}
+						}
+					}
+				}
+			},
+			"core/comment-date": {
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "none"
+							}
+						},
+						":focus": {
+							"typography": {
+								"textDecoration": "none"
+							}
+						}
+					}
+				}
+			},
+			"core/comment-edit-link": {
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "none"
+							}
+						},
+						":focus": {
+							"typography": {
+								"textDecoration": "none"
+							}
+						}
+					}
 				}
 			}
 		},
@@ -420,6 +469,9 @@
 					}
 				},
 				":active": {
+					"border": {
+						"width": "0"
+					},
 					"color": {
 						"text": "var(--wp--preset--color--secondary)"
 					},
diff --git a/templates/home.html b/templates/home.html
index 1e3e4f6..64a164f 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -2,11 +2,6 @@
 
 <!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 <main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--70);margin-bottom:var(--wp--preset--spacing--70)">
-
-	<!-- wp:image {"align":"wide"} -->
-	<figure class="wp-block-image alignwide"><img alt=""/></figure>
-	<!-- /wp:image -->
-
 	<!-- wp:heading {"level":1,"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|50"}}}} -->
 	<h1 class="alignwide" style="margin-top:var(--wp--preset--spacing--60);margin-bottom:var(--wp--preset--spacing--50)">Mindblown: a blog about philosophy.</h1>
 	<!-- /wp:heading -->
diff --git a/templates/page.html b/templates/page.html
index a4b159d..125a97a 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -4,6 +4,7 @@
 <main class="wp-block-group">
 	<!-- wp:group {"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group">
+		<!-- wp:post-featured-image {"overlayColor":"contrast","dimRatio":50,"align":"wide"} /-->
 		<!-- wp:post-title {"level":1,"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} /-->
 	</div>
 	<!-- /wp:group -->
diff --git a/templates/search.html b/templates/search.html
index 0bd5cc0..0756424 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -27,11 +27,7 @@
 		<!-- /wp:query-pagination -->
 
 		<!-- 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:search {"label":"Search","showLabel":false,"buttonText":"Search","buttonUseIcon":true} /-->
+			<!-- wp:pattern {"slug":"twentytwentythree/hidden-no-results-content"} /-->
 		<!-- /wp:query-no-results -->
 	</div>
 	<!-- /wp:query -->
diff --git a/templates/single.html b/templates/single.html
index f0727a2..d5b4c73 100644
--- a/templates/single.html
+++ b/templates/single.html
@@ -4,6 +4,7 @@
 <main class="wp-block-group">
 	<!-- wp:group {"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group">
+		<!-- wp:post-featured-image {"overlayColor":"contrast","dimRatio":50,"align":"wide"} /-->
 		<!-- wp:post-title {"level":1,"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} /-->
 	</div>
 	<!-- /wp:group -->
diff --git a/templates/with-cover-block.html b/templates/with-cover-block.html
deleted file mode 100644
index e12d693..0000000
--- a/templates/with-cover-block.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:group {"layout":{"type":"constrained"},"style":{"spacing":{"padding":{"bottom":"var:preset|spacing|70"}}}} -->
-	<div class="wp-block-group" style="padding-bottom:var(--wp--preset--spacing--70)">
-		<!-- wp:cover {"useFeaturedImage":true,"dimRatio":50,"overlayColor":"contrast","align":"wide","style":{"color":{"duotone":"unset"}}} -->
-		<div class="wp-block-cover alignwide"><span aria-hidden="true" class="wp-block-cover__background has-contrast-background-color has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:post-title {"level":1,"style":{"spacing":{"padding":{"top":"var:preset|spacing|40","right":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|40"}}},"textColor":"base"} /--></div></div>
-		<!-- /wp:cover -->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"type":"constrained"}} /-->
-	<!-- wp:template-part {"slug":"post-meta"} /-->
-	<!-- wp:template-part {"slug":"comments","tagName":"section"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
diff --git a/templates/with-featured-image.html b/templates/with-featured-image.html
deleted file mode 100644
index 7d669a9..0000000
--- a/templates/with-featured-image.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:group {"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-featured-image {"align":"wide"} /-->
-		<!-- wp:post-title {"level":1,"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"type":"constrained"}} /-->
-	<!-- wp:template-part {"slug":"post-meta"} /-->
-	<!-- wp:template-part {"slug":"comments","tagName":"section"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
diff --git a/theme.json b/theme.json
index baa81dd..f49d7b0 100644
--- a/theme.json
+++ b/theme.json
@@ -23,22 +23,6 @@
 				"page"
 			],
 			"title": "404"
-		},
-		{
-			"name": "with-featured-image",
-			"postTypes": [
-				"page",
-				"post"
-			],
-			"title": "With Featured Image"
-		},
-		{
-			"name": "with-cover-block",
-			"postTypes": [
-				"page",
-				"post"
-			],
-			"title": "With Cover Block"
 		}
 	],
 	"settings": {
@@ -84,32 +68,32 @@
 				{
 					"size": "clamp(1.5rem, 5vw, 2rem)",
 					"slug": "30",
-					"name": "30"
+					"name": "1"
 				},
 				{
 					"size": "clamp(1.8rem, 1.8rem + ((1vw - 0.48rem) * 2.885), 3rem)",
 					"slug": "40",
-					"name": "40"
+					"name": "2"
 				},
 				{
 					"size": "clamp(2.5rem, 8vw, 6.5rem)",
 					"slug": "50",
-					"name": "50"
+					"name": "3"
 				},
 				{
 					"size": "clamp(3.75rem, 10vw, 7rem)",
 					"slug": "60",
-					"name": "60"
+					"name": "4"
 				},
 				{
 					"size": "clamp(5rem, 5.25rem + ((1vw - 0.48rem) * 9.096), 8rem)",
 					"slug": "70",
-					"name": "70"
+					"name": "5"
 				},
 				{
 					"size": "clamp(7rem, 14vw, 11rem)",
 					"slug": "80",
-					"name": "80"
+					"name": "6"
 				}
 			],
 			"units": [
@@ -358,6 +342,11 @@
 					"link": {
 						"typography": {
 							"textDecoration": "none"
+						},
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
 						}
 					}
 				}
@@ -473,31 +462,6 @@
 			"core/comment-edit-link": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
-				},
-				"elements": {
-					"link": {
-						":hover": {
-							"typography": {
-								"textDecoration": "underline"
-							}
-						},
-						":focus": {
-							"typography": {
-								"textDecoration": "underline dashed"
-							}
-						},
-						":active": {
-							"color": {
-								"text": "var(--wp--preset--color--secondary)"
-							},
-							"typography": {
-								"textDecoration": "none"
-							}
-						},
-						"typography": {
-							"textDecoration": "none"
-						}
-					}
 				}
 			},
 			"core/comment-reply-link": {
@@ -533,6 +497,11 @@
 					"link": {
 						"typography": {
 							"textDecoration": "none"
+						},
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
 						}
 					}
 				}