From e34caad13ce31d5896861b595df5dab96f7b5dfb Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Tue, 10 Oct 2023 09:03:25 +0000
Subject: [PATCH] Changes to TT4 for beta 3.

Updates TT4 with additional changes ready for beta 3.

Props jessplease, pbwebd, poena, afercia, luminuu, beafialho, onemaggie, mhkuu,  richtabor,  benoitchantre.

Close #59575.

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


git-svn-id: http://core.svn.wordpress.org/trunk@56325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../assets/css/button-outline.css             |   6 +-
 .../themes/twentytwentyfour/functions.php     |   2 +-
 .../themes/twentytwentyfour/parts/header.html |   2 +-
 .../patterns/centered-statement.php           |   1 +
 .../twentytwentyfour/patterns/clients.php     |  22 +-
 .../twentytwentyfour/patterns/columns.php     |   2 +-
 .../themes/twentytwentyfour/patterns/faq.php  |   9 +-
 .../patterns/footer-portfolio.php             |   3 +
 .../themes/twentytwentyfour/patterns/hero.php |   4 +-
 .../hidden-hidden-intro-text-left.php         |   4 +-
 .../patterns/hidden-no-results-content.php    |   2 +-
 .../patterns/hidden-post-navigation.php       |  14 ++
 .../patterns/page-01-business-home.php        |   2 +-
 .../patterns/page-03-portfolio-overview.php   |   2 +-
 .../patterns/page-04-newsletter-landing.php   |  12 +-
 .../patterns/page-06-writer-home.php          |   2 +-
 .../patterns/page-07-rsvp-landing.php         |   2 +-
 .../patterns/posts-one-column.php             |   8 +-
 .../patterns/posts-three-columns-images.php   |   8 +-
 .../patterns/posts-three-columns.php          |   8 +-
 .../patterns/project-layout.php               |   2 +-
 .../patterns/template-home-portfolio.php      |   6 +
 ...ta.php => text-centered-cta-subscribe.php} |   3 +-
 .../patterns/text-centered-title.php          |  11 +-
 wp-content/themes/twentytwentyfour/readme.txt |  22 +-
 .../twentytwentyfour/styles/fossil.json       | 198 ++++++++++++++++++
 .../themes/twentytwentyfour/styles/ice.json   |  32 ---
 .../themes/twentytwentyfour/styles/milky.json | 103 ---------
 .../themes/twentytwentyfour/styles/rust.json  |  84 ++++++++
 .../templates/single-with-sidebar.html        |  19 +-
 .../twentytwentyfour/templates/single.html    |  22 +-
 wp-content/themes/twentytwentyfour/theme.json |  48 ++---
 wp-includes/version.php                       |   2 +-
 33 files changed, 414 insertions(+), 253 deletions(-)
 create mode 100644 wp-content/themes/twentytwentyfour/patterns/hidden-post-navigation.php
 rename wp-content/themes/twentytwentyfour/patterns/{cta.php => text-centered-cta-subscribe.php} (96%)
 create mode 100644 wp-content/themes/twentytwentyfour/styles/fossil.json
 delete mode 100644 wp-content/themes/twentytwentyfour/styles/milky.json

diff --git a/wp-content/themes/twentytwentyfour/assets/css/button-outline.css b/wp-content/themes/twentytwentyfour/assets/css/button-outline.css
index 92ae175986..26032360fd 100644
--- a/wp-content/themes/twentytwentyfour/assets/css/button-outline.css
+++ b/wp-content/themes/twentytwentyfour/assets/css/button-outline.css
@@ -1,6 +1,6 @@
 .wp-block-button.is-style-outline
-	> .wp-block-button__link:not(.has-background):hover {
-	background-color: var(--wp--preset--color--contrast-2);
+	> .wp-block-button__link:not(.has-text-color, .has-background):hover {
+	background-color: var(--wp--preset--color--contrast-2, var(--wp--preset--color--contrast, transparent));
 	color: var(--wp--preset--color--base);
-	border-color: var(--wp--preset--color--contrast-2);
+	border-color: var(--wp--preset--color--contrast-2, var(--wp--preset--color--contrast, currentColor));
 }
diff --git a/wp-content/themes/twentytwentyfour/functions.php b/wp-content/themes/twentytwentyfour/functions.php
index cffc4dc01d..e569d5b8e9 100644
--- a/wp-content/themes/twentytwentyfour/functions.php
+++ b/wp-content/themes/twentytwentyfour/functions.php
@@ -52,7 +52,7 @@ if ( ! function_exists( 'twentytwentyfour_block_styles' ) ) :
 				.is-style-arrow-icon-details {
 					padding-top: var(--wp--preset--spacing--10);
 					padding-bottom: var(--wp--preset--spacing--10);
-					border-bottom: 1px solid rgba(255, 255, 255, 0.20);
+					border-bottom: 1px solid var(--wp--preset--color--contrast-2, currentColor);
 				}
 
 				.is-style-arrow-icon-details summary {
diff --git a/wp-content/themes/twentytwentyfour/parts/header.html b/wp-content/themes/twentytwentyfour/parts/header.html
index 8c069b4d42..422ad31d7f 100644
--- a/wp-content/themes/twentytwentyfour/parts/header.html
+++ b/wp-content/themes/twentytwentyfour/parts/header.html
@@ -8,6 +8,6 @@
 	<!-- /wp:group --></div>
 	<!-- /wp:group -->
 
-	<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}}} /--></div>
+	<!-- wp:navigation {"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}}} /--></div>
 	<!-- /wp:group --></div>
 	<!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/centered-statement.php b/wp-content/themes/twentytwentyfour/patterns/centered-statement.php
index 1384759f3c..5637bdf14d 100644
--- a/wp-content/themes/twentytwentyfour/patterns/centered-statement.php
+++ b/wp-content/themes/twentytwentyfour/patterns/centered-statement.php
@@ -3,6 +3,7 @@
  * Title: Centered Statement
  * Slug: twentytwentyfour/centered-statement
  * Categories: text, about, featured
+ * Keywords: statement, centered
  * Viewport width: 1400
  */
 ?>
diff --git a/wp-content/themes/twentytwentyfour/patterns/clients.php b/wp-content/themes/twentytwentyfour/patterns/clients.php
index 9d38f3eb69..e24572710b 100644
--- a/wp-content/themes/twentytwentyfour/patterns/clients.php
+++ b/wp-content/themes/twentytwentyfour/patterns/clients.php
@@ -20,27 +20,27 @@
 <div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|30","padding":{"right":"0","left":"0","top":"0","bottom":"0"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"center"}} -->
+<!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"right":"0","left":"0","top":"0","bottom":"0"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"center"}} -->
 <div class="wp-block-group alignwide" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
 
-<!-- wp:image {"width":"150px","aspectRatio":"3/2","scale":"contain","linkDestination":"none"} -->
-<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:3/2;object-fit:contain;width:150px"/></figure>
+<!-- wp:image {"width":"150px","aspectRatio":"4/3","scale":"contain","linkDestination":"none"} -->
+<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:4/3;object-fit:contain;width:150px"/></figure>
 <!-- /wp:image -->
 
-<!-- wp:image {"width":"150px","aspectRatio":"3/2","scale":"contain","linkDestination":"none"} -->
-<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:3/2;object-fit:contain;width:150px"/></figure>
+<!-- wp:image {"width":"150px","aspectRatio":"4/3","scale":"contain","linkDestination":"none"} -->
+<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:4/3;object-fit:contain;width:150px"/></figure>
 <!-- /wp:image -->
 
-<!-- wp:image {"width":"150px","aspectRatio":"3/2","scale":"contain","linkDestination":"none"} -->
-<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:3/2;object-fit:contain;width:150px"/></figure>
+<!-- wp:image {"width":"150px","aspectRatio":"4/3","scale":"contain","linkDestination":"none"} -->
+<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:4/3;object-fit:contain;width:150px"/></figure>
 <!-- /wp:image -->
 
-<!-- wp:image {"width":"150px","aspectRatio":"3/2","scale":"contain","linkDestination":"none"} -->
-<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:3/2;object-fit:contain;width:150px"/></figure>
+<!-- wp:image {"width":"150px","aspectRatio":"4/3","scale":"contain","linkDestination":"none"} -->
+<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:4/3;object-fit:contain;width:150px"/></figure>
 <!-- /wp:image -->
 
-<!-- wp:image {"width":"150px","aspectRatio":"3/2","scale":"contain","linkDestination":"none"} -->
-<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:3/2;object-fit:contain;width:150px"/></figure>
+<!-- wp:image {"width":"150px","aspectRatio":"4/3","scale":"contain","linkDestination":"none"} -->
+<figure class="wp-block-image is-resized"><img alt="" style="aspect-ratio:4/3;object-fit:contain;width:150px"/></figure>
 <!-- /wp:image -->
 
 
diff --git a/wp-content/themes/twentytwentyfour/patterns/columns.php b/wp-content/themes/twentytwentyfour/patterns/columns.php
index ec5d1c1053..913a467dc3 100644
--- a/wp-content/themes/twentytwentyfour/patterns/columns.php
+++ b/wp-content/themes/twentytwentyfour/patterns/columns.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Columns
+ * Title: Three columns of text
  * Slug: twentytwentyfour/columns
  * Categories: text
  * Viewport width: 1500
diff --git a/wp-content/themes/twentytwentyfour/patterns/faq.php b/wp-content/themes/twentytwentyfour/patterns/faq.php
index cd9e35f9ea..3bafe36338 100644
--- a/wp-content/themes/twentytwentyfour/patterns/faq.php
+++ b/wp-content/themes/twentytwentyfour/patterns/faq.php
@@ -2,14 +2,15 @@
 /**
  * Title: Faq
  * Slug: twentytwentyfour/faq
- * Categories: text
+ * Categories: text, about, featured
+ * Keywords: faq, about
  * Viewport width: 1400
  */
 ?>
 
-<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"},"margin":{"top":"0","bottom":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|base-2"}}}},"backgroundColor":"contrast","textColor":"base-2","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-base-2-color has-contrast-background-color has-text-color has-background has-link-color" style="margin-top:0;margin-bottom:0;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:heading {"align":"wide","style":{"elements":{"link":{"color":{"text":"var:preset|color|base-2"}}},"typography":{"fontSize":"10rem","letterSpacing":"-0.02em"}},"textColor":"base-2"} -->
-<h2 class="wp-block-heading alignwide has-base-2-color has-text-color has-link-color" style="font-size:10rem;letter-spacing:-0.02em"><?php echo esc_html_x( 'FAQs', 'Heading of the FAQs', 'twentytwentyfour' ); ?></h2>
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"},"margin":{"top":"0","bottom":"0"}},"elements":{"link":{"color":{"text":"var:preset|color|base"}}}},"backgroundColor":"contrast","textColor":"base","layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull has-base-color has-contrast-background-color has-text-color has-background has-link-color" style="margin-top:0;margin-bottom:0;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:heading {"align":"wide","style":{"elements":{"link":{"color":{"text":"var:preset|color|base"}}},"typography":{"fontSize":"10rem","letterSpacing":"-0.02em"}},"textColor":"base"} -->
+<h2 class="wp-block-heading alignwide has-base-color has-text-color has-link-color" style="font-size:10rem;letter-spacing:-0.02em"><?php echo esc_html_x( 'FAQs', 'Heading of the FAQs', 'twentytwentyfour' ); ?></h2>
 <!-- /wp:heading -->
 
 <!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/footer-portfolio.php b/wp-content/themes/twentytwentyfour/patterns/footer-portfolio.php
index 9e91d20ee9..a92bdce457 100644
--- a/wp-content/themes/twentytwentyfour/patterns/footer-portfolio.php
+++ b/wp-content/themes/twentytwentyfour/patterns/footer-portfolio.php
@@ -75,6 +75,9 @@
 		<div class="wp-block-group">
 			<!-- wp:group {"style":{"spacing":{"blockGap":"6px"}},"layout":{"type":"flex","flexWrap":"wrap"}} -->
 			<div class="wp-block-group">
+				<!-- wp:paragraph {"fontSize":"small"} -->
+				<p class="has-small-font-size"><?php esc_html_e( '&copy;', 'twentytwentyfour' ); ?></p>
+				<!-- /wp:paragraph -->
 				<!-- wp:site-title {"level":0,"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"small"} /-->
 			</div>
 			<!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/hero.php b/wp-content/themes/twentytwentyfour/patterns/hero.php
index ff5b58863f..edd80d841b 100644
--- a/wp-content/themes/twentytwentyfour/patterns/hero.php
+++ b/wp-content/themes/twentytwentyfour/patterns/hero.php
@@ -9,8 +9,8 @@
 
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}}},"layout":{"type":"constrained","contentSize":"","wideSize":""}} -->
 <div class="wp-block-group alignfull" 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":{"spacing":{"blockGap":"0px"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
-<div class="wp-block-group"><!-- wp:heading {"textAlign":"center"} -->
-<h2 class="wp-block-heading has-text-align-center"><?php echo esc_html_x( 'A commitment to innovation and sustainability', 'Heading of the hero section', 'twentytwentyfour' ); ?></h2>
+<div class="wp-block-group"><!-- wp:heading {"textAlign":"center","fontSize":"x-large","level":1} -->
+<h1 class="wp-block-heading has-text-align-center has-x-large-font-size"><?php echo esc_html_x( 'A commitment to innovation and sustainability', 'Heading of the hero section', 'twentytwentyfour' ); ?></h1>
 <!-- /wp:heading -->
 
 <!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"1.25rem","selfStretch":"fixed"}}} -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-hidden-intro-text-left.php b/wp-content/themes/twentytwentyfour/patterns/hidden-hidden-intro-text-left.php
index 2a27251b58..e3791cface 100644
--- a/wp-content/themes/twentytwentyfour/patterns/hidden-hidden-intro-text-left.php
+++ b/wp-content/themes/twentytwentyfour/patterns/hidden-hidden-intro-text-left.php
@@ -17,9 +17,7 @@
 <div class="wp-block-columns alignwide"><!-- wp:column {"width":"70%"} -->
 <div class="wp-block-column" style="flex-basis:70%">
 
-<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.2"}},"fontSize":"xx-large","fontFamily":"heading"} -->
-<p class="has-heading-font-family has-xx-large-font-size" style="line-height:1.2"><?php echo wp_kses_post( __( 'I’m <em>Leia Acosta</em>, a passionate photographer who finds inspiration in capturing the fleeting beauty of life.' ) ); ?></p>
-<!-- /wp:paragraph -->
+<!-- wp:heading {"level":1,"style":{"typography":{"lineHeight":"1.2"}},"fontSize":"xx-large"} --><h1 class="wp-block-heading has-xx-large-font-size" style="line-height:1.2"><?php echo wp_kses_post( __( 'I’m <em>Leia Acosta</em>, a passionate photographer who finds inspiration in capturing the fleeting beauty of life.' ) ); ?></h1><!-- /wp:heading -->
 
 </div>
 <!-- /wp:column -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-no-results-content.php b/wp-content/themes/twentytwentyfour/patterns/hidden-no-results-content.php
index 68477b8723..048ac787cf 100644
--- a/wp-content/themes/twentytwentyfour/patterns/hidden-no-results-content.php
+++ b/wp-content/themes/twentytwentyfour/patterns/hidden-no-results-content.php
@@ -6,5 +6,5 @@
  */
 ?>
 <!-- wp:paragraph -->
-<p><?php echo esc_html_x( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'Message explaining that there are no results returned from a search', 'twentytwentyfour' ); ?></p>
+<p><?php echo esc_html_x( 'No posts were found.', 'Message explaining that there are no results returned from a search', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-post-navigation.php b/wp-content/themes/twentytwentyfour/patterns/hidden-post-navigation.php
new file mode 100644
index 0000000000..e9a502369f
--- /dev/null
+++ b/wp-content/themes/twentytwentyfour/patterns/hidden-post-navigation.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Title: Post navigation
+ * slug: twentytwentyfour/post-navigation
+ * inserter: no
+ */
+?>
+
+<!-- wp:group {"tagName":"nav","ariaLabel":"<?php esc_attr_e( 'Posts', 'twentytwentyfour' ); ?>","style":{"spacing":{"padding":{"bottom":"0vh"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<nav class="wp-block-group" style="padding-bottom:0vh" aria-label="<?php esc_attr_e( 'Posts', 'twentytwentyfour' ); ?>">
+<!-- wp:post-navigation-link {"type":"previous","label":"<?php echo esc_html_x( 'Previous: ', 'Label before the title of the previous post. There is a space after the colon.', 'twentytwentyfour' ); ?>","showTitle":true,"linkLabel":true,"arrow":"arrow"} /-->
+<!-- wp:post-navigation-link {"label":"<?php echo esc_html_x( 'Next: ', 'Label before the title of the next post. There is a space after the colon.', 'twentytwentyfour' ); ?>","showTitle":true,"linkLabel":true,"arrow":"arrow"} /-->
+</nav>
+<!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-01-business-home.php b/wp-content/themes/twentytwentyfour/patterns/page-01-business-home.php
index e4dd9390d0..fade6745af 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-01-business-home.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-01-business-home.php
@@ -15,4 +15,4 @@
 <!-- wp:pattern {"slug":"twentytwentyfour/features-with-images"} /-->
 <!-- wp:pattern {"slug":"twentytwentyfour/testimonial-centered"} /-->
 <!-- wp:pattern {"slug":"twentytwentyfour/posts-featured"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/cta"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-centered-cta-subscribe"} /-->
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-03-portfolio-overview.php b/wp-content/themes/twentytwentyfour/patterns/page-03-portfolio-overview.php
index d727ae76e7..03630dbbf7 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-03-portfolio-overview.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-03-portfolio-overview.php
@@ -2,7 +2,7 @@
 /**
  * Title: Portfolio Overview Page
  * Slug: twentytwentyfour/portfolio-overview
- * Categories: about
+ * Categories: about, featured
  * Keywords: page, starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-04-newsletter-landing.php b/wp-content/themes/twentytwentyfour/patterns/page-04-newsletter-landing.php
index aa3e258fb3..725eba57c5 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-04-newsletter-landing.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-04-newsletter-landing.php
@@ -2,7 +2,7 @@
 /**
  * Title: Newsletter Landing Page
  * Slug: twentytwentyfour/newsletter-landing
- * Categories: call-to-action
+ * Categories: call-to-action, featured
  * Keywords: page, starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
@@ -10,8 +10,9 @@
  */
 ?>
 
-<!-- wp:cover {"overlayColor":"accent-3","minHeight":100,"minHeightUnit":"vh","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"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-cover alignfull is-light" style="margin-top:0;margin-bottom:0;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);min-height:100vh"><span aria-hidden="true" class="wp-block-cover__background has-accent-3-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:image {"align":"center","width":"45px","height":"49px","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
+<!-- wp:group {"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"},"margin":{"top":"0","bottom":"0"}},"dimensions":{"minHeight":"100vw"}},"backgroundColor":"accent-3","layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
+<div class="wp-block-group alignfull has-accent-3-background-color has-background" style="min-height:100vw;margin-top:0;margin-bottom:0;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:group {"layout":{"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:image {"align":"center","width":"45px","height":"49px","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
 <figure class="wp-block-image aligncenter size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-message.webp" alt="" style="object-fit:cover;width:45px;height:49px"/></figure>
 <!-- /wp:image -->
 
@@ -31,5 +32,6 @@
 <div class="wp-block-buttons"><!-- wp:button -->
 <div class="wp-block-button"><a class="wp-block-button__link wp-element-button"><?php echo esc_html_x( 'Sign up', 'sample content for newsletter subscription button', 'twentytwentyfour' ); ?></a></div>
 <!-- /wp:button --></div>
-<!-- /wp:buttons --></div></div>
-<!-- /wp:cover -->
+<!-- /wp:buttons --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-06-writer-home.php b/wp-content/themes/twentytwentyfour/patterns/page-06-writer-home.php
index 285bb09264..32fc4d90b4 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-06-writer-home.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-06-writer-home.php
@@ -68,4 +68,4 @@
 <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:pattern {"slug":"twentytwentyfour/cta"}	/-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-centered-cta-subscribe"}	/-->
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-07-rsvp-landing.php b/wp-content/themes/twentytwentyfour/patterns/page-07-rsvp-landing.php
index 59c375e9af..d940528b03 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-07-rsvp-landing.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-07-rsvp-landing.php
@@ -2,7 +2,7 @@
 /**
  * Title: RSVP Landing Page
  * Slug: twentytwentyfour/rsvp-landing
- * Categories: call-to-action
+ * Categories: call-to-action, featured
  * Keywords: page, starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-one-column.php b/wp-content/themes/twentytwentyfour/patterns/posts-one-column.php
index 3d6e192981..178fb7a29b 100644
--- a/wp-content/themes/twentytwentyfour/patterns/posts-one-column.php
+++ b/wp-content/themes/twentytwentyfour/patterns/posts-one-column.php
@@ -9,6 +9,10 @@
 
 <!-- wp:query {"query":{"perPage":3,"pages":0,"offset":"0","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"align":"full","layout":{"type":"constrained"}} -->
 <div class="wp-block-query alignfull">
+	<!-- wp:query-no-results -->
+		<!-- wp:pattern {"slug":"twentytwentyfour/no-results-content"} /-->
+	<!-- /wp:query-no-results -->
+
 	<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"0","right":"0"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"default"}} -->
 	<div class="wp-block-group" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--50);padding-right:0;padding-bottom:var(--wp--preset--spacing--50);padding-left:0">
 		<!-- wp:post-template {"align":"full","style":{"spacing":{"blockGap":"var:preset|spacing|40"}},"layout":{"type":"default","columnCount":3}} -->
@@ -31,9 +35,7 @@
 		<!-- wp:query-pagination-previous /-->
 		<!-- wp:query-pagination-next /-->
 		<!-- /wp:query-pagination -->
-		<!-- wp:query-no-results -->
-			<!-- wp:pattern {"slug":"twentytwentyfour/no-results-content"} /-->
-		<!-- /wp:query-no-results -->
+
 	</div>
 	<!-- /wp:group -->
 </div>
diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-three-columns-images.php b/wp-content/themes/twentytwentyfour/patterns/posts-three-columns-images.php
index 859612b2ea..a61c2088ab 100644
--- a/wp-content/themes/twentytwentyfour/patterns/posts-three-columns-images.php
+++ b/wp-content/themes/twentytwentyfour/patterns/posts-three-columns-images.php
@@ -10,6 +10,10 @@
 
 <!-- wp:query {"query":{"perPage":10,"pages":0,"offset":"0","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"align":"wide","layout":{"type":"default"}} -->
 <div class="wp-block-query alignwide">
+	<!-- wp:query-no-results -->
+		<!-- wp:pattern {"slug":"twentytwentyfour/no-results-content"} /-->
+	<!-- /wp:query-no-results -->
+
 	<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"0","right":"0"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"default"}} -->
 	<div class="wp-block-group" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--50);padding-right:0;padding-bottom:var(--wp--preset--spacing--50);padding-left:0">
 
@@ -26,10 +30,6 @@
 		<!-- wp:query-pagination-next /-->
 		<!-- /wp:query-pagination -->
 
-		<!-- wp:query-no-results -->
-			<!-- wp:pattern {"slug":"twentytwentyfour/no-results-content"} /-->
-		<!-- /wp:query-no-results -->
-
 	</div>
 	<!-- /wp:group -->
 </div>
diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-three-columns.php b/wp-content/themes/twentytwentyfour/patterns/posts-three-columns.php
index 07a411217b..e4ed235198 100644
--- a/wp-content/themes/twentytwentyfour/patterns/posts-three-columns.php
+++ b/wp-content/themes/twentytwentyfour/patterns/posts-three-columns.php
@@ -10,6 +10,10 @@
 
 <!-- wp:query {"query":{"perPage":10,"pages":0,"offset":"0","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"align":"wide","layout":{"type":"default"}} -->
 <div class="wp-block-query alignwide">
+	<!-- wp:query-no-results -->
+		<!-- wp:pattern {"slug":"twentytwentyfour/no-results-content"} /-->
+	<!-- /wp:query-no-results -->
+
 	<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"0","right":"0"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"default"}} -->
 	<div class="wp-block-group" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--50);padding-right:0;padding-bottom:var(--wp--preset--spacing--50);padding-left:0">
 
@@ -42,10 +46,6 @@
 		<!-- wp:query-pagination-next /-->
 		<!-- /wp:query-pagination -->
 
-		<!-- wp:query-no-results -->
-			<!-- wp:pattern {"slug":"twentytwentyfour/no-results-content"} /-->
-		<!-- /wp:query-no-results -->
-
 	</div>
 	<!-- /wp:group -->
 </div>
diff --git a/wp-content/themes/twentytwentyfour/patterns/project-layout.php b/wp-content/themes/twentytwentyfour/patterns/project-layout.php
index 6078c5c281..d069b55c76 100644
--- a/wp-content/themes/twentytwentyfour/patterns/project-layout.php
+++ b/wp-content/themes/twentytwentyfour/patterns/project-layout.php
@@ -2,7 +2,7 @@
 /**
  * Title: Project Layout
  * Slug: twentytwentyfour/project-layout
- * Categories: gallery, featured
+ * Categories: gallery, featured, portfolio
  * Viewport width: 1600
  */
 ?>
diff --git a/wp-content/themes/twentytwentyfour/patterns/template-home-portfolio.php b/wp-content/themes/twentytwentyfour/patterns/template-home-portfolio.php
index b7e591443d..f7ac2a7f80 100644
--- a/wp-content/themes/twentytwentyfour/patterns/template-home-portfolio.php
+++ b/wp-content/themes/twentytwentyfour/patterns/template-home-portfolio.php
@@ -10,7 +10,13 @@
 
 <!-- wp:template-part {"slug":"header"} /-->
 
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"},"blockGap":"0","margin":{"top":"0","bottom":"0"}}},"layout":{"type":"default"},"tagName":"main"} -->
+<main class="wp-block-group" style="margin-top:0;margin-bottom:0;padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
+
 <!-- wp:pattern {"slug":"twentytwentyfour/intro-text-left"} /-->
 <!-- wp:pattern {"slug":"twentytwentyfour/offset-grid-image-posts"} /-->
 
+</main>
+<!-- /wp:group -->
+
 <!-- wp:template-part {"slug":"footer","area":"footer","tagName":"footer"} /-->
diff --git a/wp-content/themes/twentytwentyfour/patterns/cta.php b/wp-content/themes/twentytwentyfour/patterns/text-centered-cta-subscribe.php
similarity index 96%
rename from wp-content/themes/twentytwentyfour/patterns/cta.php
rename to wp-content/themes/twentytwentyfour/patterns/text-centered-cta-subscribe.php
index d4fe63cbd9..654e6c9c0b 100644
--- a/wp-content/themes/twentytwentyfour/patterns/cta.php
+++ b/wp-content/themes/twentytwentyfour/patterns/text-centered-cta-subscribe.php
@@ -1,8 +1,9 @@
 <?php
 /**
  * Title: Centered Call To Action
- * Slug: twentytwentyfour/cta
+ * Slug: twentytwentyfour/text-centered-cta-subscribe
  * Categories: call-to-action
+ * Keywords: newsletter, subscribe, button
  */
 ?>
 
diff --git a/wp-content/themes/twentytwentyfour/patterns/text-centered-title.php b/wp-content/themes/twentytwentyfour/patterns/text-centered-title.php
index db06a5c387..e95b20ae00 100644
--- a/wp-content/themes/twentytwentyfour/patterns/text-centered-title.php
+++ b/wp-content/themes/twentytwentyfour/patterns/text-centered-title.php
@@ -8,8 +8,10 @@
 ?>
 
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained","contentSize":"800px"}} -->
-<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0;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:paragraph {"align":"center","style":{"typography":{"lineHeight":"1.2","fontStyle":"normal","fontWeight":"400"}},"fontSize":"x-large","fontFamily":"heading"} -->
-<p class="has-text-align-center has-heading-font-family has-x-large-font-size" style="font-style:normal;font-weight:400;line-height:1.2"><em>
+<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0;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:heading {"textAlign":"center","level":1,"fontSize":"x-large","level":1} -->
+<h1 class="wp-block-heading has-text-align-center has-x-large-font-size"><em>
 <?php
 	/* Translators: About link placeholder */
 	$about_link = '<a href="#" rel="nofollow">' . esc_html__( 'Money Studies', 'twentytwentyfour' ) . '</a>';
@@ -19,7 +21,6 @@
 		$about_link
 	);
 	?>
-
-</em></p>
-<!-- /wp:paragraph --></div>
+</em></h1>
+<!-- /wp:heading --></div>
 <!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfour/readme.txt b/wp-content/themes/twentytwentyfour/readme.txt
index c17c1d90a8..c3e2a56f29 100644
--- a/wp-content/themes/twentytwentyfour/readme.txt
+++ b/wp-content/themes/twentytwentyfour/readme.txt
@@ -1,6 +1,6 @@
 === Twenty Twenty-Four ===
 Contributors: wordpressdotorg
-Requires at least: 6.2
+Requires at least: 6.4
 Tested up to: 6.4
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -35,17 +35,15 @@ GNU General Public License for more details.
 === Images ===
 License: CC0 https://creativecommons.org/publicdomain/zero/1.0/
 
-about.webp - https://www.rawpixel.com/image/3297419/free-photo-image-interior-hallway-architecture
-business-app.webp - https://www.rawpixel.com/image/5928004/photo-image-public-domain-hand-person
-business-hero.webp - https://www.rawpixel.com/image/430335/free-photo-image-architecture-building-roof
-home.webp - https://www.rawpixel.com/image/3286615/free-photo-image-texture-architecture-building
-left-aligned-cta.webp - https://www.rawpixel.com/image/3283970/free-photo-image-pattern-artwork-abstract
-project-1.webp - https://www.rawpixel.com/image/3289063/free-photo-image-architectural-detail-architecture
-project-2.webp - https://www.rawpixel.com/image/430585/free-photo-image-stairs-staircase-concrete
-project-overview.webp - https://www.rawpixel.com/image/3286187/free-photo-image-person-stairs-architecture
-rsvp.webp - https://www.rawpixel.com/image/430558/free-photo-image-abstract-architecture-art-public-domain
-services.webp - https://www.rawpixel.com/image/5928302/photo-image-public-domain-person-construction
-tt4_projectoverview.jpg - https://www.rawpixel.com/image/3286725/free-photo-image-black-and-white-background-photos
+museum.webp - https://www.rawpixel.com/image/3297419/free-photo-image-interior-hallway-architecture
+tourist-and-building.webp - https://www.rawpixel.com/image/5928004/photo-image-public-domain-hand-person
+building-exterior.webp - https://www.rawpixel.com/image/430335/free-photo-image-architecture-building-roof
+windows.webp - https://www.rawpixel.com/image/3286615/free-photo-image-texture-architecture-building
+abstract-geometric-art.webp - https://www.rawpixel.com/image/3283970/free-photo-image-pattern-artwork-abstract
+angular-roof.webp - https://www.rawpixel.com/image/3289063/free-photo-image-architectural-detail-architecture
+art-gallery.webp - https://www.rawpixel.com/image/3286187/free-photo-image-person-stairs-architecture
+green-staircase.webp - https://www.rawpixel.com/image/430558/free-photo-image-abstract-architecture-art-public-domain
+hotel-facade.webp - https://www.rawpixel.com/image/3286725/free-photo-image-black-and-white-background-photos
 
 License: UNICODE LICENSE V3 https://www.unicode.org/license.txt
 icon-message.webp
diff --git a/wp-content/themes/twentytwentyfour/styles/fossil.json b/wp-content/themes/twentytwentyfour/styles/fossil.json
new file mode 100644
index 0000000000..5c7de2c296
--- /dev/null
+++ b/wp-content/themes/twentytwentyfour/styles/fossil.json
@@ -0,0 +1,198 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/theme.json",
+	"version": 2,
+	"title": "Fossil",
+	"settings": {
+		"color": {
+			"palette": [
+				{
+					"color": "#D6D2CE",
+					"name": "Base",
+					"slug": "base"
+				},
+				{
+					"color": "#E1DFDB",
+					"name": "Base / Two",
+					"slug": "base-2"
+				},
+				{
+					"color": "#1A151425",
+					"name": "Base / Three",
+					"slug": "base-3"
+				},
+				{
+					"color": "#1A1514",
+					"name": "Contrast",
+					"slug": "contrast"
+				},
+				{
+					"color": "#65574E",
+					"name": "Contrast / Two",
+					"slug": "contrast-2"
+				},
+				{
+					"color": "#958D86",
+					"name": "Contrast / Three",
+					"slug": "contrast-3"
+				}
+			]
+		},
+		"typography": {
+			"fontFamilies": [
+				{
+					"fontFace": [
+						{
+							"fontFamily": "Inter",
+							"fontStretch": "normal",
+							"fontStyle": "normal",
+							"fontWeight": "300 900",
+							"src": [
+								"file:./assets/fonts/inter/Inter-VariableFont_slnt,wght.woff2"
+							]
+						}
+					],
+					"fontFamily": "\"Inter\", sans-serif",
+					"name": "Inter",
+					"slug": "heading"
+				},
+				{
+					"fontFace": [
+						{
+							"fontFamily": "Cardo",
+							"fontStyle": "normal",
+							"fontWeight": "400",
+							"src": ["file:./assets/fonts/cardo/cardo_normal_400.woff2"]
+						},
+						{
+							"fontFamily": "Cardo",
+							"fontStyle": "italic",
+							"fontWeight": "400",
+							"src": ["file:./assets/fonts/cardo/cardo_italic_400.woff2"]
+						},
+						{
+							"fontFamily": "Cardo",
+							"fontStyle": "normal",
+							"fontWeight": "700",
+							"src": ["file:./assets/fonts/cardo/cardo_normal_700.woff2"]
+						}
+					],
+					"fontFamily": "Cardo",
+					"name": "Cardo",
+					"slug": "body"
+				}
+			],
+			"fontSizes": [
+				{
+					"fluid": false,
+					"name": "Small",
+					"size": "1rem",
+					"slug": "small"
+				},
+				{
+					"fluid": false,
+					"name": "Medium",
+					"size": "1.2rem",
+					"slug": "medium"
+				},
+				{
+					"fluid": {
+						"min": "1.5rem",
+						"max": "2rem"
+					},
+					"name": "Large",
+					"size": "2rem",
+					"slug": "large"
+				},
+				{
+					"fluid": {
+						"min": "2rem",
+						"max": "2.65rem"
+					},
+					"name": "Extra Large",
+					"size": "2.65rem",
+					"slug": "x-large"
+				},
+				{
+					"fluid": {
+						"min": "2.65rem",
+						"max": "3.5rem"
+					},
+					"name": "Extra Extra Large",
+					"size": "3.5rem",
+					"slug": "xx-large"
+				}
+			]
+		}
+	},
+	"styles": {
+		"blocks": {
+			"core/pullquote": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontStyle": "normal",
+					"fontWeight": "normal",
+					"lineHeight": "1.2"
+				}
+			},
+			"core/quote": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--heading)",
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontStyle": "normal"
+				},
+				"variations": {
+					"plain": {
+						"typography": {
+							"fontStyle": "normal",
+							"fontWeight": "400"
+						}
+					}
+				}
+			},
+			"core/site-title": {
+				"typography": {
+					"fontWeight": "400"
+				}
+			}
+		},
+		"elements": {
+			"button": {
+				"border": {
+					"radius": "100px",
+					"color": "var(--wp--preset--color--contrast-2)"
+				},
+				"color": {
+					"background": "var(--wp--preset--color--contrast-2)",
+					"text": "var(--wp--preset--color--white)"
+				},
+				"spacing": {
+					"padding": {
+						"bottom": "0.9rem",
+						"left": "2rem",
+						"right": "2rem",
+						"top": "0.9rem"
+					}
+				},
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--heading)",
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"fontStyle": "normal"
+				},
+				":hover": {
+					"color": {
+						"background": "var(--wp--preset--color--contrast)"
+					},
+					"border": {
+						"color": "var(--wp--preset--color--contrast)"
+					}
+				}
+			},
+			"heading": {
+				"typography": {
+					"fontWeight": "normal",
+					"letterSpacing": "0"
+				}
+			}
+		}
+	}
+}
diff --git a/wp-content/themes/twentytwentyfour/styles/ice.json b/wp-content/themes/twentytwentyfour/styles/ice.json
index 8933b348b9..203da9b6ae 100644
--- a/wp-content/themes/twentytwentyfour/styles/ice.json
+++ b/wp-content/themes/twentytwentyfour/styles/ice.json
@@ -20,38 +20,6 @@
 	},
 	"styles": {
 		"blocks": {
-			"core/code": {
-				"border": {
-					"bottom": {
-						"style": "none",
-						"width": "0px"
-					},
-					"left": {
-						"style": "none",
-						"width": "0px"
-					},
-					"radius": "16px",
-					"right": {
-						"style": "none",
-						"width": "0px"
-					},
-					"top": {
-						"style": "none",
-						"width": "0px"
-					}
-				},
-				"color": {
-					"background": "var(--wp--preset--color--base-2)",
-					"text": "var(--wp--preset--color--contrast-2)"
-				},
-				"elements": {
-					"link": {
-						"color": {
-							"text": "var(--wp--preset--color--contrast-2)"
-						}
-					}
-				}
-			},
 			"core/pullquote": {
 				"border": {
 					"bottom": {
diff --git a/wp-content/themes/twentytwentyfour/styles/milky.json b/wp-content/themes/twentytwentyfour/styles/milky.json
deleted file mode 100644
index 3a3da99b2d..0000000000
--- a/wp-content/themes/twentytwentyfour/styles/milky.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-	"$schema": "https://schemas.wp.org/trunk/theme.json",
-	"version": 2,
-	"title": "Milky",	
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"color": "#f2efe6",
-					"name": "Base",
-					"slug": "base"
-				},
-				{
-					"color": "#fcf9f0",
-					"name": "Base / Two",
-					"slug": "base-2"
-				},
-				{
-					"color": "#00000025",
-					"name": "Base / Three",
-					"slug": "base-3"
-				},
-				{
-					"color": "#373930",
-					"name": "Contrast",
-					"slug": "contrast"
-				},
-				{
-					"color": "#7a6f5c",
-					"name": "Contrast / Two",
-					"slug": "contrast-2"
-				},
-				{
-					"color": "#A4A4A4",
-					"name": "Contrast / Three",
-					"slug": "contrast-3"
-				}
-			]
-		}
-	},
-	"styles": {
-		"blocks": {
-			"core/button": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
-				}
-			},
-			"core/image": {
-				"border": {
-					"radius": "0px"
-				}
-			},
-			"core/post-featured-image": {
-				"border": {
-					"radius": "0px"
-				}
-			},
-			"core/pullquote": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--body)",
-					"fontSize": "var(--wp--preset--font-size--x-large)",
-					"fontStyle": "normal",
-					"fontWeight": "600",
-					"lineHeight": "1.2"
-				}
-			},
-			"core/quote": {
-				"variations": {
-					"plain": {
-						"typography": {
-							"fontFamily": "var(--wp--preset--font-family--body)",
-							"fontStyle": "normal",
-							"fontWeight": "400"
-						}
-					}
-				}
-			},
-			"core/site-title": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--heading)",
-					"fontStyle": "normal",
-					"fontWeight": "700",
-					"letterSpacing": "0rem",
-					"textTransform": "capitalize"
-				}
-			}
-		},
-		"elements": {
-			"heading": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--body)",
-					"fontStyle": "normal",
-					"fontWeight": "600",
-					"letterSpacing": "0rem"
-				}
-			}
-		},
-		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--heading)",
-			"fontSize": "1.2rem"
-		}
-	}
-}
\ No newline at end of file
diff --git a/wp-content/themes/twentytwentyfour/styles/rust.json b/wp-content/themes/twentytwentyfour/styles/rust.json
index 610742ad6b..dd4cff70b2 100644
--- a/wp-content/themes/twentytwentyfour/styles/rust.json
+++ b/wp-content/themes/twentytwentyfour/styles/rust.json
@@ -91,5 +91,89 @@
 				}
 			]
 		}
+	},
+	"styles": {
+		"blocks": {
+			"core/comment-date": {
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						}
+					}
+				}
+			},
+			"core/comment-edit-link": {
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						}
+					}
+				}
+			},
+			"core/comment-reply-link": {
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						}
+					}
+				}
+			},
+			"core/post-date": {
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						}
+					}
+				}
+			},
+			"core/post-terms": {
+				"css":"& .wp-block-post-terms__prefix{color: var(--wp--preset--color--contrast);}"
+			},
+			"core/quote": {
+				"color": {
+					"background": "var(--wp--preset--color--base)"
+				}
+			},
+			"core/site-tagline": {
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				}
+			}
+		},
+		"elements": {
+			"button": {
+				":focus": {
+					"color": {
+						"background": "var(--wp--preset--color--contrast)"
+					},
+					"border": {
+						"color": "var(--wp--preset--color--contrast)"
+					}
+				},
+				":hover": {
+					"color": {
+						"background": "var(--wp--preset--color--contrast)"
+					},
+					"border": {
+						"color": "var(--wp--preset--color--contrast)"
+					}
+				}
+			},
+			"caption": {
+				"color": {
+					"text": "var(--wp--preset--color--contrast)"
+				}
+			}
+		}
 	}
 }
diff --git a/wp-content/themes/twentytwentyfour/templates/single-with-sidebar.html b/wp-content/themes/twentytwentyfour/templates/single-with-sidebar.html
index 98b0b7a8c2..0a52c154d6 100644
--- a/wp-content/themes/twentytwentyfour/templates/single-with-sidebar.html
+++ b/wp-content/themes/twentytwentyfour/templates/single-with-sidebar.html
@@ -1,7 +1,7 @@
 <!-- wp:template-part {"slug":"header"} /-->
 
-<!-- wp:group {"style":{"spacing":{"margin":{"top":"0vh","bottom":"0vh"},"padding":{"top":"10vh","bottom":"8vh"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="margin-top:0vh;margin-bottom:0vh;padding-top:10vh;padding-bottom:8vh"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"1rem","left":"1rem"}}}} -->
+<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"0vh","bottom":"0vh"},"padding":{"top":"10vh","bottom":"8vh"}}},"layout":{"type":"constrained"}} -->
+<main class="wp-block-group" style="margin-top:0vh;margin-bottom:0vh;padding-top:10vh;padding-bottom:8vh"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"1rem","left":"1rem"}}}} -->
 <div class="wp-block-columns alignwide"><!-- wp:column {"width":"10%"} -->
 <div class="wp-block-column" style="flex-basis:10%"></div>
 <!-- /wp:column -->
@@ -19,10 +19,11 @@
 <!-- wp:template-part {"slug":"post-meta"} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
-<main class="wp-block-group"><!-- wp:post-content {"lock":{"move":false,"remove":true},"layout":{"type":"constrained"}} /-->
+<!-- wp:group {"layout":{"type":"constrained"}} -->
+<div class="wp-block-group">
+<!-- wp:post-content {"lock":{"move":false,"remove":true},"layout":{"type":"constrained"}} /-->
 
-<!-- wp:post-terms {"term":"post_tag","separator":"  "} /--></main>
+<!-- wp:post-terms {"term":"post_tag","separator":"  "} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
@@ -36,11 +37,9 @@
 <div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0vh"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group" style="padding-bottom:0vh"><!-- wp:post-navigation-link {"type":"previous","arrow":"arrow"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/post-navigation"} /-->
 
-<!-- wp:post-navigation-link {"label":"Next","arrow":"arrow"} /--></div>
-<!-- /wp:group --></div>
+</div>
 <!-- /wp:group --></div>
 <!-- /wp:column -->
 
@@ -55,7 +54,7 @@
 <!-- wp:column {"width":"10%"} -->
 <div class="wp-block-column" style="flex-basis:10%"></div>
 <!-- /wp:column --></div>
-<!-- /wp:columns --></div>
+<!-- /wp:columns --></main>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","area":"footer","tagName":"footer"} /-->
diff --git a/wp-content/themes/twentytwentyfour/templates/single.html b/wp-content/themes/twentytwentyfour/templates/single.html
index fddd6c0c0c..9418dfcf69 100644
--- a/wp-content/themes/twentytwentyfour/templates/single.html
+++ b/wp-content/themes/twentytwentyfour/templates/single.html
@@ -1,6 +1,6 @@
 <!-- wp:template-part {"slug":"header"} /-->
 
-<!-- wp:group {"tagName":"main","align":"full","layout":{"type":"constrained"}} -->
+<!-- wp:group {"tagName":"main","align":"full"} -->
 <main class="wp-block-group alignfull"><!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|50"},"margin":{"bottom":"var:preset|spacing|40"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--40);padding-top:var(--wp--preset--spacing--50)"><!-- wp:post-featured-image {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}}} /-->
 
@@ -13,16 +13,10 @@
 <!-- /wp:group --></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}},"layout":{"type":"default"}} -->
-<div class="wp-block-group alignfull" style="margin-bottom:var(--wp--preset--spacing--40)">
+<!-- wp:post-content {"lock":{"move":false,"remove":true},"align":"full","layout":{"type":"constrained"}} /-->
 
-	<!-- wp:post-content {"lock":{"move":false,"remove":true},"align":"full","layout":{"type":"constrained"}} /-->
-		
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-bottom:var(--wp--preset--spacing--50)">
+<!-- wp:group {"style":{"spacing":{"margin":{"top":"var:preset|spacing|40"},"padding":{"bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--50)">
 	<!-- wp:post-terms {"term":"post_tag","separator":"  ","className":"is-style-pill"} /-->
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
@@ -40,11 +34,9 @@
 <div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0vh"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group" style="padding-bottom:0vh">
-	<!-- wp:post-navigation-link {"type":"previous","arrow":"arrow"} /-->
-	<!-- wp:post-navigation-link {"label":"Next","arrow":"arrow"} /--></div>
-<!-- /wp:group --></div>
+<!-- wp:pattern {"slug":"twentytwentyfour/post-navigation"} /-->
+
+</div>
 <!-- /wp:group --></div>
 <!-- /wp:group --></main>
 <!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfour/theme.json b/wp-content/themes/twentytwentyfour/theme.json
index f3b637dd18..a8790a9b3e 100644
--- a/wp-content/themes/twentytwentyfour/theme.json
+++ b/wp-content/themes/twentytwentyfour/theme.json
@@ -162,7 +162,7 @@
 			"spacingSizes": [
 				{
 					"name": "1",
-					"size": "min(1rem, 1vw)",
+					"size": "1rem",
 					"slug": "10"
 				},
 				{
@@ -331,20 +331,25 @@
 			"core/code": {
 				"border": {
 					"color": "var(--wp--preset--color--contrast)",
-					"radius": "0.25rem",
-					"style": "solid",
-					"width": "2px"
+					"radius": "var(--wp--preset--spacing--20)"
+				},
+				"color": {
+					"background": "var(--wp--preset--color--base-2)",
+					"text": "var(--wp--preset--color--contrast-2)"
 				},
 				"spacing": {
 					"padding": {
-						"bottom": "var(--wp--preset--spacing--50)",
-						"left": "var(--wp--preset--spacing--50)",
-						"right": "var(--wp--preset--spacing--50)",
-						"top": "var(--wp--preset--spacing--50)"
+						"bottom": "calc(var(--wp--preset--spacing--30) + 0.75rem)",
+						"left": "calc(var(--wp--preset--spacing--30) + 0.75rem)",
+						"right": "calc(var(--wp--preset--spacing--30) + 0.75rem)",
+						"top": "calc(var(--wp--preset--spacing--30) + 0.75rem)"
 					}
 				},
 				"typography": {
-					"fontFamily": "monospace"
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"fontStyle": "normal",
+					"fontWeight": "400",
+					"lineHeight": "1.6"
 				}
 			},
 			"core/comment-author-name": {
@@ -612,23 +617,7 @@
 			},
 			"core/pullquote": {
 				"border": {
-					"bottom": {
-						"style": "none",
-						"width": "0px"
-					},
-					"left": {
-						"style": "none",
-						"width": "0px"
-					},
-					"radius": "var(--wp--preset--spacing--20)",
-					"right": {
-						"style": "none",
-						"width": "0px"
-					},
-					"top": {
-						"style": "none",
-						"width": "0px"
-					}
+					"radius": "var(--wp--preset--spacing--20)"
 				},
 				"elements": {
 					"cite": {
@@ -657,6 +646,13 @@
 			"core/query-title": {
 				"css": "& span {font-style: italic;}"
 			},
+			"core/query-no-results": {
+				"spacing": {
+					"padding": {
+						"top": "var(--wp--preset--spacing--30)"
+					}
+				}
+			},
 			"core/quote": {
 				"border": {
 					"radius": "var(--wp--preset--spacing--20)"
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7db313e635..237393b51d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.4-beta2-56812';
+$wp_version = '6.4-beta2-56813';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.