Commit 4100458c7d for wordpress.org

commit 4100458c7dd575d1bf932222a9c70b02c99dd27a
Author: Peter Wilson <wilson@peterwilson.cc>
Date:   Mon Oct 14 21:58:17 2024 +0000

    Bundled Themes: Update Twenty Twenty-Five for 6.7 Beta 3.

    This merges the latest improvements to the Twenty Twenty-Five theme from GitHub into `trunk` for 6.7 beta 3.

    A full list of changes can be found on GitHub: [https://github.com/WordPress/twentytwentyfive/compare/0d8b24502122650d53964cd413ee58b560870125...5d17f41da83820ea188b26a2a781f486063486d4 WordPress/twentytwentyfive@0d8b245...5d17f41]

    Props annezazu, areziaal, beafialho, cwhitmore, franz00, get_dave, joedolson, joen, juanfra, karmatosed, kartikmehta, mukesh27, onemaggie, pgeorgiev, poena, richtabor, sudipatel007, sumitbagthariya16, wildworks, youknowriad.
    Fixes #62218.



    Built from https://develop.svn.wordpress.org/trunk@59233


    git-svn-id: http://core.svn.wordpress.org/trunk@58625 1a063a9b-81f0-0310-95a4-ce76da25c4cd

diff --git a/wp-content/themes/twentytwentyfive/assets/images/avatar.webp b/wp-content/themes/twentytwentyfive/assets/images/avatar.webp
deleted file mode 100644
index 845019cbd2..0000000000
Binary files a/wp-content/themes/twentytwentyfive/assets/images/avatar.webp and /dev/null differ
diff --git a/wp-content/themes/twentytwentyfive/assets/images/hero-podcast.webp b/wp-content/themes/twentytwentyfive/assets/images/hero-podcast.webp
index 7383213247..1a79e971da 100644
Binary files a/wp-content/themes/twentytwentyfive/assets/images/hero-podcast.webp and b/wp-content/themes/twentytwentyfive/assets/images/hero-podcast.webp differ
diff --git a/wp-content/themes/twentytwentyfive/assets/images/image-from-rawpixel-id-13029755.webp b/wp-content/themes/twentytwentyfive/assets/images/image-from-rawpixel-id-13029755.webp
index 1a03fc5385..ac8ff1d85d 100644
Binary files a/wp-content/themes/twentytwentyfive/assets/images/image-from-rawpixel-id-13029755.webp and b/wp-content/themes/twentytwentyfive/assets/images/image-from-rawpixel-id-13029755.webp differ
diff --git a/wp-content/themes/twentytwentyfive/assets/images/image-from-rawpixel-id-8803077-original.webp b/wp-content/themes/twentytwentyfive/assets/images/image-from-rawpixel-id-8803077-original.webp
deleted file mode 100644
index 82ebf6bd45..0000000000
Binary files a/wp-content/themes/twentytwentyfive/assets/images/image-from-rawpixel-id-8803077-original.webp and /dev/null differ
diff --git a/wp-content/themes/twentytwentyfive/assets/images/location.webp b/wp-content/themes/twentytwentyfive/assets/images/location.webp
index fb3eea8bae..4f7ea3c0ab 100644
Binary files a/wp-content/themes/twentytwentyfive/assets/images/location.webp and b/wp-content/themes/twentytwentyfive/assets/images/location.webp differ
diff --git a/wp-content/themes/twentytwentyfive/patterns/banner-about-book.php b/wp-content/themes/twentytwentyfive/patterns/banner-about-book.php
index f840765515..af38722bb9 100644
--- a/wp-content/themes/twentytwentyfive/patterns/banner-about-book.php
+++ b/wp-content/themes/twentytwentyfive/patterns/banner-about-book.php
@@ -2,7 +2,7 @@
 /**
  * Title: Banner with book description
  * Slug: twentytwentyfive/banner-about-book
- * Categories: banner, featured
+ * Categories: banner
  * Description: Banner with book description and accompanying image for promotion.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/banner-cover-big-heading.php b/wp-content/themes/twentytwentyfive/patterns/banner-cover-big-heading.php
index 64478f3f22..8e3e72f2e6 100644
--- a/wp-content/themes/twentytwentyfive/patterns/banner-cover-big-heading.php
+++ b/wp-content/themes/twentytwentyfive/patterns/banner-cover-big-heading.php
@@ -23,9 +23,10 @@

 		<!-- wp:group {"align":"full","layout":{"type":"default"}} -->
 		<div class="wp-block-group alignfull">
-			<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"clamp(1rem, 380px, 24vw)","letterSpacing":"-0.02em","lineHeight":"1","fontWeight":"700"}}} -->
-			<p class="has-text-align-left" style="font-size:clamp(1rem, 380px, 24vw);font-weight:700;letter-spacing:-0.02em;line-height:1"><?php esc_html_e( 'Stories', 'twentytwentyfive' ); ?></p>
-			<!-- /wp:paragraph -->
+			<!-- wp:heading {"align":"left","style":{"typography":{"fontSize":"clamp(1rem, 380px, 24vw)","letterSpacing":"-0.02em","lineHeight":"1","fontWeight":"700","fontStyle":"normal"}}} -->
+			<h2 class="wp-block-heading has-text-align-left" style="font-size:clamp(1rem, 380px, 24vw);font-style:normal;font-weight:700;letter-spacing:-0.02em;line-height:1"><?php echo esc_html_e( 'Stories', 'twentytwentyfive' ); ?></h2>
+			<!-- /wp:heading -->
+
 		</div>
 		<!-- /wp:group -->
 	</div>
diff --git a/wp-content/themes/twentytwentyfive/patterns/banner-intro-image.php b/wp-content/themes/twentytwentyfive/patterns/banner-intro-image.php
index bd1a4b2266..b0ee5ce664 100644
--- a/wp-content/themes/twentytwentyfive/patterns/banner-intro-image.php
+++ b/wp-content/themes/twentytwentyfive/patterns/banner-intro-image.php
@@ -2,7 +2,7 @@
 /**
  * Title: Short heading and paragraph and image on the left
  * Slug: twentytwentyfive/banner-intro-image
- * Categories: banner
+ * Categories: banner, featured
  * Description: A Intro pattern with Short heading, paragraph and image on the left.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/banner-intro.php b/wp-content/themes/twentytwentyfive/patterns/banner-intro.php
index 61b069221d..2250538e02 100644
--- a/wp-content/themes/twentytwentyfive/patterns/banner-intro.php
+++ b/wp-content/themes/twentytwentyfive/patterns/banner-intro.php
@@ -2,7 +2,7 @@
 /**
  * Title: Intro with left-aligned description
  * Slug: twentytwentyfive/banner-intro
- * Categories: banner, featured
+ * Categories: banner
  * Description: A large left-aligned heading with a brand name emphasized in bold.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/banner-poster.php b/wp-content/themes/twentytwentyfive/patterns/banner-poster.php
index 02c3b4da5e..75cd422616 100644
--- a/wp-content/themes/twentytwentyfive/patterns/banner-poster.php
+++ b/wp-content/themes/twentytwentyfive/patterns/banner-poster.php
@@ -2,7 +2,7 @@
 /**
  * Title: Poster-like section
  * Slug: twentytwentyfive/banner-poster
- * Categories: banner, media, featured
+ * Categories: banner, media
  * Description: A section that can be used as a banner or a landing page to announce an event.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/cta-book-links.php b/wp-content/themes/twentytwentyfive/patterns/cta-book-links.php
index 3574ae4271..267d97d1f6 100644
--- a/wp-content/themes/twentytwentyfive/patterns/cta-book-links.php
+++ b/wp-content/themes/twentytwentyfive/patterns/cta-book-links.php
@@ -2,7 +2,7 @@
 /**
  * Title: Call to action with book links
  * Slug: twentytwentyfive/cta-book-links
- * Categories: call-to-action, featured
+ * Categories: call-to-action
  * Description: A call to action section with links to get the book in different websites.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/cta-book-locations.php b/wp-content/themes/twentytwentyfive/patterns/cta-book-locations.php
index f055a009e3..bbf126ccae 100644
--- a/wp-content/themes/twentytwentyfive/patterns/cta-book-locations.php
+++ b/wp-content/themes/twentytwentyfive/patterns/cta-book-locations.php
@@ -2,7 +2,7 @@
 /**
  * Title: Call to action with locations
  * Slug: twentytwentyfive/cta-book-locations
- * Categories: call-to-action, featured
+ * Categories: call-to-action
  * Description: A call to action section with links to get the book in the most popular locations.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/cta-centered-heading.php b/wp-content/themes/twentytwentyfive/patterns/cta-centered-heading.php
index c0c4f240fc..db894f74fc 100644
--- a/wp-content/themes/twentytwentyfive/patterns/cta-centered-heading.php
+++ b/wp-content/themes/twentytwentyfive/patterns/cta-centered-heading.php
@@ -2,7 +2,7 @@
 /**
  * Title: Centered heading
  * Slug: twentytwentyfive/cta-centered-heading
- * Categories: call-to-action, featured
+ * Categories: call-to-action
  * Description: A hero with a centered heading, paragraph and button.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/cta-grid-products-link.php b/wp-content/themes/twentytwentyfive/patterns/cta-grid-products-link.php
index e91d223b41..d58f50040f 100644
--- a/wp-content/themes/twentytwentyfive/patterns/cta-grid-products-link.php
+++ b/wp-content/themes/twentytwentyfive/patterns/cta-grid-products-link.php
@@ -2,7 +2,7 @@
 /**
  * Title: Call to action with grid layout with products and link
  * Slug: twentytwentyfive/cta-grid-products-link
- * Categories: call-to-action
+ * Categories: call-to-action, featured
  * Viewport width: 1400
  * Description: A call to action featuring product images.
  *
@@ -26,8 +26,8 @@
 			<figure class="wp-block-image size-large"><img src="<?php echo esc_url( get_template_directory_uri() . '/assets/images/grid-flower-2.webp' ); ?>" alt="<?php esc_attr_e( 'Black and white flower', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover"/></figure>
 			<!-- /wp:image -->

-			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"}},"fontSize":"medium"} -->
-			<div class="wp-block-cover is-light has-medium-font-size"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
+			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast","fontSize":"medium"} -->
+			<div class="wp-block-cover is-light has-contrast-color has-text-color has-link-color has-medium-font-size"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
 				<!-- wp:paragraph {"align":"center"} -->
 				<p class="has-text-align-center"><?php esc_html_e( 'Delivered every week', 'twentytwentyfive' ); ?></p>
 				<!-- /wp:paragraph -->
@@ -46,8 +46,8 @@
 			</div></div>
 			<!-- /wp:cover -->

-			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"},"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"},"margin":{"top":"0","bottom":"0"}}}} -->
-			<div class="wp-block-cover is-light" style="margin-top:0;margin-bottom:0;padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
+			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"},"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"},"margin":{"top":"0","bottom":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast"} -->
+			<div class="wp-block-cover is-light has-contrast-color has-text-color has-link-color" style="margin-top:0;margin-bottom:0;padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
 				<!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|40","right":"var:preset|spacing|40"}}},"fontSize":"medium","layout":{"type":"flex","orientation":"vertical","verticalAlignment":"center","justifyContent":"center"}} -->
 				<div class="wp-block-group has-medium-font-size" style="padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)">
 					<!-- wp:paragraph {"align":"center"} -->
@@ -70,16 +70,16 @@
 			<figure class="wp-block-image size-large"><img src="<?php echo esc_url( get_template_directory_uri() . '/assets/images/image-from-rawpixel-id-8802845.webp' ); ?>" alt="<?php esc_attr_e( 'Flora of Akaka Falls State Park', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover"/></figure>
 			<!-- /wp:image -->

-			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"}},"fontSize":"medium"} -->
-			<div class="wp-block-cover is-light has-medium-font-size"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
+			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast","fontSize":"medium"} -->
+			<div class="wp-block-cover is-light has-contrast-color has-text-color has-link-color has-medium-font-size"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
 				<!-- wp:paragraph {"align":"center"} -->
 				<p class="has-text-align-center"><?php esc_html_e( 'Tailored to your needs', 'twentytwentyfive' ); ?></p>
 				<!-- /wp:paragraph -->
 			</div></div>
 			<!-- /wp:cover -->

-			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"}},"fontSize":"medium"} -->
-			<div class="wp-block-cover is-light has-medium-font-size"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
+			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast","fontSize":"medium"} -->
+			<div class="wp-block-cover is-light has-contrast-color has-text-color has-link-color has-medium-font-size"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
 				<!-- wp:paragraph {"align":"center"} -->
 				<p class="has-text-align-center"><?php esc_html_e( 'Free shipping', 'twentytwentyfive' ); ?></p>
 				<!-- /wp:paragraph -->
@@ -94,8 +94,8 @@
 			</div></div>
 			<!-- /wp:cover -->

-			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"}},"fontSize":"medium"} -->
-			<div class="wp-block-cover is-light has-medium-font-size"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
+			<!-- wp:cover {"dimRatio":0,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast","fontSize":"medium"} -->
+			<div class="wp-block-cover is-light has-contrast-color has-text-color has-link-color has-medium-font-size"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container">
 				<!-- wp:paragraph {"align":"center"} -->
 				<p class="has-text-align-center"><?php esc_html_e( 'Cancel anytime', 'twentytwentyfive' ); ?></p>
 				<!-- /wp:paragraph -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/cta-newsletter.php b/wp-content/themes/twentytwentyfive/patterns/cta-newsletter.php
index e16fd735bf..3203a52bd5 100644
--- a/wp-content/themes/twentytwentyfive/patterns/cta-newsletter.php
+++ b/wp-content/themes/twentytwentyfive/patterns/cta-newsletter.php
@@ -11,24 +11,28 @@
  */

 ?>
-<!-- wp:cover {"tagName":"aside","overlayColor":"accent-1","isUserOverlayColor":true,"minHeight":460,"isDark":false,"metadata":{"categories":["call-to-action"],"patternName":"twentytwentyfive/newsletter-sign-up","name":"Newsletter Sign Up"},"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained","contentSize":"800px"}} -->
-<aside class="wp-block-cover alignfull is-light" style="padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50);min-height:460px"><span aria-hidden="true" class="wp-block-cover__background has-accent-1-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container">
-	<!-- wp:heading {"textAlign":"center","fontSize":"xx-large"} -->
-	<h2 class="wp-block-heading has-text-align-center has-xx-large-font-size"><?php esc_html_e( 'Sign up to get daily stories', 'twentytwentyfive' ); ?></h2>
-	<!-- /wp:heading -->
+<!-- wp:group {"tagName":"aside","align":"full","className":"is-style-section-3","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}},"dimensions":{"minHeight":""}},"layout":{"type":"constrained","contentSize":"800px"}} -->
+<aside class="wp-block-group alignfull is-style-section-3" style="padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)">
+	<!-- wp:group {"style":{"dimensions":{"minHeight":"360px"},"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"center","justifyContent":"center"}} -->
+	<div class="wp-block-group" style="min-height:360px;margin-top:0;margin-bottom:0">
+		<!-- wp:heading {"textAlign":"center","fontSize":"xx-large"} -->
+		<h2 class="wp-block-heading has-text-align-center has-xx-large-font-size"><?php esc_html_e( 'Sign up to get daily stories', 'twentytwentyfive' ); ?></h2>
+		<!-- /wp:heading -->

-	<!-- wp:paragraph {"align":"center","className":"is-style-text-subtitle"} -->
-	<p class="has-text-align-center is-style-text-subtitle"><?php esc_html_e( 'Get access to a curated collection of moments in time featuring photographs from historical relevance.', 'twentytwentyfive' ); ?></p>
-	<!-- /wp:paragraph -->
+		<!-- wp:paragraph {"align":"center","className":"is-style-text-subtitle"} -->
+		<p class="has-text-align-center is-style-text-subtitle"><?php esc_html_e( 'Get access to a curated collection of moments in time featuring photographs from historical relevance.', 'twentytwentyfive' ); ?></p>
+		<!-- /wp:paragraph -->

-	<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
-	<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
+		<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
+		<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
+		<!-- /wp:spacer -->

-	<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center"}} -->
-	<div class="wp-block-buttons"><!-- wp:button {"textAlign":"center"} -->
-		<div class="wp-block-button"><a class="wp-block-button__link has-text-align-center wp-element-button"><?php esc_html_e( 'Subscribe', 'twentytwentyfive' ); ?></a></div>
-	<!-- /wp:button --></div>
-	<!-- /wp:buttons --></div>
+		<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center"}} -->
+		<div class="wp-block-buttons"><!-- wp:button {"textAlign":"center"} -->
+			<div class="wp-block-button"><a class="wp-block-button__link has-text-align-center wp-element-button"><?php esc_html_e( 'Subscribe', 'twentytwentyfive' ); ?></a></div>
+		<!-- /wp:button --></div>
+		<!-- /wp:buttons -->
+	</div>
+	<!-- /wp:group -->
 </aside>
-<!-- /wp:cover -->
+<!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/event-3-col.php b/wp-content/themes/twentytwentyfive/patterns/event-3-col.php
index 927f96f748..ac318c54dc 100644
--- a/wp-content/themes/twentytwentyfive/patterns/event-3-col.php
+++ b/wp-content/themes/twentytwentyfive/patterns/event-3-col.php
@@ -2,7 +2,7 @@
 /**
  * Title: Events, 3 columns with event images and titles
  * Slug: twentytwentyfive/event-3-col
- * Categories: featured
+ * Categories: banner
  * Description: A header with title and text and three columns that show 3 events with their images and titles.
  * Keywords: events, columns, images
  *
diff --git a/wp-content/themes/twentytwentyfive/patterns/event-schedule.php b/wp-content/themes/twentytwentyfive/patterns/event-schedule.php
index be1ba10526..8fc69e8d0b 100644
--- a/wp-content/themes/twentytwentyfive/patterns/event-schedule.php
+++ b/wp-content/themes/twentytwentyfive/patterns/event-schedule.php
@@ -2,7 +2,7 @@
 /**
  * Title: Event schedule
  * Slug: twentytwentyfive/event-schedule
- * Categories: about, featured
+ * Categories: about
  * Description: A section with specified dates and times for an event.
  * Keywords: events, agenda, schedule, lectures
  *
diff --git a/wp-content/themes/twentytwentyfive/patterns/format-audio.php b/wp-content/themes/twentytwentyfive/patterns/format-audio.php
index 68fb659531..e7065c4f78 100644
--- a/wp-content/themes/twentytwentyfive/patterns/format-audio.php
+++ b/wp-content/themes/twentytwentyfive/patterns/format-audio.php
@@ -2,7 +2,7 @@
 /**
  * Title: Audio format
  * Slug: twentytwentyfive/format-audio
- * Categories: twentytwentyfive_post-format, featured
+ * Categories: twentytwentyfive_post-format
  * Description: An audio post format with an image, title, audio player, and description.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/format-link.php b/wp-content/themes/twentytwentyfive/patterns/format-link.php
index a92d7ea1ca..12ab342b64 100644
--- a/wp-content/themes/twentytwentyfive/patterns/format-link.php
+++ b/wp-content/themes/twentytwentyfive/patterns/format-link.php
@@ -2,7 +2,7 @@
 /**
  * Title: Link format
  * Slug: twentytwentyfive/format-link
- * Categories: twentytwentyfive_post-format, featured
+ * Categories: twentytwentyfive_post-format
  * Description: A link post format with a description and an emphasized link for key content.
  *
  * @package WordPress
@@ -17,8 +17,8 @@
 	<p style="font-style:normal;font-weight:700"><?php esc_html_e( 'The Stories Book, a fine collection of moments in time featuring photographs from Louis Fleckenstein, Paul Strand and Asahachi Kōno, is available for pre-order', 'twentytwentyfive' ); ?></p>
 	<!-- /wp:paragraph -->

-	<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}}},"textColor":"accent-4","fontSize":"medium","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-	<div class="wp-block-group has-accent-4-color has-text-color has-link-color has-medium-font-size">
+	<!-- wp:group {"fontSize":"medium","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+	<div class="wp-block-group has-medium-font-size">
 		<!-- wp:paragraph -->
 		<p><a href="#"><?php esc_html_e( 'https://example.com', 'twentytwentyfive' ); ?></a></p>
 		<!-- /wp:paragraph -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/grid-videos.php b/wp-content/themes/twentytwentyfive/patterns/grid-videos.php
index 7c6a2a7bc9..352f144a12 100644
--- a/wp-content/themes/twentytwentyfive/patterns/grid-videos.php
+++ b/wp-content/themes/twentytwentyfive/patterns/grid-videos.php
@@ -2,7 +2,7 @@
 /**
  * Title: Grid with videos
  * Slug: twentytwentyfive/grid-videos
- * Categories: about, featured
+ * Categories: about
  * Description: A grid with videos.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/grid-with-categories.php b/wp-content/themes/twentytwentyfive/patterns/grid-with-categories.php
index 810c31eebb..5751083a9a 100644
--- a/wp-content/themes/twentytwentyfive/patterns/grid-with-categories.php
+++ b/wp-content/themes/twentytwentyfive/patterns/grid-with-categories.php
@@ -2,7 +2,7 @@
 /**
  * Title: Grid with categories
  * Slug: twentytwentyfive/grid-with-categories
- * Categories: featured
+ * Categories: banner
  * Viewport width: 1400
  * Description: A grid section with different categories.
  *
diff --git a/wp-content/themes/twentytwentyfive/patterns/header-centered.php b/wp-content/themes/twentytwentyfive/patterns/header-centered.php
index d5c6fe3fdd..f65124256d 100644
--- a/wp-content/themes/twentytwentyfive/patterns/header-centered.php
+++ b/wp-content/themes/twentytwentyfive/patterns/header-centered.php
@@ -19,7 +19,7 @@
 		<!-- wp:site-title {"level":0,"textAlign":"center","align":"wide","fontSize":"x-large"} /-->
 		<!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
 		<div class="wp-block-group alignwide">
-			<!-- wp:navigation {"layout":{"type":"flex","justifyContent":"center"}} /-->
+			<!-- wp:navigation {"overlayBackgroundColor":"base","overlayTextColor":"contrast","layout":{"type":"flex","justifyContent":"center"}} /-->
 		</div>
 		<!-- /wp:group -->
 	</div>
diff --git a/wp-content/themes/twentytwentyfive/patterns/header-columns.php b/wp-content/themes/twentytwentyfive/patterns/header-columns.php
index d5ceb80bce..fc0a6e4603 100644
--- a/wp-content/themes/twentytwentyfive/patterns/header-columns.php
+++ b/wp-content/themes/twentytwentyfive/patterns/header-columns.php
@@ -24,7 +24,7 @@
 		<!-- /wp:group -->
 		<!-- wp:group {"layout":{"type":"constrained","justifyContent":"left"}} -->
 		<div class="wp-block-group">
-			<!-- wp:navigation {"layout":{"type":"flex","orientation":"vertical"}} /-->
+			<!-- wp:navigation {"overlayBackgroundColor":"base","overlayTextColor":"contrast","layout":{"type":"flex","orientation":"vertical"}} /-->
 		</div>
 		<!-- /wp:group -->
 		<!-- wp:site-logo /-->
diff --git a/wp-content/themes/twentytwentyfive/patterns/header-large-title.php b/wp-content/themes/twentytwentyfive/patterns/header-large-title.php
index 5bd1dbf521..087be5d5f6 100644
--- a/wp-content/themes/twentytwentyfive/patterns/header-large-title.php
+++ b/wp-content/themes/twentytwentyfive/patterns/header-large-title.php
@@ -19,7 +19,7 @@
 		<!-- wp:site-title {"level":0,"style":{"typography":{"fontSize":"100px","lineHeight":"1.2"}}} /-->
 		<!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"}}},"layout":{"type":"constrained"}} -->
 		<div class="wp-block-group" style="padding-right:0;padding-left:0">
-			<!-- wp:navigation {"style":{"spacing":{"blockGap":"0"}},"layout":{"type":"flex","justifyContent":"right","orientation":"vertical"}} /-->
+			<!-- wp:navigation {"overlayBackgroundColor":"base","overlayTextColor":"contrast","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"flex","justifyContent":"right","orientation":"vertical"}} /-->
 		</div>
 		<!-- /wp:group -->
 	</div>
diff --git a/wp-content/themes/twentytwentyfive/patterns/header.php b/wp-content/themes/twentytwentyfive/patterns/header.php
index da36a3696c..1cbe86e1d3 100644
--- a/wp-content/themes/twentytwentyfive/patterns/header.php
+++ b/wp-content/themes/twentytwentyfive/patterns/header.php
@@ -21,7 +21,7 @@
 			<!-- wp:site-title {"level":0} /-->
 			<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
 			<div class="wp-block-group">
-				<!-- wp:navigation {"layout":{"type":"flex","justifyContent":"right","flexWrap":"wrap"}} /-->
+				<!-- wp:navigation {"overlayBackgroundColor":"base","overlayTextColor":"contrast","layout":{"type":"flex","justifyContent":"right","flexWrap":"wrap"}} /-->
 			</div>
 			<!-- /wp:group -->
 		</div>
diff --git a/wp-content/themes/twentytwentyfive/patterns/heading-and-paragraph-with-image.php b/wp-content/themes/twentytwentyfive/patterns/heading-and-paragraph-with-image.php
index 6532e4b1e0..5fc771ff03 100644
--- a/wp-content/themes/twentytwentyfive/patterns/heading-and-paragraph-with-image.php
+++ b/wp-content/themes/twentytwentyfive/patterns/heading-and-paragraph-with-image.php
@@ -33,7 +33,7 @@
 		<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%">
 			<!-- wp:image {"aspectRatio":"1","scale":"cover","sizeSlug":"full"} -->
 			<figure class="wp-block-image size-full">
-				<img src="<?php echo esc_url( get_template_directory_uri() . '/assets/images/image-from-rawpixel-id-8803077-original.webp' ); ?>" alt="<?php echo esc_attr_x( 'A classic black and white photo of an old church', 'Alt text for Overview picture.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover"/>
+				<img src="<?php echo esc_url( get_template_directory_uri() . '/assets/images/image-from-rawpixel-id-8802835-jpeg-scaled.webp' ); ?>" alt="<?php echo esc_attr_x( 'Cliff Palace, Colorado', 'Alt text for Overview picture.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover"/>
 			</figure>
 			<!-- /wp:image -->
 		</div>
diff --git a/wp-content/themes/twentytwentyfive/patterns/hero-book.php b/wp-content/themes/twentytwentyfive/patterns/hero-book.php
index bd9fd08d4c..acfb6d937d 100644
--- a/wp-content/themes/twentytwentyfive/patterns/hero-book.php
+++ b/wp-content/themes/twentytwentyfive/patterns/hero-book.php
@@ -2,7 +2,7 @@
 /**
  * Title: Hero book
  * Slug: twentytwentyfive/hero-book
- * Categories: featured, hero
+ * Categories: banner
  * Keywords: podcast, hero, stories
  * Description: A hero section for the book with a description and pre-order link.
  *
diff --git a/wp-content/themes/twentytwentyfive/patterns/hero-full-width-image.php b/wp-content/themes/twentytwentyfive/patterns/hero-full-width-image.php
index 5347f43408..0256eebf59 100644
--- a/wp-content/themes/twentytwentyfive/patterns/hero-full-width-image.php
+++ b/wp-content/themes/twentytwentyfive/patterns/hero-full-width-image.php
@@ -2,7 +2,7 @@
 /**
  * Title: Hero, full width image
  * Slug: twentytwentyfive/hero-full-width-image
- * Categories: banner, featured
+ * Categories: banner
  * Description: A hero with a full width image, heading, short paragraph and button.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/hero-overlapped-book-cover-with-links.php b/wp-content/themes/twentytwentyfive/patterns/hero-overlapped-book-cover-with-links.php
index cac97dd931..a82af5293e 100644
--- a/wp-content/themes/twentytwentyfive/patterns/hero-overlapped-book-cover-with-links.php
+++ b/wp-content/themes/twentytwentyfive/patterns/hero-overlapped-book-cover-with-links.php
@@ -2,7 +2,7 @@
 /**
  * Title: Hero, overlapped book cover with links
  * Slug: twentytwentyfive/hero-overlapped-book-cover-with-links
- * Categories: banner, featured
+ * Categories: banner
  * Description: A hero with an overlapped book cover and links.
  *
  * @package WordPress
@@ -11,115 +11,113 @@
  */

 ?>
-
-<!-- wp:cover {"isUserOverlayColor":true,"customGradient":"linear-gradient(180deg,rgb(251,250,243) 51%,rgb(255,255,255) 51%)","contentPosition":"center center","align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}},"spacing":{"padding":{"top":"var:preset|spacing|80","bottom":"var:preset|spacing|80","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}}},"textColor":"contrast","layout":{"type":"constrained"}} -->
-<div class="wp-block-cover alignfull has-contrast-color has-text-color has-link-color" style="padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--50)">
-	<span aria-hidden="true" class="wp-block-cover__background has-background-dim-100 has-background-dim has-background-gradient" style="background:linear-gradient(180deg,rgb(251,250,243) 51%,rgb(255,255,255) 51%)"></span>
-	<div class="wp-block-cover__inner-container">
-		<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
-		<div class="wp-block-group alignwide">
-			<!-- wp:columns {"verticalAlignment":"top","align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|80","left":"var:preset|spacing|80"}}}} -->
-			<div class="wp-block-columns alignwide are-vertically-aligned-top">
-				<!-- wp:column {"verticalAlignment":"top","width":"55%"} -->
-				<div class="wp-block-column is-vertically-aligned-top" style="flex-basis:55%">
-					<!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"left","flexWrap":"nowrap","verticalAlignment":"top"}} -->
+<!-- wp:group {"align":"full","className":"is-style-section-1","style":{"spacing":{"padding":{"top":"var:preset|spacing|80","bottom":"var:preset|spacing|80","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull is-style-section-1" style="padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--50)">
+	<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
+	<div class="wp-block-group alignwide">
+		<!-- wp:columns {"verticalAlignment":null,"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|80","left":"var:preset|spacing|80"}}}} -->
+		<div class="wp-block-columns alignwide">
+			<!-- wp:column {"verticalAlignment":"center","width":"55%"} -->
+			<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:55%">
+				<!-- wp:group {"style":{"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"left","flexWrap":"nowrap","verticalAlignment":"top"}} -->
+				<div class="wp-block-group" style="min-height:100%">
+					<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"constrained"}} -->
 					<div class="wp-block-group">
-						<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"constrained"}} -->
-						<div class="wp-block-group">
-							<!-- wp:heading {"fontSize":"xx-large"} -->
-							<h2 class="wp-block-heading has-xx-large-font-size">
-								<?php echo esc_html_x( 'The Stories Book', 'Hero - Overlapped book cover pattern headline text', 'twentytwentyfive' ); ?>
-							</h2>
-							<!-- /wp:heading -->
-							<!-- wp:paragraph {"className":"is-style-text-subtitle"} -->
-							<p class="is-style-text-subtitle">
-								<?php echo esc_html_x( 'A fine collection of moments in time featuring photographs from Louis Fleckenstein, Paul Strand and Asahachi Kōno.', 'Hero - Overlapped book cover pattern subline text', 'twentytwentyfive' ); ?>
-							</p>
-							<!-- /wp:paragraph -->
-						</div>
-						<!-- /wp:group -->
+						<!-- wp:heading {"fontSize":"xx-large"} -->
+						<h2 class="wp-block-heading has-xx-large-font-size">
+							<?php echo esc_html_x( 'The Stories Book', 'Hero - Overlapped book cover pattern headline text', 'twentytwentyfive' ); ?>
+						</h2>
+						<!-- /wp:heading -->
+
+						<!-- wp:paragraph {"className":"is-style-text-subtitle"} -->
+						<p class="is-style-text-subtitle">
+							<?php echo esc_html_x( 'A fine collection of moments in time featuring photographs from Louis Fleckenstein, Paul Strand and Asahachi Kōno.', 'Hero - Overlapped book cover pattern subline text', 'twentytwentyfive' ); ?>
+						</p>
+						<!-- /wp:paragraph -->
+					</div>
+					<!-- /wp:group -->

-						<!-- wp:spacer {"style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} -->
-						<div style="margin-top:var(--wp--preset--spacing--70);margin-bottom:var(--wp--preset--spacing--70)" aria-hidden="true" class="wp-block-spacer"></div>
+					<!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
+					<div class="wp-block-group">
+						<!-- wp:spacer {"style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"margin":{"top":"var:preset|spacing|20","bottom":"var:preset|spacing|20"}}}} -->
+						<div style="margin-top:var(--wp--preset--spacing--20);margin-bottom:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
 						<!-- /wp:spacer -->

-						<!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
-						<div class="wp-block-group">
-							<!-- wp:columns {"style":{"spacing":{"blockGap":{"top":"var:preset|spacing|20","left":"var:preset|spacing|20"}}}} -->
-							<div class="wp-block-columns">
-								<!-- wp:column {"verticalAlignment":"stretch"} -->
-								<div class="wp-block-column is-vertically-aligned-stretch">
-									<!-- wp:buttons {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","orientation":"horizontal","flexWrap":"wrap","justifyContent":"space-between"}} -->
-									<div class="wp-block-buttons">
-										<!-- wp:button {"width":100,"className":"is-style-fill"} -->
-										<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill">
-											<a class="wp-block-button__link wp-element-button" href="#">
-												<?php echo esc_html_x( 'Amazon', 'Example brand name.', 'twentytwentyfive' ); ?>
-											</a>
-										</div>
-										<!-- /wp:button -->
-										<!-- wp:button {"width":100,"className":"is-style-fill"} -->
-										<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill">
-											<a class="wp-block-button__link wp-element-button" href="#">
-												<?php echo esc_html_x( 'Apple Books', 'Example brand name.', 'twentytwentyfive' ); ?>
-											</a>
-										</div>
-										<!-- /wp:button -->
+						<!-- wp:columns {"style":{"spacing":{"blockGap":{"top":"var:preset|spacing|20","left":"var:preset|spacing|20"}}}} -->
+						<div class="wp-block-columns">
+							<!-- wp:column {"verticalAlignment":"stretch"} -->
+							<div class="wp-block-column is-vertically-aligned-stretch">
+								<!-- wp:buttons {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","orientation":"horizontal","flexWrap":"wrap","justifyContent":"space-between"}} -->
+								<div class="wp-block-buttons">
+									<!-- wp:button {"width":100,"className":"is-style-fill"} -->
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill">
+										<a class="wp-block-button__link wp-element-button" href="#">
+											<?php echo esc_html_x( 'Amazon', 'Example brand name.', 'twentytwentyfive' ); ?>
+										</a>
 									</div>
-									<!-- /wp:buttons -->
+									<!-- /wp:button -->
+									<!-- wp:button {"width":100,"className":"is-style-fill"} -->
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill">
+										<a class="wp-block-button__link wp-element-button" href="#">
+											<?php echo esc_html_x( 'Apple Books', 'Example brand name.', 'twentytwentyfive' ); ?>
+										</a>
+									</div>
+									<!-- /wp:button -->
 								</div>
-								<!-- /wp:column -->
-								<!-- wp:column {"verticalAlignment":"stretch"} -->
-								<div class="wp-block-column is-vertically-aligned-stretch">
-									<!-- wp:buttons {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","orientation":"horizontal","flexWrap":"wrap","justifyContent":"space-between"}} -->
-									<div class="wp-block-buttons">
-										<!-- wp:button {"width":100,"className":"is-style-fill"} -->
-										<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill">
-											<a class="wp-block-button__link wp-element-button" href="#">
-												<?php echo esc_html_x( 'Audible', 'Example brand name.', 'twentytwentyfive' ); ?>
-											</a>
-										</div>
-										<!-- /wp:button -->
-										<!-- wp:button {"width":100,"className":"is-style-fill"} -->
-										<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill">
-											<a class="wp-block-button__link wp-element-button" href="#">
-												<?php echo esc_html_x( 'Barnes &amp; Noble', 'Example brand name.', 'twentytwentyfive' ); ?>
-											</a>
-										</div>
-										<!-- /wp:button -->
+								<!-- /wp:buttons -->
+							</div>
+							<!-- /wp:column -->
+							<!-- wp:column {"verticalAlignment":"stretch"} -->
+							<div class="wp-block-column is-vertically-aligned-stretch">
+								<!-- wp:buttons {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","orientation":"horizontal","flexWrap":"wrap","justifyContent":"space-between"}} -->
+								<div class="wp-block-buttons">
+									<!-- wp:button {"width":100,"className":"is-style-fill"} -->
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill">
+										<a class="wp-block-button__link wp-element-button" href="#">
+											<?php echo esc_html_x( 'Audible', 'Example brand name.', 'twentytwentyfive' ); ?>
+										</a>
 									</div>
-									<!-- /wp:buttons -->
+									<!-- /wp:button -->
+									<!-- wp:button {"width":100,"className":"is-style-fill"} -->
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill">
+										<a class="wp-block-button__link wp-element-button" href="#">
+											<?php echo esc_html_x( 'Barnes &amp; Noble', 'Example brand name.', 'twentytwentyfive' ); ?>
+										</a>
+									</div>
+									<!-- /wp:button -->
 								</div>
-								<!-- /wp:column -->
+								<!-- /wp:buttons -->
 							</div>
-							<!-- /wp:columns -->
+							<!-- /wp:column -->
+						</div>
+						<!-- /wp:columns -->

-							<!-- wp:spacer {"style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"margin":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}}}} -->
-							<div style="margin-top:var(--wp--preset--spacing--40);margin-bottom:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
-							<!-- /wp:spacer -->
+						<!-- wp:spacer {"style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"margin":{"top":"var:preset|spacing|20","bottom":"var:preset|spacing|20"}}}} -->
+						<div style="margin-top:var(--wp--preset--spacing--20);margin-bottom:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+						<!-- /wp:spacer -->

-							<!-- wp:paragraph {"fontSize":"medium"} -->
-							<p class="has-medium-font-size"><?php echo wp_kses_post( _x( 'Outside Europe? View <a href="#" rel="nofollow">international editions</a>.', 'Pattern placeholder text with link.', 'twentytwentyfive' ) ); ?></p>
-							<!-- /wp:paragraph -->
-						</div>
-						<!-- /wp:group -->
+						<!-- wp:paragraph {"fontSize":"medium"} -->
+						<p class="has-medium-font-size"><?php echo wp_kses_post( _x( 'Outside Europe? View <a href="#" rel="nofollow">international editions</a>.', 'Pattern placeholder text with link.', 'twentytwentyfive' ) ); ?></p>
+						<!-- /wp:paragraph -->
 					</div>
 					<!-- /wp:group -->
 				</div>
-				<!-- /wp:column -->
-				<!-- wp:column {"verticalAlignment":"top","width":"45%"} -->
-				<div class="wp-block-column is-vertically-aligned-top" style="flex-basis:45%">
-					<!-- wp:image {"aspectRatio":"3/4","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
-					<figure class="wp-block-image size-full">
-						<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/book-image.webp" alt="<?php echo esc_attr__( 'Book Image', 'twentytwentyfive' ); ?>" style="aspect-ratio:3/4;object-fit:cover"/>
-					</figure>
-					<!-- /wp:image -->
-				</div>
-				<!-- /wp:column -->
+				<!-- /wp:group -->
+			</div>
+			<!-- /wp:column -->
+
+			<!-- wp:column {"verticalAlignment":"top","width":"45%"} -->
+			<div class="wp-block-column is-vertically-aligned-top" style="flex-basis:45%">
+				<!-- wp:image {"aspectRatio":"3/4","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
+				<figure class="wp-block-image size-full">
+					<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/book-image.webp" alt="<?php echo esc_attr__( 'Book Image', 'twentytwentyfive' ); ?>" style="aspect-ratio:3/4;object-fit:cover"/>
+				</figure>
+				<!-- /wp:image -->
 			</div>
-			<!-- /wp:columns -->
+			<!-- /wp:column -->
 		</div>
-		<!-- /wp:group -->
+		<!-- /wp:columns -->
 	</div>
+	<!-- /wp:group -->
 </div>
-<!-- /wp:cover -->
+<!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/hero-podcast.php b/wp-content/themes/twentytwentyfive/patterns/hero-podcast.php
index 3ea67aa4bb..98ce22ff6e 100644
--- a/wp-content/themes/twentytwentyfive/patterns/hero-podcast.php
+++ b/wp-content/themes/twentytwentyfive/patterns/hero-podcast.php
@@ -2,7 +2,7 @@
 /**
  * Title: Hero podcast
  * Slug: twentytwentyfive/hero-podcast
- * Categories: featured, hero
+ * Categories: banner
  * Keywords: podcast, hero, stories
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/logos.php b/wp-content/themes/twentytwentyfive/patterns/logos.php
index c885924777..08e4a33ebd 100644
--- a/wp-content/themes/twentytwentyfive/patterns/logos.php
+++ b/wp-content/themes/twentytwentyfive/patterns/logos.php
@@ -2,7 +2,7 @@
 /**
  * Title: Logos
  * Slug: twentytwentyfive/logos
- * Categories: banner, featured
+ * Categories: banner
  * Description: Showcasing the podcast's clients with a heading and a series of client logos.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/media-instagram-grid.php b/wp-content/themes/twentytwentyfive/patterns/media-instagram-grid.php
index f57658b099..60a7e15d11 100644
--- a/wp-content/themes/twentytwentyfive/patterns/media-instagram-grid.php
+++ b/wp-content/themes/twentytwentyfive/patterns/media-instagram-grid.php
@@ -16,23 +16,21 @@
 <div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)">
 	<!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|50"}},"layout":{"type":"grid","minimumColumnWidth":"18rem"}} -->
 	<div class="wp-block-group alignwide">
-		<!-- wp:cover {"overlayColor":"contrast","isUserOverlayColor":true,"isDark":false,"style":{"dimensions":{"aspectRatio":"1"},"elements":{"link":{"color":{"text":"var:preset|color|base"}}}},"textColor":"base"} -->
-		<div class="wp-block-cover is-light has-base-color has-text-color has-link-color">
-			<span aria-hidden="true" class="wp-block-cover__background has-contrast-background-color has-background-dim-100 has-background-dim"></span>
-			<div class="wp-block-cover__inner-container">
-				<!-- wp:group {"style":{"dimensions":{"minHeight":"100%"},"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"center","justifyContent":"center"}} -->
-				<div class="wp-block-group" style="min-height:100%">
-					<!-- wp:heading {"fontSize":"large"} -->
-					<h2 class="wp-block-heading has-large-font-size"><?php esc_html_e( 'Instagram', 'twentytwentyfive' ); ?></h2>
-					<!-- /wp:heading -->
-					<!-- wp:paragraph {"align":"center","fontSize":"medium"} -->
-					<p class="has-text-align-center has-medium-font-size"><a href="#"><?php echo esc_html_x( '@example', 'Example username for social media account.', 'twentytwentyfive' ); ?></a></p>
-					<!-- /wp:paragraph -->
+		<!-- wp:group {"className":"is-style-section-3","style":{"dimensions":{"minHeight":"297px"}},"layout":{"type":"constrained"}} -->
+		<div class="wp-block-group is-style-section-3" style="min-height:297px">
+			<!-- wp:group {"style":{"dimensions":{"minHeight":"100%"},"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"center","justifyContent":"center"}} -->
+			<div class="wp-block-group" style="min-height:100%">
+				<!-- wp:heading {"fontSize":"large"} -->
+				<h2 class="wp-block-heading has-large-font-size"><?php esc_html_e( 'Instagram', 'twentytwentyfive' ); ?></h2>
+				<!-- /wp:heading -->
+
+				<!-- wp:paragraph {"align":"center","fontSize":"medium"} -->
+				<p class="has-text-align-center has-medium-font-size"><a href="#"><?php echo esc_html_x( '@example', 'Example username for social media account.', 'twentytwentyfive' ); ?></a></p>
+				<!-- /wp:paragraph -->
 				</div>
-				<!-- /wp:group -->
-			</div>
+			<!-- /wp:group -->
 		</div>
-		<!-- /wp:cover -->
+		<!-- /wp:group -->

 		<!-- wp:image {"aspectRatio":"1","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
 		<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/flower-meadow-square.webp" alt="<?php esc_attr_e( 'Photo of a field full of flowers, a blue sky and a tree.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover"/></figure>
diff --git a/wp-content/themes/twentytwentyfive/patterns/overlapped-images.php b/wp-content/themes/twentytwentyfive/patterns/overlapped-images.php
index bb290e04c6..720aecb2e4 100644
--- a/wp-content/themes/twentytwentyfive/patterns/overlapped-images.php
+++ b/wp-content/themes/twentytwentyfive/patterns/overlapped-images.php
@@ -2,7 +2,7 @@
 /**
  * Title: Overlapping images and paragraph on right
  * Slug: twentytwentyfive/overlapped-images
- * Categories: about
+ * Categories: about, featured
  * Description: A section with overlapping images, and a description.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-business-home.php b/wp-content/themes/twentytwentyfive/patterns/page-business-home.php
index 2c17df2548..cb1c11ea3b 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-business-home.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-business-home.php
@@ -2,7 +2,7 @@
 /**
  * Title: Business homepage
  * Slug: twentytwentyfive/page-business-home
- * Categories: twentytwentyfive_page, posts, featured
+ * Categories: twentytwentyfive_page, featured
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
@@ -15,13 +15,39 @@
  */

 ?>
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull">
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/cta-centered-heading"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/overlapped-images"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/services-3-col"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/testimonials-large"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/pricing-2-col"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/cta-newsletter"} /-->
 </div>
 <!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-cv-bio.php b/wp-content/themes/twentytwentyfive/patterns/page-cv-bio.php
index 5158e904a4..e3c2885c54 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-cv-bio.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-cv-bio.php
@@ -2,7 +2,7 @@
 /**
  * Title: CV/bio
  * Slug: twentytwentyfive/page-cv-bio
- * Categories: twentytwentyfive_page, about
+ * Categories: twentytwentyfive_page, about, featured
  * Keywords: starter
  * Block Types: core/post-content
  * Viewport width: 1400
@@ -14,8 +14,8 @@
  */

 ?>
-<!-- wp:cover {"overlayColor":"base","isUserOverlayColor":true,"isDark":false,"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-cover alignfull is-light" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--50)">
+<!-- wp:cover {"overlayColor":"base","isUserOverlayColor":true,"isDark":false,"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}},"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast","layout":{"type":"constrained"}} -->
+<div class="wp-block-cover alignfull is-light has-contrast-color has-text-color has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--50)">
 	<span aria-hidden="true" class="wp-block-cover__background has-base-background-color has-background-dim-100 has-background-dim"></span>
 	<div class="wp-block-cover__inner-container">
 	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|60","left":"var:preset|spacing|80"}}}} -->
@@ -24,10 +24,9 @@
 			<div class="wp-block-column" style="flex-basis:65%">
 				<!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
 				<div class="wp-block-group">
-					<!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"22rem","letterSpacing":"-0.03em"}}} -->
-					<p class="has-text-align-left" style="font-size:22rem;letter-spacing:-0.03em"><?php echo esc_html_x( 'Hey,', 'Example heading above the content of the CV/Bio pattern.', 'twentytwentyfive' ); ?></p>
-					<!-- /wp:paragraph -->
-
+					<!-- wp:heading {"textAlign":"left","style":{"typography":{"fontSize":"22rem","letterSpacing":"-0.03em","fontStyle":"normal","fontWeight":"300","lineHeight":"1.4"}}} -->
+					<h2 class="wp-block-heading has-text-align-left" style="font-size:22rem;font-style:normal;font-weight:300;letter-spacing:-0.03em;line-height:1.4"><?php echo esc_html_x( 'Hey,', 'Example heading in pattern.', 'twentytwentyfive' ); ?></h2>
+					<!-- /wp:heading -->
 					<!-- wp:paragraph {"className":"is-style-text-subtitle"} -->
 					<p class="is-style-text-subtitle"><?php echo esc_html_x( 'My name is Nora Winslow Keene, and I&rsquo;m a committed public interest attorney. Living in Denver, Colorado, I&rsquo;ve spent years championing the rights of underrepresented workers. A graduate of Stanford University, I played a key role in securing critical protections for agricultural laborers, ensuring better wages and access to healthcare. My work has focused on advocating for environmental justice and improving the quality of life for rural communities. Every case I take on is driven by the belief that everyone deserves dignity and fair treatment in the workplace.', 'Pattern placeholder text.', 'twentytwentyfive' ); ?></p>
 					<!-- /wp:paragraph -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-landing-book.php b/wp-content/themes/twentytwentyfive/patterns/page-landing-book.php
index 2338bd7d82..18bc111b4a 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-landing-book.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-landing-book.php
@@ -15,13 +15,38 @@
  */

 ?>
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull">
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/hero-book"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/cta-book-links"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/banner-about-book"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/cta-book-locations"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/text-faqs"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/cta-newsletter"} /-->
 </div>
 <!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-landing-event.php b/wp-content/themes/twentytwentyfive/patterns/page-landing-event.php
index 09fc0ae784..e342640923 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-landing-event.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-landing-event.php
@@ -15,12 +15,32 @@
  */

 ?>
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull">
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/hero-full-width-image"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/heading-and-paragraph-with-image"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/banner-description-images-grid"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/text-faqs"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/contact-centered-social-link"} /-->
 </div>
 <!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-landing-podcast.php b/wp-content/themes/twentytwentyfive/patterns/page-landing-podcast.php
index f917bbe483..6eafa89bb6 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-landing-podcast.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-landing-podcast.php
@@ -15,12 +15,32 @@
  */

 ?>
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull">
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/hero-podcast"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/heading-and-paragraph-with-image"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/logos"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/grid-videos"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/cta-newsletter"} /-->
 </div>
 <!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-heading-paragraph-links-image.php b/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-heading-paragraph-links-image.php
index 6832e0c27b..affd8e170c 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-heading-paragraph-links-image.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-heading-paragraph-links-image.php
@@ -55,9 +55,9 @@
 			<!-- wp:cover {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/link-in-bio-background.webp","alt":"Photo of a woman worker.","dimRatio":0,"customOverlayColor":"#6b6b6b","isUserOverlayColor":true,"minHeight":100,"minHeightUnit":"vh","layout":{"type":"default"}} -->
 			<div class="wp-block-cover" style="min-height:100vh"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim" style="background-color:#6b6b6b"></span>
 				<img class="wp-block-cover__image-background" alt="<?php esc_attr_e( 'Photo of a woman worker.', 'twentytwentyfive' ); ?>" src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/link-in-bio-background.webp" data-object-fit="cover"/><div class="wp-block-cover__inner-container">
-				<!-- wp:paragraph {"align":"center","fontSize":"large"} -->
-				<p class="has-text-align-center has-large-font-size"></p>
-				<!-- /wp:paragraph -->
+				<!-- wp:spacer {"height":"var:preset|spacing|20"} -->
+				<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+				<!-- /wp:spacer -->
 			</div></div>
 			<!-- /wp:cover -->
 		</div>
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-wide-margins.php b/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-wide-margins.php
index e43423f72b..7242761dab 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-wide-margins.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-wide-margins.php
@@ -38,7 +38,7 @@
 				<p><?php echo esc_html_x( 'I&rsquo;m Nora, a dedicated public interest attorney based in Denver. I&rsquo;m a graduate of Stanford University.', 'Pattern placeholder text.', 'twentytwentyfive' ); ?></p>
 				<!-- /wp:paragraph -->

-				<!-- wp:social-links {"iconColor":"contrast","iconColorValue":"#111111","className":"is-style-logos-only"} -->
+				<!-- wp:social-links {"iconColor":"currentColor","iconColorValue":"currentColor","className":"is-style-logos-only"} -->
 				<ul class="wp-block-social-links has-icon-color is-style-logos-only">
 					<!-- wp:social-link {"url":"#","service":"x"} /-->

diff --git a/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-with-tight-margins.php b/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-with-tight-margins.php
index 39e1732756..c34d4edeff 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-with-tight-margins.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-link-in-bio-with-tight-margins.php
@@ -2,7 +2,7 @@
 /**
  * Title: Link in bio with tight margins
  * Slug: twentytwentyfive/page-link-in-bio-with-tight-margins
- * Categories: twentytwentyfive_page, banner, featured
+ * Categories: twentytwentyfive_page, banner
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
@@ -26,9 +26,9 @@
 				<span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim" style="background-color:#818181"></span>
 				<img class="wp-block-cover__image-background" alt="<?php esc_attr_e( 'Black and white photo focusing on a woman and a child from afar.', 'twentytwentyfive' ); ?>" src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/link-in-bio-image.webp" data-object-fit="cover"/><div class="wp-block-cover__inner-container">

-				<!-- wp:paragraph {"align":"center","fontSize":"large"} -->
-				<p class="has-text-align-center has-large-font-size"></p>
-				<!-- /wp:paragraph -->
+				<!-- wp:spacer {"height":"var:preset|spacing|20"} -->
+				<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+				<!-- /wp:spacer -->
 			</div></div>
 			<!-- /wp:cover -->
 		</div>
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-portfolio-home.php b/wp-content/themes/twentytwentyfive/patterns/page-portfolio-home.php
index 285bc99117..a5d98bda2b 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-portfolio-home.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-portfolio-home.php
@@ -2,7 +2,7 @@
 /**
  * Title: Portfolio homepage
  * Slug: twentytwentyfive/page-portfolio-home
- * Categories: twentytwentyfive_page, posts, featured
+ * Categories: twentytwentyfive_page, posts
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
@@ -38,176 +38,173 @@
 			<!-- /wp:column -->
 		</div>
 		<!-- /wp:columns -->
+	</div>
+	<!-- /wp:group -->
+</div>
+<!-- /wp:group -->

-		<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"left":"var:preset|spacing|20"}}}} -->
-		<div class="wp-block-columns alignwide">
-			<!-- wp:column {"width":"66.66%"} -->
-			<div class="wp-block-column" style="flex-basis:66.66%">
-				<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
-				<div class="wp-block-query">
-					<!-- wp:post-template -->
-						<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
-						<div class="wp-block-group">
-							<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
-
-							<!-- wp:post-title {"isLink":true} /-->
-
-							<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
-						</div>
-						<!-- /wp:group -->
-					<!-- /wp:post-template -->
-
-					<!-- wp:query-no-results -->
-					<!-- wp:paragraph -->
-					<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-					<!-- /wp:paragraph -->
-					<!-- /wp:query-no-results -->
-				</div>
-				<!-- /wp:query -->
-			</div>
-			<!-- /wp:column -->
-
-			<!-- wp:column {"width":"33.33%"} -->
-			<div class="wp-block-column" style="flex-basis:33.33%">
-				<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":"1","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
-				<div class="wp-block-query">
-					<!-- wp:post-template -->
-						<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
-						<div class="wp-block-group">
-							<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
-
-							<!-- wp:post-title {"isLink":true} /-->
-
-							<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
-						</div>
-						<!-- /wp:group -->
-					<!-- /wp:post-template -->
-
-					<!-- wp:query-no-results -->
-					<!-- wp:paragraph -->
-					<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-					<!-- /wp:paragraph -->
-					<!-- /wp:query-no-results -->
-				</div>
-				<!-- /wp:query -->
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
+	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"left":"var:preset|spacing|20"}}}} -->
+	<div class="wp-block-columns alignwide">
+		<!-- wp:column {"width":"66.66%"} -->
+		<div class="wp-block-column" style="flex-basis:66.66%">
+			<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
+			<div class="wp-block-query">
+				<!-- wp:post-template -->
+					<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
+					<div class="wp-block-group">
+						<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
+						<!-- wp:post-title {"isLink":true} /-->
+						<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
+					</div>
+					<!-- /wp:group -->
+				<!-- /wp:post-template -->
+				<!-- wp:query-no-results -->
+				<!-- wp:paragraph -->
+				<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
+				<!-- /wp:paragraph -->
+				<!-- /wp:query-no-results -->
 			</div>
-			<!-- /wp:column -->
+			<!-- /wp:query -->
 		</div>
-		<!-- /wp:columns -->
-
-		<!-- wp:spacer {"height":"var:preset|spacing|70"} -->
-		<div style="height:var(--wp--preset--spacing--70)" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-
-		<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":"2","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"align":"wide","layout":{"type":"default"}} -->
-		<div class="wp-block-query alignwide">
-			<!-- wp:post-template {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"grid","columnCount":3}} -->
-				<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
-				<div class="wp-block-group">
-					<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
-
-					<!-- wp:post-title {"isLink":true} /-->
-
-					<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
-				</div>
-				<!-- /wp:group -->
-			<!-- /wp:post-template -->
-
-			<!-- wp:query-no-results -->
-			<!-- wp:paragraph -->
-			<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-			<!-- /wp:paragraph -->
-			<!-- /wp:query-no-results -->
+		<!-- /wp:column -->
+		<!-- wp:column {"width":"33.33%"} -->
+		<div class="wp-block-column" style="flex-basis:33.33%">
+			<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":"1","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
+			<div class="wp-block-query">
+				<!-- wp:post-template -->
+					<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
+					<div class="wp-block-group">
+						<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
+						<!-- wp:post-title {"isLink":true} /-->
+						<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
+					</div>
+					<!-- /wp:group -->
+				<!-- /wp:post-template -->
+				<!-- wp:query-no-results -->
+				<!-- wp:paragraph -->
+				<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
+				<!-- /wp:paragraph -->
+				<!-- /wp:query-no-results -->
+			</div>
+			<!-- /wp:query -->
 		</div>
-		<!-- /wp:query -->
-
-		<!-- wp:spacer {"height":"var:preset|spacing|70"} -->
-		<div style="height:var(--wp--preset--spacing--70)" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-
-		<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"left":"var:preset|spacing|20"}}}} -->
-		<div class="wp-block-columns alignwide">
-			<!-- wp:column {"width":"33.33%"} -->
-			<div class="wp-block-column" style="flex-basis:33.33%">
-				<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":"5","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
-				<div class="wp-block-query">
-					<!-- wp:post-template -->
-						<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
-						<div class="wp-block-group">
-							<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
-
-							<!-- wp:post-title {"isLink":true} /-->
-
-							<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
-						</div>
-						<!-- /wp:group -->
-					<!-- /wp:post-template -->
+		<!-- /wp:column -->
+	</div>
+	<!-- /wp:columns -->
+
+	<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
+	<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+</div>
+<!-- /wp:group -->

-					<!-- wp:query-no-results -->
-					<!-- wp:paragraph -->
-					<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-					<!-- /wp:paragraph -->
-					<!-- /wp:query-no-results -->
-				</div>
-				<!-- /wp:query -->
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
+	<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
+	<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":"2","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"align":"wide","layout":{"type":"default"}} -->
+	<div class="wp-block-query alignwide">
+		<!-- wp:post-template {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"grid","columnCount":3}} -->
+			<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
+			<div class="wp-block-group">
+				<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
+				<!-- wp:post-title {"isLink":true} /-->
+				<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
 			</div>
-			<!-- /wp:column -->
-
-			<!-- wp:column {"width":"66.66%"} -->
-			<div class="wp-block-column" style="flex-basis:66.66%">
-				<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":"6","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
-				<div class="wp-block-query">
-					<!-- wp:post-template -->
-						<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
-						<div class="wp-block-group">
-							<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
-
-							<!-- wp:post-title {"isLink":true} /-->
-
-							<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
-						</div>
-						<!-- /wp:group -->
-					<!-- /wp:post-template -->
+			<!-- /wp:group -->
+		<!-- /wp:post-template -->
+		<!-- wp:query-no-results -->
+		<!-- wp:paragraph -->
+		<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
+		<!-- /wp:paragraph -->
+		<!-- /wp:query-no-results -->
+	</div>
+	<!-- /wp:query -->
+	<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
+	<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+</div>
+<!-- /wp:group -->

-					<!-- wp:query-no-results -->
-					<!-- wp:paragraph -->
-					<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-					<!-- /wp:paragraph -->
-					<!-- /wp:query-no-results -->
-				</div>
-				<!-- /wp:query -->
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
+	<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
+	<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"left":"var:preset|spacing|20"}}}} -->
+	<div class="wp-block-columns alignwide">
+		<!-- wp:column {"width":"33.33%"} -->
+		<div class="wp-block-column" style="flex-basis:33.33%">
+			<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":"5","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
+			<div class="wp-block-query">
+				<!-- wp:post-template -->
+					<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
+					<div class="wp-block-group">
+						<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
+						<!-- wp:post-title {"isLink":true} /-->
+						<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
+					</div>
+					<!-- /wp:group -->
+				<!-- /wp:post-template -->
+				<!-- wp:query-no-results -->
+				<!-- wp:paragraph -->
+				<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
+				<!-- /wp:paragraph -->
+				<!-- /wp:query-no-results -->
 			</div>
-			<!-- /wp:column -->
+			<!-- /wp:query -->
 		</div>
-		<!-- /wp:columns -->
-
-		<!-- wp:spacer {"height":"var:preset|spacing|70"} -->
-		<div style="height:var(--wp--preset--spacing--70)" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-
-		<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":"7","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"align":"wide","layout":{"type":"default"}} -->
-		<div class="wp-block-query alignwide">
-			<!-- wp:post-template {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"grid","columnCount":3}} -->
-				<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
-				<div class="wp-block-group">
-					<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
-
-					<!-- wp:post-title {"isLink":true} /-->
+		<!-- /wp:column -->
+		<!-- wp:column {"width":"66.66%"} -->
+		<div class="wp-block-column" style="flex-basis:66.66%">
+			<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":"6","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
+			<div class="wp-block-query">
+				<!-- wp:post-template -->
+					<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
+					<div class="wp-block-group">
+						<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
+						<!-- wp:post-title {"isLink":true} /-->
+						<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
+					</div>
+					<!-- /wp:group -->
+				<!-- /wp:post-template -->
+				<!-- wp:query-no-results -->
+				<!-- wp:paragraph -->
+				<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
+				<!-- /wp:paragraph -->
+				<!-- /wp:query-no-results -->
+			</div>
+			<!-- /wp:query -->
+		</div>
+		<!-- /wp:column -->
+	</div>
+	<!-- /wp:columns -->

-					<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
-				</div>
-				<!-- /wp:group -->
-			<!-- /wp:post-template -->
+	<!-- wp:spacer {"height":"var:preset|spacing|70"} -->
+	<div style="height:var(--wp--preset--spacing--70)" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->

-			<!-- wp:query-no-results -->
-			<!-- wp:paragraph -->
-			<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-			<!-- /wp:paragraph -->
-			<!-- /wp:query-no-results -->
-		</div>
-		<!-- /wp:query -->
+	<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":"7","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"align":"wide","layout":{"type":"default"}} -->
+	<div class="wp-block-query alignwide">
+		<!-- wp:post-template {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"grid","columnCount":3}} -->
+			<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"default"}} -->
+			<div class="wp-block-group">
+				<!-- wp:post-featured-image {"isLink":true,"aspectRatio":"3/2"} /-->
+				<!-- wp:post-title {"isLink":true} /-->
+				<!-- wp:post-terms {"term":"category","style":{"elements":{"link":{"color":{"text":"var:preset|color|accent-4"}}},"typography":{"fontStyle":"normal","fontWeight":"300"}}} /-->
+			</div>
+			<!-- /wp:group -->
+		<!-- /wp:post-template -->
+		<!-- wp:query-no-results -->
+		<!-- wp:paragraph -->
+		<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
+		<!-- /wp:paragraph -->
+		<!-- /wp:query-no-results -->
 	</div>
-	<!-- /wp:group -->
+	<!-- /wp:query -->

 	<!-- wp:separator {"align":"full"} -->
 	<hr class="wp-block-separator alignfull has-alpha-channel-opacity"/>
@@ -216,7 +213,11 @@
 	<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
 	<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
 	<!-- /wp:spacer -->
+</div>
+<!-- /wp:group -->

+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
 	<div class="wp-block-group alignwide">
 		<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/page-shop-home.php b/wp-content/themes/twentytwentyfive/patterns/page-shop-home.php
index 430908f568..2b1a0b291c 100644
--- a/wp-content/themes/twentytwentyfive/patterns/page-shop-home.php
+++ b/wp-content/themes/twentytwentyfive/patterns/page-shop-home.php
@@ -2,7 +2,7 @@
 /**
  * Title: Shop homepage
  * Slug: twentytwentyfive/page-shop-home
- * Categories: twentytwentyfive_page, posts, featured
+ * Categories: twentytwentyfive_page
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
@@ -15,10 +15,20 @@
  */

 ?>
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull">
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/banner-intro-image"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/grid-with-categories"} /-->
+</div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
 	<!-- wp:pattern {"slug":"twentytwentyfive/media-instagram-grid"} /-->
 </div>
 <!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/pricing-2-col.php b/wp-content/themes/twentytwentyfive/patterns/pricing-2-col.php
index ed8c077ef6..830da3f640 100644
--- a/wp-content/themes/twentytwentyfive/patterns/pricing-2-col.php
+++ b/wp-content/themes/twentytwentyfive/patterns/pricing-2-col.php
@@ -2,7 +2,7 @@
 /**
  * Title: Pricing, 2 columns
  * Slug: twentytwentyfive/pricing-2-col
- * Categories: call-to-action, featured
+ * Categories: call-to-action
  * Viewport width: 1400
  * Description: Pricing section with two columns, pricing plan, description, and call-to-action buttons.
  *
diff --git a/wp-content/themes/twentytwentyfive/patterns/pricing-3-col.php b/wp-content/themes/twentytwentyfive/patterns/pricing-3-col.php
index 616678bfe9..11292c2a79 100644
--- a/wp-content/themes/twentytwentyfive/patterns/pricing-3-col.php
+++ b/wp-content/themes/twentytwentyfive/patterns/pricing-3-col.php
@@ -2,7 +2,7 @@
 /**
  * Title: Pricing, 3 columns
  * Slug: twentytwentyfive/pricing-3-col
- * Categories: call-to-action, banner, featured, services
+ * Categories: call-to-action, banner, services
  * Description: A three-column boxed pricing table designed to showcase services, descriptions, and pricing options.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/services-3-col.php b/wp-content/themes/twentytwentyfive/patterns/services-3-col.php
index dc2cc95ba5..b1952e397e 100644
--- a/wp-content/themes/twentytwentyfive/patterns/services-3-col.php
+++ b/wp-content/themes/twentytwentyfive/patterns/services-3-col.php
@@ -2,7 +2,7 @@
 /**
  * Title: Services, 3 columns
  * Slug: twentytwentyfive/services-3-col
- * Categories: call-to-action, banner, featured, services
+ * Categories: call-to-action, banner, services
  * Description: Three columns with images and text to showcase services.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/services-subscriber-only-section.php b/wp-content/themes/twentytwentyfive/patterns/services-subscriber-only-section.php
index 908351401c..73d365da95 100644
--- a/wp-content/themes/twentytwentyfive/patterns/services-subscriber-only-section.php
+++ b/wp-content/themes/twentytwentyfive/patterns/services-subscriber-only-section.php
@@ -2,7 +2,7 @@
 /**
  * Title: Services, subscriber only section
  * Slug: twentytwentyfive/services-subscriber-only-section
- * Categories: call-to-action, featured, services
+ * Categories: call-to-action, services
  * Description: A subscriber-only section highlighting exclusive services and offerings.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-home-news-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-home-news-blog.php
index cbf53f38a8..f47df2c529 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-home-news-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-home-news-blog.php
@@ -53,11 +53,6 @@
 							</div>
 							<!-- /wp:group -->
 						<!-- /wp:post-template -->
-						<!-- wp:query-no-results -->
-							<!-- wp:paragraph -->
-							<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-							<!-- /wp:paragraph -->
-						<!-- /wp:query-no-results -->
 					</div>
 					<!-- /wp:query -->
 				</div>
@@ -78,11 +73,6 @@
 						</div>
 						<!-- /wp:group -->
 					<!-- /wp:post-template -->
-					<!-- wp:query-no-results -->
-						<!-- wp:paragraph -->
-						<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-						<!-- /wp:paragraph -->
-					<!-- /wp:query-no-results -->
 				</div>
 				<!-- /wp:query -->
 			</div>
@@ -102,11 +92,6 @@
 							</div>
 							<!-- /wp:group -->
 						<!-- /wp:post-template -->
-						<!-- wp:query-no-results -->
-							<!-- wp:paragraph -->
-							<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-							<!-- /wp:paragraph -->
-						<!-- /wp:query-no-results -->
 					</div>
 					<!-- /wp:query -->
 					<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":"4","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]}} -->
@@ -120,11 +105,6 @@
 							</div>
 							<!-- /wp:group -->
 						<!-- /wp:post-template -->
-						<!-- wp:query-no-results -->
-							<!-- wp:paragraph -->
-							<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-							<!-- /wp:paragraph -->
-						<!-- /wp:query-no-results -->
 					</div>
 					<!-- /wp:query -->
 				</div>
@@ -149,11 +129,6 @@
 				</div>
 				<!-- /wp:group -->
 			<!-- /wp:post-template -->
-			<!-- wp:query-no-results -->
-				<!-- wp:paragraph -->
-				<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-				<!-- /wp:paragraph -->
-			<!-- /wp:query-no-results -->
 		</div>
 		<!-- /wp:query -->
 	</div>
@@ -172,11 +147,6 @@
 				</div>
 				<!-- /wp:group -->
 			<!-- /wp:post-template -->
-			<!-- wp:query-no-results -->
-				<!-- wp:paragraph -->
-				<p><?php echo esc_html_x( 'Sorry, but nothing was found. Please try a search with different keywords.', 'Message explaining that there are no results returned from a search.', 'twentytwentyfive' ); ?></p>
-				<!-- /wp:paragraph -->
-			<!-- /wp:query-no-results -->
 			<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}}},"layout":{"type":"constrained"}} -->
 			<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)">
 				<!-- wp:query-pagination {"align":"wide","layout":{"type":"flex","justifyContent":"space-between"}} -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-query-loop-photo-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-query-loop-photo-blog.php
index 3c7e05eb94..c9f150cbe0 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-query-loop-photo-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-query-loop-photo-blog.php
@@ -4,6 +4,7 @@
  * Slug: twentytwentyfive/template-query-loop-photo-blog
  * Categories: query
  * Block Types: core/query
+ * Viewport width: 1400
  * Description: A list of posts, 3 columns, with only featured images.
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/patterns/testimonials-2-col.php b/wp-content/themes/twentytwentyfive/patterns/testimonials-2-col.php
index 7f08d9c5c1..288f48afd2 100644
--- a/wp-content/themes/twentytwentyfive/patterns/testimonials-2-col.php
+++ b/wp-content/themes/twentytwentyfive/patterns/testimonials-2-col.php
@@ -23,7 +23,7 @@
 				<!-- wp:column {"width":"64px"} -->
 				<div class="wp-block-column" style="flex-basis:64px">
 					<!-- wp:image {"width":"64px","aspectRatio":"1","scale":"cover","sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-					<figure class="wp-block-image size-large is-resized is-style-rounded"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/avatar.webp" alt="<?php echo esc_attr_x( 'Picture of a person', 'Alt text for testimonial image.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover;width:64px"/></figure>
+					<figure class="wp-block-image size-large is-resized is-style-rounded"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/nurse.webp" alt="<?php echo esc_attr_x( 'Picture of a person', 'Alt text for testimonial image.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover;width:64px"/></figure>
 					<!-- /wp:image -->
 				</div>
 				<!-- /wp:column -->
@@ -52,7 +52,7 @@
 				<!-- wp:column {"width":"64px"} -->
 				<div class="wp-block-column" style="flex-basis:64px">
 					<!-- wp:image {"width":"64px","aspectRatio":"1","scale":"cover","sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-					<figure class="wp-block-image size-large is-resized is-style-rounded"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/avatar.webp" alt="<?php echo esc_attr_x( 'Picture of a person', 'Alt text for testimonial image.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover;width:64px"/></figure>
+					<figure class="wp-block-image size-large is-resized is-style-rounded"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/nurse.webp" alt="<?php echo esc_attr_x( 'Picture of a person', 'Alt text for testimonial image.', 'twentytwentyfive' ); ?>" style="aspect-ratio:1;object-fit:cover;width:64px"/></figure>
 					<!-- /wp:image -->
 				</div>
 				<!-- /wp:column -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/text-faqs.php b/wp-content/themes/twentytwentyfive/patterns/text-faqs.php
index c28d2dcfb5..016a7cc2c4 100644
--- a/wp-content/themes/twentytwentyfive/patterns/text-faqs.php
+++ b/wp-content/themes/twentytwentyfive/patterns/text-faqs.php
@@ -2,7 +2,7 @@
 /**
  * Title: FAQs
  * Slug: twentytwentyfive/text-faqs
- * Categories: text, about, featured
+ * Categories: text, about
  * Keywords: faq, about, frequently asked questions
  * Viewport width: 1400
  * Description: A FAQs section with a FAQ heading and list of toggle questions and answers.
diff --git a/wp-content/themes/twentytwentyfive/patterns/vertical-header.php b/wp-content/themes/twentytwentyfive/patterns/vertical-header.php
index ae5c637e9b..42e620d85b 100644
--- a/wp-content/themes/twentytwentyfive/patterns/vertical-header.php
+++ b/wp-content/themes/twentytwentyfive/patterns/vertical-header.php
@@ -18,7 +18,7 @@
 	<div class="wp-block-group alignwide" style="min-height:100vh;">
 		<!-- wp:group {"align":"full","layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
 		<div class="wp-block-group alignfull">
-			<!-- wp:navigation {"overlayMenu":"always","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"}} /-->
+			<!-- wp:navigation {"overlayBackgroundColor":"base","overlayTextColor":"contrast","overlayMenu":"always","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"}} /-->
 			<!-- wp:site-title {"level":0,"style":{"typography":{"writingMode":"vertical-rl"}},"fontSize":"large"} /-->
 		</div>
 		<!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfive/readme.txt b/wp-content/themes/twentytwentyfive/readme.txt
index afdaaf7a59..a2752b284c 100644
--- a/wp-content/themes/twentytwentyfive/readme.txt
+++ b/wp-content/themes/twentytwentyfive/readme.txt
@@ -125,11 +125,6 @@ Free public domain CC0 image.
 image-from-rawpixel-id-2211732.webp
 https://www.rawpixel.com/image/2211732

-Woman walking into the woods.
-Free public domain CC0 image.
-avatar.webp
-https://www.rawpixel.com/image/5918459
-
 Botany flowers.
 Free public domain CC0 image.
 botany-flowers.webp
@@ -156,11 +151,6 @@ man-in-hat.webp
 Free public domain CC0 image.
 https://www.slam.org/collection/objects/62642/

-Corner view showing mostly left wall, Church, Acoma Pueblo.
-Free public domain CC0 image.
-image-from-rawpixel-id-8803077-original.webp
-https://www.rawpixel.com/image/8803077
-
 African Woman by Pascal Sébah and Jean Pascal Sébah
 Free public domain CC0 image.
 agenda-img-4.webp
diff --git a/wp-content/themes/twentytwentyfive/style.css b/wp-content/themes/twentytwentyfive/style.css
index 678d996391..8691748eb2 100644
--- a/wp-content/themes/twentytwentyfive/style.css
+++ b/wp-content/themes/twentytwentyfive/style.css
@@ -30,9 +30,17 @@ a {
 }

 /*
- * Progresive enhancement to reduce widows and orphans
+ * Progressive enhancement to reduce widows and orphans
  * https://github.com/WordPress/gutenberg/issues/55190
  */
 h1, h2, h3, h4, h5, h6, blockquote, caption, figcaption, p {
 	text-wrap: pretty;
 }
+
+/*
+ * Change the position of the more block on the front, by making it a block level element.
+ * https://github.com/WordPress/gutenberg/issues/65934
+*/
+.more-link {
+	display: block;
+}
diff --git a/wp-content/themes/twentytwentyfive/styles/01-evening.json b/wp-content/themes/twentytwentyfive/styles/01-evening.json
index c4b8208b6a..95e6b8b301 100644
--- a/wp-content/themes/twentytwentyfive/styles/01-evening.json
+++ b/wp-content/themes/twentytwentyfive/styles/01-evening.json
@@ -67,14 +67,6 @@
 					}
 				}
 			},
-			"core/code": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium",
-					"fontStyle": "normal",
-					"fontWeight": "300",
-					"letterSpacing": "0px"
-				}
-			},
 			"core/site-tagline": {
 				"color": {
 					"text": "var:preset|color|accent-4"
diff --git a/wp-content/themes/twentytwentyfive/styles/02-noon.json b/wp-content/themes/twentytwentyfive/styles/02-noon.json
index 013cae9e70..9c5e9b1210 100644
--- a/wp-content/themes/twentytwentyfive/styles/02-noon.json
+++ b/wp-content/themes/twentytwentyfive/styles/02-noon.json
@@ -57,8 +57,8 @@
 				},
 				{
 					"fluid": {
-						"max": "1.3rem",
-						"min": "1.2rem"
+						"max": "1.2rem",
+						"min": "1rem"
 					},
 					"name": "Medium",
 					"size": "1rem",
@@ -66,29 +66,29 @@
 				},
 				{
 					"fluid": {
-						"max": "1.6rem",
-						"min": "1.3rem"
+						"max": "1.8rem",
+						"min": "1.6rem"
 					},
 					"name": "Large",
-					"size": "1.38rem",
+					"size": "1.6rem",
 					"slug": "large"
 				},
 				{
 					"fluid": {
-						"max": "2rem",
-						"min": "1.75rem"
+						"max": "2.2rem",
+						"min": "1.8em"
 					},
 					"name": "Extra Large",
-					"size": "1.75rem",
+					"size": "1.8rem",
 					"slug": "x-large"
 				},
 				{
 					"fluid": {
-						"max": "3.625rem",
-						"min": "2.625rem"
+						"max": "2.8rem",
+						"min": "2rem"
 					},
 					"name": "Extra Extra Large",
-					"size": "2.625rem",
+					"size": "2rem",
 					"slug": "xx-large"
 				}
 			]
@@ -101,10 +101,8 @@
 		"typography": {
 			"fontFamily": "var:preset|font-family|literata",
 			"fontSize": "var:preset|font-size|medium",
-			"fontStyle": "normal",
-			"fontWeight": "300",
-			"letterSpacing": "-0.22px",
-			"lineHeight": "1.5"
+			"letterSpacing": "-0.01em",
+			"lineHeight": "1.6"
 		},
 		"blocks": {
 			"core/button": {
@@ -156,13 +154,6 @@
 					}
 				}
 			},
-			"core/code": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium",
-					"fontStyle": "normal",
-					"fontWeight": "300"
-				}
-			},
 			"core/list": {
 				"typography": {
 					"lineHeight": "1.3"
@@ -173,26 +164,8 @@
 					"fontSize": "var:preset|font-size|medium"
 				}
 			},
-			"core/post-author": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti"
-				}
-			},
-			"core/post-author-name": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti"
-				}
-			},
-			"core/post-date": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti",
-					"fontSize": "var:preset|font-size|medium"
-				}
-			},
 			"core/post-terms": {
 				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti",
-					"fontSize": "var:preset|font-size|medium",
 					"fontWeight": "300"
 				}
 			},
@@ -206,11 +179,6 @@
 							"text": "var:preset|color|accent-3"
 						}
 					}
-				},
-				"typography": {
-					"fontSize": "var:preset|font-size|xx-large",
-					"fontWeight": "500",
-					"letterSpacing": "-1px"
 				}
 			},
 			"core/pullquote": {
@@ -230,6 +198,11 @@
 					"lineHeight": "1"
 				}
 			},
+			"core/quote": {
+				"typography": {
+					"fontSize": "var:preset|font-size|medium"
+				}
+			},
 			"core/query-pagination": {
 				"typography": {
 					"fontWeight": "300"
@@ -247,11 +220,6 @@
 					}
 				}
 			},
-			"core/quote": {
-				"typography": {
-					"fontWeight": "300"
-				}
-			},
 			"core/site-tagline": {
 				"typography": {
 					"fontSize": "var:preset|font-size|small"
@@ -273,11 +241,6 @@
 					"text": "var:preset|color|base"
 				}
 			},
-			"h3": {
-				"typography": {
-					"fontSize": "1.8rem"
-				}
-			},
 			"h4": {
 				"typography": {
 					"fontSize": "var:preset|font-size|large"
@@ -285,7 +248,8 @@
 			},
 			"h5": {
 				"typography": {
-					"fontSize": "var:preset|font-size|medium"
+					"fontSize": "var:preset|font-size|medium",
+					"letterSpacing": "0px"
 				}
 			},
 			"h6": {
@@ -300,7 +264,8 @@
 				"typography": {
 					"fontFamily": "var:preset|font-family|beiruti",
 					"fontWeight": "500",
-					"letterSpacing": "-1px"
+					"letterSpacing": "-0.02em",
+					"lineHeight": "1.02"
 				}
 			},
 			"link": {
diff --git a/wp-content/themes/twentytwentyfive/styles/03-dusk.json b/wp-content/themes/twentytwentyfive/styles/03-dusk.json
index b96757c6f1..a81a37d7cf 100644
--- a/wp-content/themes/twentytwentyfive/styles/03-dusk.json
+++ b/wp-content/themes/twentytwentyfive/styles/03-dusk.json
@@ -57,8 +57,6 @@
 		"typography": {
 			"fontFamily": "var:preset|font-family|fira-code",
 			"fontSize": "var:preset|font-size|medium",
-			"fontStyle": "normal",
-			"fontWeight": "300",
 			"letterSpacing": "-0.18px",
 			"lineHeight": "1.5"
 		},
diff --git a/wp-content/themes/twentytwentyfive/styles/04-afternoon.json b/wp-content/themes/twentytwentyfive/styles/04-afternoon.json
index 8c6bd1ca19..fdf9f2753b 100644
--- a/wp-content/themes/twentytwentyfive/styles/04-afternoon.json
+++ b/wp-content/themes/twentytwentyfive/styles/04-afternoon.json
@@ -75,20 +75,20 @@
 				},
 				{
 					"fluid": {
-						"max": "2rem",
-						"min": "1.75rem"
+						"max": "1.8rem",
+						"min": "1.4rem"
 					},
 					"name": "Extra Large",
-					"size": "1.75rem",
+					"size": "1.4rem",
 					"slug": "x-large"
 				},
 				{
 					"fluid": {
-						"max": "3.625rem",
-						"min": "2.625rem"
+						"max": "2.6rem",
+						"min": "2rem"
 					},
 					"name": "Extra Extra Large",
-					"size": "2.625rem",
+					"size": "2rem",
 					"slug": "xx-large"
 				}
 			]
@@ -97,10 +97,8 @@
 	"styles": {
 		"typography": {
 			"fontFamily": "var:preset|font-family|ysabeau-office",
-			"fontStyle": "normal",
-			"fontWeight": "400",
 			"letterSpacing": "-0.22px",
-			"lineHeight": "1.6"
+			"lineHeight": "1.5"
 		},
 		"blocks": {
 			"core/button": {
@@ -130,50 +128,29 @@
 			},
 			"core/code": {
 				"typography": {
-					"fontSize": "var:preset|font-size|medium",
-					"fontStyle": "normal",
-					"fontWeight": "300",
 					"letterSpacing": "0px"
 				}
 			},
-			"core/list": {
-				"typography": {
-					"lineHeight": "1.3"
-				}
-			},
-			"core/loginout": {
+			"core/heading": {
 				"typography": {
-					"fontSize": "var:preset|font-size|medium"
-				}
-			},
-			"core/post-author": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium"
+					"lineHeight": "1.2"
 				}
 			},
-			"core/post-author-biography": {
+			"core/list": {
 				"typography": {
-					"fontSize": "var:preset|font-size|medium"
+					"lineHeight": "1.3"
 				}
 			},
-			"core/post-author-name": {
+			"core/loginout": {
 				"typography": {
 					"fontSize": "var:preset|font-size|medium"
 				}
 			},
 			"core/post-terms": {
 				"typography": {
-					"fontStyle": "normal",
 					"fontWeight": "400"
 				}
 			},
-			"core/post-title": {
-				"typography": {
-					"fontStyle": "normal",
-					"fontWeight": "500",
-					"letterSpacing": "-0.8px"
-				}
-			},
 			"core/pullquote": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|platypi",
@@ -183,14 +160,13 @@
 			},
 			"core/quote": {
 				"typography": {
-					"fontStyle": "normal",
 					"fontWeight": "300"
 				}
 			},
 			"core/site-title": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|ysabeau-office",
-					"fontSize": "var:preset|font-size|medium",
+					"fontSize": "var:preset|font-size|large",
 					"letterSpacing": "1.44px",
 					"textTransform": "uppercase"
 				}
@@ -203,12 +179,31 @@
 					"fontWeight": "600",
 					"letterSpacing": "1.44px",
 					"textTransform": "uppercase"
+				},
+				":hover": {
+					"color": {
+						"background": "color-mix(in srgb, var(--wp--preset--color--contrast) 85%, black)"
+					}
 				}
 			},
 			"heading": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|platypi"
 				}
+			},
+			"h5": {
+				"typography": {
+					"fontSize": "var:preset|font-size|medium"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontSize": "var:preset|font-size|small",
+					"fontWeight": "400",
+					"fontStyle": "initial",
+					"letterSpacing": "initial",
+					"textTransform": "initial"
+				}
 			}
 		},
 		"variations": {
@@ -230,6 +225,28 @@
 						}
 					}
 				}
+			},
+			"section-4": {
+				"elements": {
+					"button": {
+						":hover": {
+							"color": {
+								"background": "color-mix(in srgb, var(--wp--preset--color--accent-2) 85%, transparent)"
+							}
+						}
+					}
+				}
+			},
+			"section-5": {
+				"elements": {
+					"button": {
+						":hover": {
+							"color": {
+								"background": "color-mix(in srgb, var(--wp--preset--color--base) 90%, transparent)"
+							}
+						}
+					}
+				}
 			}
 		}
 	}
diff --git a/wp-content/themes/twentytwentyfive/styles/05-twilight.json b/wp-content/themes/twentytwentyfive/styles/05-twilight.json
index 4b360864fd..afe0176116 100644
--- a/wp-content/themes/twentytwentyfive/styles/05-twilight.json
+++ b/wp-content/themes/twentytwentyfive/styles/05-twilight.json
@@ -46,13 +46,57 @@
 					"slug": "accent-6"
 				}
 			]
+		},
+		"typography": {
+			"fontSizes": [
+				{
+					"fluid": false,
+					"name": "Small",
+					"size": "0.875rem",
+					"slug": "small"
+				},
+				{
+					"fluid": {
+						"max": "1.125rem",
+						"min": "1rem"
+					},
+					"name": "Medium",
+					"size": "1rem",
+					"slug": "medium"
+				},
+				{
+					"fluid": {
+						"max": "1.375rem",
+						"min": "1.125rem"
+					},
+					"name": "Large",
+					"size": "1.38rem",
+					"slug": "large"
+				},
+				{
+					"fluid": {
+						"max": "2rem",
+						"min": "1.75rem"
+					},
+					"name": "Extra Large",
+					"size": "1.75rem",
+					"slug": "x-large"
+				},
+				{
+					"fluid": {
+						"max": "2.4rem",
+						"min": "2.15rem"
+					},
+					"name": "Extra Extra Large",
+					"size": "2.15rem",
+					"slug": "xx-large"
+				}
+			]
 		}
 	},
 	"styles": {
 		"typography": {
-			"fontWeight": "500",
-			"lineHeight": "1.3",
-			"letterSpacing": "-0.22px"
+			"letterSpacing": "0"
 		},
 		"blocks": {
 			"core/button": {
@@ -69,11 +113,6 @@
 					}
 				}
 			},
-			"core/code": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium"
-				}
-			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var:preset|font-size|large",
@@ -93,29 +132,16 @@
 			},
 			"core/post-terms": {
 				"typography": {
-					"fontStyle": "normal",
-					"fontWeight": "500",
-					"textTransform": "uppercase"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontWeight": "200",
-					"letterSpacing": "-2.32px"
+					"fontWeight": "500"
 				}
 			},
 			"core/pullquote": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|roboto-slab",
-					"fontSize": "var:preset|font-size|x-large",
+					"fontSize": "var:preset|font-size|xx-large",
 					"fontWeight": "200"
 				}
 			},
-			"core/query-title": {
-				"typography": {
-					"fontWeight": "300"
-				}
-			},
 			"core/search": {
 				"typography": {
 					"textTransform": "uppercase"
@@ -128,10 +154,6 @@
 			},
 			"core/site-title": {
 				"typography": {
-					"fontStyle": "normal",
-					"fontWeight": "500",
-					"letterSpacing": "-0.28px",
-					"lineHeight": "1.3",
 					"textTransform": "uppercase"
 				}
 			}
@@ -152,28 +174,10 @@
 					"textTransform": "uppercase"
 				}
 			},
-			"h4": {
-				"typography": {
-					"fontWeight": "300",
-					"letterSpacing": "-0.5px"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontWeight": "400",
-					"letterSpacing": "0px"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontWeight": "400",
-					"letterSpacing": "1px"
-				}
-			},
 			"heading": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|roboto-slab",
-					"fontWeight": "200",
+					"fontWeight": "300",
 					"letterSpacing": "-0.5px",
 					"lineHeight": "1.2"
 				}
diff --git a/wp-content/themes/twentytwentyfive/styles/06-morning.json b/wp-content/themes/twentytwentyfive/styles/06-morning.json
index 038dcc3c32..62e0c23ce4 100644
--- a/wp-content/themes/twentytwentyfive/styles/06-morning.json
+++ b/wp-content/themes/twentytwentyfive/styles/06-morning.json
@@ -46,6 +46,52 @@
 					"slug": "accent-6"
 				}
 			]
+		},
+		"typography": {
+			"fontSizes": [
+				{
+					"fluid": false,
+					"name": "Small",
+					"size": "0.875rem",
+					"slug": "small"
+				},
+				{
+					"fluid": {
+						"max": "1.125rem",
+						"min": "1rem"
+					},
+					"name": "Medium",
+					"size": "1rem",
+					"slug": "medium"
+				},
+				{
+					"fluid": {
+						"max": "1.375rem",
+						"min": "1.125rem"
+					},
+					"name": "Large",
+					"size": "1.38rem",
+					"slug": "large"
+				},
+				{
+					"fluid": {
+						"max": "2rem",
+						"min": "1.75rem"
+					},
+					"name": "Extra Large",
+					"size": "1.75rem",
+					"slug": "x-large"
+				},
+				{
+					"fluid": {
+						"max": "2.6rem",
+						"min": "1.4rem"
+					},
+					"name": "Extra Extra Large",
+					"size": "2.6rem",
+					"slug": "xx-large"
+				}
+			]
 		}
 	},
 	"styles": {
@@ -54,10 +100,7 @@
 		},
 		"typography": {
 			"fontFamily": "var:preset|font-family|ysabeau-office",
-			"fontSize": "1.5rem",
-			"fontWeight": "400",
-			"letterSpacing": "-0.24px",
-			"lineHeight": "1.4"
+			"letterSpacing": "-0.24px"
 		},
 		"blocks": {
 			"core/code": {
@@ -81,36 +124,6 @@
 				}
 			},
 			"core/post-author-name": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium"
-				},
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
-				"elements": {
-					"link": {
-						"color": {
-							"text": "var:preset|color|contrast"
-						},
-						"typography": {
-							"textDecoration": "underline"
-						},
-						":hover": {
-							"typography": {
-								"textDecoration": "none"
-							}
-						}
-					}
-				}
-			},
-			"core/post-terms": {
-				"typography": {
-					"fontWeight": "400",
-					"fontSize": "var:preset|font-size|medium"
-				},
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
 				"elements": {
 					"link": {
 						"color": {
@@ -145,7 +158,7 @@
 					"text": "var:preset|color|contrast"
 				},
 				"typography": {
-					"fontSize": "var:preset|font-size|x-large"
+					"fontSize": "var:preset|font-size|xx-large"
 				},
 				"elements": {
 					"cite": {
@@ -160,19 +173,10 @@
 				}
 			},
 			"core/quote": {
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
-				"typography": {
-					"fontSize": "1.5rem",
-					"fontWeight": "500",
-					"letterSpacing": "-0.18px"
-				},
 				"elements": {
 					"cite": {
 						"typography": {
 							"fontSize": "var:preset|font-size|medium",
-							"fontWeight": "300",
 							"letterSpacing": "-0.14px"
 						},
 						"color": {
@@ -198,7 +202,7 @@
 			"button": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
-					"fontSize": "1.375rem",
+					"fontSize": "var:preset|font-size|medium",
 					"fontWeight": "900",
 					"letterSpacing": "-0.36px"
 				},
@@ -222,7 +226,19 @@
 				},
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
-					"fontWeight": "900"
+					"fontWeight": "900",
+					"lineHeight": "1.2"
+				}
+			},
+			"h5": {
+				"typography": {
+					"letterSpacing": "0px"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontWeight": "900",
+					"letterSpacing": "0px"
 				}
 			},
 			"link": {
@@ -303,9 +319,10 @@
 						},
 						":hover": {
 							"color": {
-								"background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)"
+								"background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)",
+								"text": "var:preset|color|contrast"
+							}
 						}
-					}
 					},
 					"link": {
 						"color": {
diff --git a/wp-content/themes/twentytwentyfive/styles/07-sunrise.json b/wp-content/themes/twentytwentyfive/styles/07-sunrise.json
index f6dbb1f980..19a74bf600 100644
--- a/wp-content/themes/twentytwentyfive/styles/07-sunrise.json
+++ b/wp-content/themes/twentytwentyfive/styles/07-sunrise.json
@@ -143,7 +143,6 @@
 					"cite": {
 						"typography": {
 							"fontFamily": "var:preset|font-family|literata",
-							"fontSize": "var:preset|font-size|small",
 							"fontWeight": "400",
 							"letterSpacing": "-0.14px"
 						},
@@ -168,8 +167,6 @@
 				"elements": {
 					"cite": {
 						"typography": {
-							"fontSize": "var:preset|font-size|small",
-							"fontWeight": "300",
 							"letterSpacing": "-0.14px"
 						},
 						"color": {
diff --git a/wp-content/themes/twentytwentyfive/styles/08-midnight.json b/wp-content/themes/twentytwentyfive/styles/08-midnight.json
index 896de397e6..9409a23a64 100644
--- a/wp-content/themes/twentytwentyfive/styles/08-midnight.json
+++ b/wp-content/themes/twentytwentyfive/styles/08-midnight.json
@@ -26,7 +26,7 @@
 					"slug": "contrast"
 				},
 				{
-					"color": "#4433A6",
+					"color": "#5644BC",
 					"name": "Accent 1",
 					"slug": "accent-1"
 				},
@@ -62,12 +62,12 @@
 				{
 					"fluid": false,
 					"name": "Small",
-					"size": "0.875rem",
+					"size": "0.9rem",
 					"slug": "small"
 				},
 				{
 					"fluid": {
-						"max": "1.1rem",
+						"max": "1.2rem",
 						"min": "0.9rem"
 					},
 					"name": "Medium",
@@ -76,29 +76,29 @@
 				},
 				{
 					"fluid": {
-						"max": "1.2rem",
-						"min": "1.09rem"
+						"max": "1.8rem",
+						"min": "1.2rem"
 					},
 					"name": "Large",
-					"size": "1.38rem",
+					"size": "1.2rem",
 					"slug": "large"
 				},
 				{
 					"fluid": {
-						"max": "2rem",
-						"min": "1.75rem"
+						"max": "2.2rem",
+						"min": "1.8rem"
 					},
 					"name": "Extra Large",
-					"size": "1.75rem",
+					"size": "1.8rem",
 					"slug": "x-large"
 				},
 				{
 					"fluid": {
-						"max": "3.625rem",
-						"min": "2.625rem"
+						"max": "2.8rem",
+						"min": "2rem"
 					},
 					"name": "Extra Extra Large",
-					"size": "2.625rem",
+					"size": "2rem",
 					"slug": "xx-large"
 				}
 			]
@@ -106,11 +106,10 @@
 	},
 	"styles": {
 		"typography": {
+			"fontSize": "var:preset|font-size|medium",
 			"fontFamily": "var:preset|font-family|fira-sans",
-			"fontStyle": "normal",
-			"fontWeight": "300",
-			"letterSpacing": "-0.24px",
-			"lineHeight": "1.4"
+			"letterSpacing": "-0.01em",
+			"lineHeight": "1.5"
 		},
 		"blocks": {
 			"core/avatar": {
@@ -133,10 +132,6 @@
 				}
 			},
 			"core/code": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium",
-					"fontWeight": "300"
-				},
 				"color": {
 					"background": "var:preset|color|accent-2",
 					"text": "var:preset|color|contrast"
@@ -152,16 +147,6 @@
 					"duotone": "var:preset|duotone|midnight-filter"
 				}
 			},
-			"core/post-author": {
-				"typography": {
-					"fontSize": "var:preset|font-size|small"
-				}
-			},
-			"core/post-author-name": {
-				"typography": {
-					"fontSize": "var:preset|font-size|small"
-				}
-			},
 			"core/post-date": {
 				"color": {
 					"text": "var:preset|color|contrast"
@@ -179,16 +164,9 @@
 					"duotone": "var:preset|duotone|midnight-filter"
 				}
 			},
-			"core/post-terms": {
-				"typography": {
-					"fontWeight": "400",
-					"textTransform": "uppercase"
-				}
-			},
 			"core/post-title": {
 				"typography": {
-					"fontWeight": "200",
-					"letterSpacing": "-2.72px"
+					"fontWeight": "200"
 				}
 			},
 			"core/pullquote": {
@@ -213,8 +191,7 @@
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
 					"fontWeight": "200",
-					"letterSpacing": "0em",
-					"lineHeight": "1.1"
+					"letterSpacing": "0em"
 				}
 			},
 			"core/query-pagination": {
@@ -225,7 +202,9 @@
 			},
 			"core/quote": {
 				"typography": {
-					"fontStyle": "normal",
+					"fontSize": "var:preset|font-size|medium",
+					"letterSpacing": "-0.01em",
+					"lineHeight": "1.5",
 					"fontWeight": "300"
 				}
 			},
@@ -268,9 +247,9 @@
 				},
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
-					"fontStyle": "normal",
-					"fontWeight": "600",
-					"letterSpacing": "-0.96px",
+					"fontSize": "var:preset|font-size|medium",
+					"fontWeight": "400",
+					"letterSpacing": "-0.01em",
 					"textTransform": "uppercase"
 				},
 				":hover": {
@@ -283,7 +262,13 @@
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
 					"fontWeight": "200",
-					"letterSpacing": "-0.02em"
+					"letterSpacing": "-0.02em",
+					"lineHeight": "1.24"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontWeight": "200"
 				}
 			}
 		},
diff --git a/wp-content/themes/twentytwentyfive/styles/blocks/post-terms-1.json b/wp-content/themes/twentytwentyfive/styles/blocks/post-terms-1.json
index 83cbe02e65..e160cdd129 100644
--- a/wp-content/themes/twentytwentyfive/styles/blocks/post-terms-1.json
+++ b/wp-content/themes/twentytwentyfive/styles/blocks/post-terms-1.json
@@ -22,7 +22,8 @@
 					}
 				},
 				"typography": {
-					"fontWeight": "400"
+					"fontWeight": "400",
+					"lineHeight": "2.8"
 				}
 			}
 		}
diff --git a/wp-content/themes/twentytwentyfive/styles/colors/04-afternoon.json b/wp-content/themes/twentytwentyfive/styles/colors/04-afternoon.json
index 9c6efaf3f2..2a5321a649 100644
--- a/wp-content/themes/twentytwentyfive/styles/colors/04-afternoon.json
+++ b/wp-content/themes/twentytwentyfive/styles/colors/04-afternoon.json
@@ -49,6 +49,15 @@
 		}
 	},
 	"styles": {
+		"elements": {
+			"button": {
+				":hover": {
+					"color": {
+						"background": "color-mix(in srgb, var(--wp--preset--color--contrast) 85%, black)"
+					}
+				}
+			}
+		},
 		"variations": {
 			"section-2": {
 				"color": {
@@ -68,6 +77,28 @@
 						}
 					}
 				}
+			},
+			"section-4": {
+				"elements": {
+					"button": {
+						":hover": {
+							"color": {
+								"background": "color-mix(in srgb, var(--wp--preset--color--accent-2) 85%, transparent)"
+							}
+						}
+					}
+				}
+			},
+			"section-5": {
+				"elements": {
+					"button": {
+						":hover": {
+							"color": {
+								"background": "color-mix(in srgb, var(--wp--preset--color--base) 90%, transparent)"
+							}
+						}
+					}
+				}
 			}
 		}
 	}
diff --git a/wp-content/themes/twentytwentyfive/styles/colors/06-morning.json b/wp-content/themes/twentytwentyfive/styles/colors/06-morning.json
index 4c8c0be8ea..491ce00646 100644
--- a/wp-content/themes/twentytwentyfive/styles/colors/06-morning.json
+++ b/wp-content/themes/twentytwentyfive/styles/colors/06-morning.json
@@ -69,21 +69,6 @@
 				}
 			},
 			"core/post-author-name": {
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
-				"elements": {
-					"link": {
-						"color": {
-							"text": "var:preset|color|contrast"
-						}
-					}
-				}
-			},
-			"core/post-terms": {
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
 				"elements": {
 					"link": {
 						"color": {
@@ -114,9 +99,6 @@
 				}
 			},
 			"core/quote": {
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
 				"elements": {
 					"cite": {
 						"color": {
diff --git a/wp-content/themes/twentytwentyfive/styles/colors/08-midnight.json b/wp-content/themes/twentytwentyfive/styles/colors/08-midnight.json
index 50facae8ea..efac06c71c 100644
--- a/wp-content/themes/twentytwentyfive/styles/colors/08-midnight.json
+++ b/wp-content/themes/twentytwentyfive/styles/colors/08-midnight.json
@@ -16,7 +16,7 @@
 					"slug": "contrast"
 				},
 				{
-					"color": "#4433A6",
+					"color": "#5644BC",
 					"name": "Accent 1",
 					"slug": "accent-1"
 				},
diff --git a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-1.json b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-1.json
index 9ad5035d05..98f53eab6f 100644
--- a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-1.json
+++ b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-1.json
@@ -14,8 +14,8 @@
 				},
 				{
 					"fluid": {
-						"max": "1.3rem",
-						"min": "1.2rem"
+						"max": "1.2rem",
+						"min": "1rem"
 					},
 					"name": "Medium",
 					"size": "1rem",
@@ -23,29 +23,29 @@
 				},
 				{
 					"fluid": {
-						"max": "1.6rem",
-						"min": "1.3rem"
+						"max": "1.8rem",
+						"min": "1.6rem"
 					},
 					"name": "Large",
-					"size": "1.38rem",
+					"size": "1.6rem",
 					"slug": "large"
 				},
 				{
 					"fluid": {
-						"max": "2rem",
-						"min": "1.75rem"
+						"max": "2.2rem",
+						"min": "1.8em"
 					},
 					"name": "Extra Large",
-					"size": "1.75rem",
+					"size": "1.8rem",
 					"slug": "x-large"
 				},
 				{
 					"fluid": {
-						"max": "3.625rem",
-						"min": "2.625rem"
+						"max": "2.8rem",
+						"min": "2rem"
 					},
 					"name": "Extra Extra Large",
-					"size": "2.625rem",
+					"size": "2rem",
 					"slug": "xx-large"
 				}
 			]
@@ -55,10 +55,8 @@
 		"typography": {
 			"fontFamily": "var:preset|font-family|literata",
 			"fontSize": "var:preset|font-size|medium",
-			"fontStyle": "normal",
-			"fontWeight": "300",
-			"letterSpacing": "-0.22px",
-			"lineHeight": "1.5"
+			"letterSpacing": "-0.01em",
+			"lineHeight": "1.6"
 		},
 		"blocks": {
 			"core/button": {
@@ -66,13 +64,6 @@
 					"fontFamily": "var:preset|font-family|beiruti"
 				}
 			},
-			"core/code": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium",
-					"fontStyle": "normal",
-					"fontWeight": "300"
-				}
-			},
 			"core/list": {
 				"typography": {
 					"lineHeight": "1.3"
@@ -83,36 +74,11 @@
 					"fontSize": "var:preset|font-size|medium"
 				}
 			},
-			"core/post-author": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti"
-				}
-			},
-			"core/post-author-name": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti"
-				}
-			},
-			"core/post-date": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti",
-					"fontSize": "var:preset|font-size|medium"
-				}
-			},
 			"core/post-terms": {
 				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti",
-					"fontSize": "var:preset|font-size|medium",
 					"fontWeight": "300"
 				}
 			},
-			"core/post-title": {
-				"typography": {
-					"fontSize": "var:preset|font-size|xx-large",
-					"fontWeight": "500",
-					"letterSpacing": "-1px"
-				}
-			},
 			"core/pullquote": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|beiruti",
@@ -120,12 +86,12 @@
 					"lineHeight": "1"
 				}
 			},
-			"core/query-pagination": {
+			"core/quote": {
 				"typography": {
-					"fontWeight": "300"
+					"fontSize": "var:preset|font-size|medium"
 				}
 			},
-			"core/quote": {
+			"core/query-pagination": {
 				"typography": {
 					"fontWeight": "300"
 				}
@@ -145,11 +111,6 @@
 			}
 		},
 		"elements": {
-			"h3": {
-				"typography": {
-					"fontSize": "1.8rem"
-				}
-			},
 			"h4": {
 				"typography": {
 					"fontSize": "var:preset|font-size|large"
@@ -157,7 +118,8 @@
 			},
 			"h5": {
 				"typography": {
-					"fontSize": "var:preset|font-size|medium"
+					"fontSize": "var:preset|font-size|medium",
+					"letterSpacing": "0px"
 				}
 			},
 			"h6": {
@@ -169,7 +131,8 @@
 				"typography": {
 					"fontFamily": "var:preset|font-family|beiruti",
 					"fontWeight": "500",
-					"letterSpacing": "-1px"
+					"letterSpacing": "-0.02em",
+					"lineHeight": "1.02"
 				}
 			}
 		}
diff --git a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-2.json b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-2.json
index 1371b369a6..6fa706c069 100644
--- a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-2.json
+++ b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-2.json
@@ -7,8 +7,6 @@
 		"typography": {
 			"fontFamily": "var:preset|font-family|fira-code",
 			"fontSize": "var:preset|font-size|medium",
-			"fontStyle": "normal",
-			"fontWeight": "300",
 			"letterSpacing": "-0.18px",
 			"lineHeight": "1.5"
 		},
diff --git a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-3.json b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-3.json
index 09a485dd3a..e4c051c8e3 100644
--- a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-3.json
+++ b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-3.json
@@ -54,7 +54,6 @@
 	"styles": {
 		"typography": {
 			"fontFamily": "var:preset|font-family|ysabeau-office",
-			"fontStyle": "normal",
 			"fontWeight": "400",
 			"letterSpacing": "-0.22px",
 			"lineHeight": "1.6"
@@ -62,9 +61,6 @@
 		"blocks":{
 			"core/code": {
 				"typography": {
-					"fontSize": "var:preset|font-size|medium",
-					"fontStyle": "normal",
-					"fontWeight": "300",
 					"letterSpacing": "0px"
 				}
 			},
@@ -95,13 +91,11 @@
 			},
 			"core/post-terms": {
 				"typography": {
-					"fontStyle": "normal",
 					"fontWeight": "400"
 				}
 			},
 			"core/post-title": {
 				"typography": {
-					"fontStyle": "normal",
 					"fontWeight": "500",
 					"letterSpacing": "-0.8px"
 				}
@@ -115,7 +109,6 @@
 			},
 			"core/quote": {
 				"typography": {
-					"fontStyle": "normal",
 					"fontWeight": "300"
 				}
 			},
diff --git a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-4.json b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-4.json
index cf17ea1a76..f5d0bab1b1 100644
--- a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-4.json
+++ b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-4.json
@@ -3,18 +3,59 @@
 	"$schema": "https://schemas.wp.org/trunk/theme.json",
 	"title": "Roboto Slab & Manrope",
 	"slug": "typography-preset-4",
+	"settings": {
+		"typography": {
+			"fontSizes": [
+				{
+					"fluid": false,
+					"name": "Small",
+					"size": "0.875rem",
+					"slug": "small"
+				},
+				{
+					"fluid": {
+						"max": "1.125rem",
+						"min": "1rem"
+					},
+					"name": "Medium",
+					"size": "1rem",
+					"slug": "medium"
+				},
+				{
+					"fluid": {
+						"max": "1.375rem",
+						"min": "1.125rem"
+					},
+					"name": "Large",
+					"size": "1.38rem",
+					"slug": "large"
+				},
+				{
+					"fluid": {
+						"max": "2rem",
+						"min": "1.75rem"
+					},
+					"name": "Extra Large",
+					"size": "1.75rem",
+					"slug": "x-large"
+				},
+				{
+					"fluid": {
+						"max": "2.4rem",
+						"min": "2.15rem"
+					},
+					"name": "Extra Extra Large",
+					"size": "2.15rem",
+					"slug": "xx-large"
+				}
+			]
+		}
+	},
 	"styles": {
 		"typography": {
-			"fontWeight": "500",
-			"lineHeight": "1.3",
-			"letterSpacing": "-0.22px"
+			"letterSpacing": "0"
 		},
 		"blocks": {
-			"core/code": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium"
-				}
-			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var:preset|font-size|large",
@@ -34,29 +75,16 @@
 			},
 			"core/post-terms": {
 				"typography": {
-					"fontStyle": "normal",
-					"fontWeight": "500",
-					"textTransform": "uppercase"
-				}
-			},
-			"core/post-title": {
-				"typography": {
-					"fontWeight": "200",
-					"letterSpacing": "-2.32px"
+					"fontWeight": "500"
 				}
 			},
 			"core/pullquote": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|roboto-slab",
-					"fontSize": "var:preset|font-size|x-large",
+					"fontSize": "var:preset|font-size|xx-large",
 					"fontWeight": "200"
 				}
 			},
-			"core/query-title": {
-				"typography": {
-					"fontWeight": "300"
-				}
-			},
 			"core/search": {
 				"typography": {
 					"textTransform": "uppercase"
@@ -69,10 +97,6 @@
 			},
 			"core/site-title": {
 				"typography": {
-					"fontStyle": "normal",
-					"fontWeight": "500",
-					"letterSpacing": "-0.28px",
-					"lineHeight": "1.3",
 					"textTransform": "uppercase"
 				}
 			}
@@ -85,28 +109,10 @@
 					"textTransform": "uppercase"
 				}
 			},
-			"h4": {
-				"typography": {
-					"fontWeight": "300",
-					"letterSpacing": "-0.5px"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontWeight": "400",
-					"letterSpacing": "0px"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontWeight": "400",
-					"letterSpacing": "1px"
-				}
-			},
 			"heading": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|roboto-slab",
-					"fontWeight": "200",
+					"fontWeight": "300",
 					"letterSpacing": "-0.5px",
 					"lineHeight": "1.2"
 				}
diff --git a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-5.json b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-5.json
index 920fd43f93..95c6083945 100644
--- a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-5.json
+++ b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-5.json
@@ -3,13 +3,58 @@
 	"$schema": "https://schemas.wp.org/trunk/theme.json",
 	"title": "Literata & Ysabeau Office",
 	"slug": "typography-preset-5",
+	"settings": {
+		"typography": {
+			"fontSizes": [
+				{
+					"fluid": false,
+					"name": "Small",
+					"size": "0.875rem",
+					"slug": "small"
+				},
+				{
+					"fluid": {
+						"max": "1.125rem",
+						"min": "1rem"
+					},
+					"name": "Medium",
+					"size": "1rem",
+					"slug": "medium"
+				},
+				{
+					"fluid": {
+						"max": "1.375rem",
+						"min": "1.125rem"
+					},
+					"name": "Large",
+					"size": "1.38rem",
+					"slug": "large"
+				},
+				{
+					"fluid": {
+						"max": "2rem",
+						"min": "1.75rem"
+					},
+					"name": "Extra Large",
+					"size": "1.75rem",
+					"slug": "x-large"
+				},
+				{
+					"fluid": {
+						"max": "2.6rem",
+						"min": "1.4rem"
+					},
+					"name": "Extra Extra Large",
+					"size": "2.6rem",
+					"slug": "xx-large"
+				}
+			]
+		}
+	},
 	"styles": {
 		"typography": {
 			"fontFamily": "var:preset|font-family|ysabeau-office",
-			"fontSize": "1.5rem",
-			"fontWeight": "400",
-			"letterSpacing": "-0.24px",
-			"lineHeight": "1.4"
+			"letterSpacing": "-0.24px"
 		},
 		"blocks": {
 			"core/navigation": {
@@ -18,27 +63,6 @@
 				}
 			},
 			"core/post-author-name": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium"
-				},
-				"elements": {
-					"link": {
-						"typography": {
-							"textDecoration": "underline"
-						},
-						":hover": {
-							"typography": {
-								"textDecoration": "none"
-							}
-						}
-					}
-				}
-			},
-			"core/post-terms": {
-				"typography": {
-					"fontWeight": "400",
-					"fontSize": "var:preset|font-size|medium"
-				},
 				"elements": {
 					"link": {
 						"typography": {
@@ -60,7 +84,7 @@
 			},
 			"core/pullquote": {
 				"typography": {
-					"fontSize": "var:preset|font-size|x-large"
+					"fontSize": "var:preset|font-size|xx-large"
 				},
 				"elements": {
 					"cite": {
@@ -72,16 +96,10 @@
 				}
 			},
 			"core/quote": {
-				"typography": {
-					"fontSize": "1.5rem",
-					"fontWeight": "500",
-					"letterSpacing": "-0.18px"
-				},
 				"elements": {
 					"cite": {
 						"typography": {
 							"fontSize": "var:preset|font-size|medium",
-							"fontWeight": "300",
 							"letterSpacing": "-0.14px"
 						}
 					}
@@ -104,7 +122,7 @@
 			"button": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
-					"fontSize": "1.375rem",
+					"fontSize": "var:preset|font-size|medium",
 					"fontWeight": "900",
 					"letterSpacing": "-0.36px"
 				}
@@ -112,7 +130,19 @@
 			"heading": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
-					"fontWeight": "900"
+					"fontWeight": "900",
+					"lineHeight": "1.2"
+				}
+			},
+			"h5": {
+				"typography": {
+					"letterSpacing": "0px"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontWeight": "900",
+					"letterSpacing": "0px"
 				}
 			}
 		},
diff --git a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-6.json b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-6.json
index b136327163..78cbc74a5e 100644
--- a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-6.json
+++ b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-6.json
@@ -67,7 +67,6 @@
 					"cite": {
 						"typography": {
 							"fontFamily": "var:preset|font-family|literata",
-							"fontSize": "var:preset|font-size|small",
 							"fontWeight": "400",
 							"letterSpacing": "-0.14px"
 						}
@@ -83,8 +82,6 @@
 				"elements": {
 					"cite": {
 						"typography": {
-							"fontSize": "var:preset|font-size|small",
-							"fontWeight": "300",
 							"letterSpacing": "-0.14px"
 						}
 					}
diff --git a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-7.json b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-7.json
index 473a0deb61..7328521420 100644
--- a/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-7.json
+++ b/wp-content/themes/twentytwentyfive/styles/typography/typography-preset-7.json
@@ -9,12 +9,12 @@
 				{
 					"fluid": false,
 					"name": "Small",
-					"size": "0.875rem",
+					"size": "0.9rem",
 					"slug": "small"
 				},
 				{
 					"fluid": {
-						"max": "1.1rem",
+						"max": "1.2rem",
 						"min": "0.9rem"
 					},
 					"name": "Medium",
@@ -23,29 +23,29 @@
 				},
 				{
 					"fluid": {
-						"max": "1.2rem",
-						"min": "1.09rem"
+						"max": "1.8rem",
+						"min": "1.2rem"
 					},
 					"name": "Large",
-					"size": "1.38rem",
+					"size": "1.2rem",
 					"slug": "large"
 				},
 				{
 					"fluid": {
-						"max": "2rem",
-						"min": "1.75rem"
+						"max": "2.2rem",
+						"min": "1.8rem"
 					},
 					"name": "Extra Large",
-					"size": "1.75rem",
+					"size": "1.8rem",
 					"slug": "x-large"
 				},
 				{
 					"fluid": {
-						"max": "3.625rem",
-						"min": "2.625rem"
+						"max": "2.8rem",
+						"min": "2rem"
 					},
 					"name": "Extra Extra Large",
-					"size": "2.625rem",
+					"size": "2rem",
 					"slug": "xx-large"
 				}
 			]
@@ -53,47 +53,22 @@
 	},
 	"styles": {
 		"typography": {
+			"fontSize": "var:preset|font-size|medium",
 			"fontFamily": "var:preset|font-family|fira-sans",
-			"fontStyle": "normal",
-			"fontWeight": "300",
-			"letterSpacing": "-0.24px",
-			"lineHeight": "1.4"
+			"letterSpacing": "-0.01em",
+			"lineHeight": "1.5"
 		},
 		"blocks": {
-			"core/code": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium",
-					"fontWeight": "300"
-				}
-			},
-			"core/post-author": {
-				"typography": {
-					"fontSize": "var:preset|font-size|small"
-				}
-			},
-			"core/post-author-name": {
-				"typography": {
-					"fontSize": "var:preset|font-size|small"
-				}
-			},
-			"core/post-terms": {
-				"typography": {
-					"fontWeight": "400",
-					"textTransform": "uppercase"
-				}
-			},
 			"core/post-title": {
 				"typography": {
-					"fontWeight": "200",
-					"letterSpacing": "-2.72px"
+					"fontWeight": "200"
 				}
 			},
 			"core/pullquote": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
 					"fontWeight": "200",
-					"letterSpacing": "0em",
-					"lineHeight": "1.1"
+					"letterSpacing": "0em"
 				}
 			},
 			"core/query-pagination": {
@@ -104,7 +79,9 @@
 			},
 			"core/quote": {
 				"typography": {
-					"fontStyle": "normal",
+					"fontSize": "var:preset|font-size|medium",
+					"letterSpacing": "-0.01em",
+					"lineHeight": "1.5",
 					"fontWeight": "300"
 				}
 			},
@@ -122,8 +99,7 @@
 			"button": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
-					"fontWeight": "600",
-					"letterSpacing": "-0.96px",
+					"fontWeight": "400",
 					"textTransform": "uppercase"
 				}
 			},
@@ -131,7 +107,13 @@
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
 					"fontWeight": "200",
-					"letterSpacing": "-0.02em"
+					"letterSpacing": "-0.02em",
+					"lineHeight": "1.24"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontWeight": "200"
 				}
 			}
 		}
diff --git a/wp-content/themes/twentytwentyfive/theme.json b/wp-content/themes/twentytwentyfive/theme.json
index e5d2808089..74bf527aa9 100644
--- a/wp-content/themes/twentytwentyfive/theme.json
+++ b/wp-content/themes/twentytwentyfive/theme.json
@@ -44,7 +44,7 @@
 					"slug": "accent-5"
 				},
 				{
-					"color": "color-mix(in srgb, currentColor 20%, transparent);",
+					"color": "color-mix(in srgb, currentColor 20%, transparent)",
 					"name": "Accent 6",
 					"slug": "accent-6"
 				}
@@ -74,22 +74,22 @@
 				},
 				{
 					"name": "Regular",
-					"size": "clamp(30px, 5vw, 50px);",
+					"size": "clamp(30px, 5vw, 50px)",
 					"slug": "50"
 				},
 				{
 					"name": "Large",
-					"size": "clamp(30px, 7vw, 70px);",
+					"size": "clamp(30px, 7vw, 70px)",
 					"slug": "60"
 				},
 				{
 					"name": "X-Large",
-					"size": "clamp(50px, 7vw, 90px);",
+					"size": "clamp(50px, 7vw, 90px)",
 					"slug": "70"
 				},
 				{
 					"name": "XX-Large",
-					"size": "clamp(70px, 10vw, 140px);",
+					"size": "clamp(70px, 10vw, 140px)",
 					"slug": "80"
 				}
 			],
@@ -945,7 +945,6 @@
 		"typography": {
 			"fontFamily": "var:preset|font-family|manrope",
 			"fontSize": "var:preset|font-size|large",
-			"fontStyle": "normal",
 			"fontWeight": "300",
 			"letterSpacing": "-0.1px",
 			"lineHeight": "1.4"
@@ -977,10 +976,7 @@
 			},
 			"core/columns": {
 				"spacing": {
-					"blockGap": {
-						"left": "var:preset|spacing|50",
-						"top": "var:preset|spacing|50"
-					}
+					"blockGap": "var:preset|spacing|50"
 				}
 			},
 			"core/buttons": {
@@ -991,8 +987,8 @@
 			"core/code": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|fira-code",
-					"fontSize": "var:preset|font-size|small",
-					"fontWeight": "400"
+					"fontSize": "var:preset|font-size|medium",
+					"fontWeight": "300"
 				},
 				"color": {
 					"background": "var:preset|color|accent-5",
@@ -1027,8 +1023,7 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var:preset|font-size|small",
-					"fontStyle": "normal"
+					"fontSize": "var:preset|font-size|small"
 				},
 				"spacing": {
 					"margin": {
@@ -1168,6 +1163,7 @@
 				}
 			},
 			"core/post-terms": {
+				"css": "& a { white-space: nowrap; }",
 				"typography": {
 					"fontSize": "var:preset|font-size|small",
 					"fontWeight": "600"
@@ -1219,16 +1215,15 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var:preset|font-size|medium",
-					"lineHeight": "1.1",
-					"fontWeight": "600"
+					"fontSize": "var:preset|font-size|large",
+					"fontWeight": "300"
 				},
 				"elements": {
 					"cite": {
 						"typography": {
-							"fontSize": "0.65em",
+							"fontSize": "var:preset|font-size|small",
 							"fontStyle": "normal",
-							"fontWeight": "400"
+							"fontWeight": "300"
 						},
 						"css": "& sub { font-size: 0.65em }"
 					}
@@ -1256,9 +1251,7 @@
 			"core/pullquote": {
 				"typography": {
 					"fontSize": "var:preset|font-size|xx-large",
-					"fontStyle": "normal",
 					"fontWeight": "300",
-					"letterSpacing": "-0.76px",
 					"lineHeight": "1.2"
 				},
 				"elements": {
@@ -1371,7 +1364,7 @@
 				}
 			},
 			"core/list": {
-				"css": "& li{margin-bottom: 0.5rem;}"
+				"css": "& li{margin-top: 0.5rem;}"
 			}
 		},
 		"elements": {
@@ -1449,7 +1442,6 @@
 			},
 			"heading": {
 				"typography": {
-					"fontStyle": "normal",
 					"fontWeight": "400",
 					"lineHeight": "1.125",
 					"letterSpacing": "-0.1px"
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 942e73b0f2..b82d26cfce 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-beta2-59232';
+$wp_version = '6.7-beta2-59233';

 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.