diff --git a/parts/post-meta.html b/parts/post-meta.html
index 3cdabd84..e11eda30 100644
--- a/parts/post-meta.html
+++ b/parts/post-meta.html
@@ -1 +1 @@
-<!-- wp:pattern {"slug":"twentytwentyfour/post-meta"} /-->
\ No newline at end of file
+<!-- wp:pattern {"slug":"twentytwentyfour/hidden-post-meta"} /-->
diff --git a/parts/sidebar.html b/parts/sidebar.html
index 2394b856..93c36b95 100644
--- a/parts/sidebar.html
+++ b/parts/sidebar.html
@@ -1 +1 @@
-<!-- wp:pattern {"slug":"twentytwentyfour/sidebar"} /-->
\ No newline at end of file
+<!-- wp:pattern {"slug":"twentytwentyfour/hidden-sidebar"} /-->
diff --git a/patterns/hero.php b/patterns/banner-hero.php
similarity index 98%
rename from patterns/hero.php
rename to patterns/banner-hero.php
index 8ec16aa6..4587ac86 100644
--- a/patterns/hero.php
+++ b/patterns/banner-hero.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Hero
- * Slug: twentytwentyfour/hero
+ * Slug: twentytwentyfour/banner-hero
  * Categories: banner, call-to-action, featured
  * Viewport width: 1400
  */
diff --git a/patterns/project-description.php b/patterns/banner-project-description.php
similarity index 95%
rename from patterns/project-description.php
rename to patterns/banner-project-description.php
index 91fdcb7c..31a44fc6 100644
--- a/patterns/project-description.php
+++ b/patterns/banner-project-description.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Title: Project description
- * Slug: twentytwentyfour/project-description
- * Categories: featured, banner, about
+ * Slug: twentytwentyfour/banner-project-description
+ * Categories: featured, banner, about, portfolio
  * Viewport width: 1400
  */
 ?>
diff --git a/patterns/left-aligned-cta-image.php b/patterns/cta-content-image-on-right.php
similarity index 96%
rename from patterns/left-aligned-cta-image.php
rename to patterns/cta-content-image-on-right.php
index b8ee6844..f46ecbc1 100644
--- a/patterns/left-aligned-cta-image.php
+++ b/patterns/cta-content-image-on-right.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Title: Left Aligned Call to Action with Image
- * Slug: twentytwentyfour/left-aligned-cta-image
- * Categories: call-to-action
+ * Title: Call to action with image on right
+ * Slug: twentytwentyfour/cta-content-image-on-right
+ * Categories: call-to-action, banner
  * Viewport width: 1400
  */
 ?>
diff --git a/patterns/pricing.php b/patterns/cta-pricing.php
similarity index 99%
rename from patterns/pricing.php
rename to patterns/cta-pricing.php
index f89e4496..78665ceb 100644
--- a/patterns/pricing.php
+++ b/patterns/cta-pricing.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Pricing
- * Slug: twentytwentyfour/pricing
+ * Slug: twentytwentyfour/cta-pricing
  * Categories: call-to-action, services
  * Viewport width: 1400
  */
diff --git a/patterns/rsvp.php b/patterns/cta-rsvp.php
similarity index 99%
rename from patterns/rsvp.php
rename to patterns/cta-rsvp.php
index 46783110..99810658 100644
--- a/patterns/rsvp.php
+++ b/patterns/cta-rsvp.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: RSVP
- * Slug: twentytwentyfour/rsvp
+ * Slug: twentytwentyfour/cta-rsvp
  * Categories: call-to-action, featured
  * Viewport width: 1100
  */
diff --git a/patterns/services-cta.php b/patterns/cta-services-image-left.php
similarity index 96%
rename from patterns/services-cta.php
rename to patterns/cta-services-image-left.php
index 6bccf962..0ceed99a 100644
--- a/patterns/services-cta.php
+++ b/patterns/cta-services-image-left.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Services - Call To Action
- * Slug: twentytwentyfour/services-cta
+ * Title: Services call to action with image on left
+ * Slug: twentytwentyfour/cta-services-image-left
  * Categories: call-to-action, banner, featured, services
  * Viewport width: 1400
  */
diff --git a/patterns/text-centered-cta-subscribe.php b/patterns/cta-subscribe-centered.php
similarity index 96%
rename from patterns/text-centered-cta-subscribe.php
rename to patterns/cta-subscribe-centered.php
index d3d5824d..b65eac59 100644
--- a/patterns/text-centered-cta-subscribe.php
+++ b/patterns/cta-subscribe-centered.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Centered Call To Action
- * Slug: twentytwentyfour/text-centered-cta-subscribe
+ * Title: Centered call to action
+ * Slug: twentytwentyfour/cta-subscribe-centered
  * Categories: call-to-action
  * Keywords: newsletter, subscribe, button
  */
diff --git a/patterns/footer.php b/patterns/footer.php
index de0344eb..b39b3ddf 100644
--- a/patterns/footer.php
+++ b/patterns/footer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Footer with colophon, four columns
+ * Title: Footer with colophon, 4 columns
  * Slug: twentytwentyfour/footer
  * Categories: footer
  * Block Types: core/template-part/footer
diff --git a/patterns/hidden-full-screen-image.php b/patterns/gallery-full-screen-image.php
similarity index 82%
rename from patterns/hidden-full-screen-image.php
rename to patterns/gallery-full-screen-image.php
index 8f85323a..ee26fca4 100644
--- a/patterns/hidden-full-screen-image.php
+++ b/patterns/gallery-full-screen-image.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Title: Full Screen Image
- * Slug: twentytwentyfour/full-screen-image
- * Inserter: no
+ * Title: Full screen image
+ * Slug: twentytwentyfour/gallery-full-screen-image
+ * Categories: gallery, portfolio
  */
 ?>
 
@@ -13,8 +13,8 @@
 	<div role="img" class="wp-block-cover__image-background has-parallax" style="background-position:50% 50%;background-image:url(<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/art-gallery.webp)">
 	</div>
 	<div class="wp-block-cover__inner-container">
-		<!-- wp:spacer {"height":"var:preset|spacing|60"} -->
-		<div style="height:var(--wp--preset--spacing--60)" aria-hidden="true" class="wp-block-spacer"></div>
+		<!-- wp:spacer {"height":"500px"} -->
+		<div style="height:500px" aria-hidden="true" class="wp-block-spacer"></div>
 		<!-- /wp:spacer -->
 	</div>
 </div>
diff --git a/patterns/gallery-offset-image-grid-2-col.php b/patterns/gallery-offset-images-grid-2-col.php
similarity index 94%
rename from patterns/gallery-offset-image-grid-2-col.php
rename to patterns/gallery-offset-images-grid-2-col.php
index 4de7d024..3e8605a6 100644
--- a/patterns/gallery-offset-image-grid-2-col.php
+++ b/patterns/gallery-offset-images-grid-2-col.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Title: Offset Image Grid, 2 Columns
- * Slug: twentytwentyfour/gallery-offset-image-grid-2-col
- * Categories: gallery, featured, portfolio
+ * Title: Offset gallery, 2 columns
+ * Slug: twentytwentyfour/gallery-offset-images-grid-2-col
+ * Categories: gallery, portfolio
  * Keywords: project, images, media, masonry, columns
  * Viewport width: 1400
  */
diff --git a/patterns/gallery-offset-image-grid-3-col.php b/patterns/gallery-offset-images-grid-3-col.php
similarity index 96%
rename from patterns/gallery-offset-image-grid-3-col.php
rename to patterns/gallery-offset-images-grid-3-col.php
index ce58138d..78176994 100644
--- a/patterns/gallery-offset-image-grid-3-col.php
+++ b/patterns/gallery-offset-images-grid-3-col.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Title: Offset Image Grid, 3 Columns
- * Slug: twentytwentyfour/gallery-offset-image-grid-3-col
- * Categories: gallery, featured, portfolio
+ * Title: Offset gallery, 3 columns
+ * Slug: twentytwentyfour/gallery-offset-images-grid-2-col
+ * Categories: gallery, portfolio
  * Keywords: project, images, media, masonry, columns
  * Viewport width: 1400
  */
diff --git a/patterns/gallery-offset-image-grid.php b/patterns/gallery-offset-images-grid-4-col.php
similarity index 98%
rename from patterns/gallery-offset-image-grid.php
rename to patterns/gallery-offset-images-grid-4-col.php
index 889b8ecd..82b35254 100644
--- a/patterns/gallery-offset-image-grid.php
+++ b/patterns/gallery-offset-images-grid-4-col.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Offset Image Grid, 4 Columns
- * Slug: twentytwentyfour/gallery-offset-image-grid-4-col
+ * Title: Offset gallery, 4 columns
+ * Slug: twentytwentyfour/gallery-offset-images-grid-4-col
  * Categories: gallery, featured, portfolio
  * Keywords: project, images, media, masonry, columns
  * Viewport width: 1400
diff --git a/patterns/project-layout.php b/patterns/gallery-project-layout.php
similarity index 98%
rename from patterns/project-layout.php
rename to patterns/gallery-project-layout.php
index f1e499b8..27d6f746 100644
--- a/patterns/project-layout.php
+++ b/patterns/gallery-project-layout.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Project Layout
- * Slug: twentytwentyfour/project-layout
+ * Title: Project layout
+ * Slug: twentytwentyfour/gallery-project-layout
  * Categories: gallery, featured, portfolio
  * Viewport width: 1600
  */
diff --git a/patterns/hidden-404.php b/patterns/hidden-404.php
index 04b0a654..d033a13f 100644
--- a/patterns/hidden-404.php
+++ b/patterns/hidden-404.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: A 404 page
- * Slug: twentytwentyfour/404
+ * Title: 404
+ * Slug: twentytwentyfour/hidden-404
  * Inserter: no
  */
 ?>
@@ -12,4 +12,4 @@
 <!-- wp:paragraph -->
 <p><?php echo esc_html_x( 'The page you are looking for does not exist, or it has been moved. Please try searching using the form below.', 'Message to convey that a webpage could not be found', 'twentytwentyfour' ); ?></p>
 <!-- /wp:paragraph -->
-<!-- wp:pattern {"slug":"twentytwentyfour/search"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/hidden-search"} /-->
diff --git a/patterns/hidden-comments.php b/patterns/hidden-comments.php
index d3b3c39c..bd106684 100644
--- a/patterns/hidden-comments.php
+++ b/patterns/hidden-comments.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Comments
- * Slug: twentytwentyfour/comments
+ * Slug: twentytwentyfour/hidden-comments
  * Inserter: no
  */
 ?>
diff --git a/patterns/hidden-no-results-content.php b/patterns/hidden-no-results.php
similarity index 73%
rename from patterns/hidden-no-results-content.php
rename to patterns/hidden-no-results.php
index 048ac787..00bbf976 100644
--- a/patterns/hidden-no-results-content.php
+++ b/patterns/hidden-no-results.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Hidden No Results Content
- * Slug: twentytwentyfour/no-results-content
+ * Title: No results
+ * Slug: twentytwentyfour/hidden-no-results
  * Inserter: no
  */
 ?>
diff --git a/patterns/hidden-intro-text-left.php b/patterns/hidden-portfolio-hero.php
similarity index 89%
rename from patterns/hidden-intro-text-left.php
rename to patterns/hidden-portfolio-hero.php
index 8542f59a..29e6abc9 100644
--- a/patterns/hidden-intro-text-left.php
+++ b/patterns/hidden-portfolio-hero.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Title: Heading on left
- * Slug: twentytwentyfour/intro-text-left
- * Categories: text
+ * Title: Portfolio hero
+ * Slug: twentytwentyfour/hidden-portfolio-hero
  * Inserter: no
  */
 ?>
diff --git a/patterns/hidden-post-meta.php b/patterns/hidden-post-meta.php
index c0aacf4b..add4a1c8 100644
--- a/patterns/hidden-post-meta.php
+++ b/patterns/hidden-post-meta.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Post Meta
- * Slug: twentytwentyfour/post-meta
+ * Title: Post meta
+ * Slug: twentytwentyfour/hidden-post-meta
  * Inserter: no
  */
 ?>
diff --git a/patterns/hidden-post-navigation.php b/patterns/hidden-post-navigation.php
index 2f39130d..be2dcb28 100644
--- a/patterns/hidden-post-navigation.php
+++ b/patterns/hidden-post-navigation.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Title: Post navigation
- * slug: twentytwentyfour/post-navigation
- * inserter: no
+ * Slug: twentytwentyfour/hidden-post-navigation
+ * Inserter: no
  */
 ?>
 
diff --git a/patterns/hidden-search.php b/patterns/hidden-search.php
index c7e3ce0d..e4aaa64e 100644
--- a/patterns/hidden-search.php
+++ b/patterns/hidden-search.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Hidden Search form
- * Slug: twentytwentyfour/search
+ * Title: Search
+ * Slug: twentytwentyfour/hidden-search
  * Inserter: no
  */
 ?>
diff --git a/patterns/hidden-sidebar.php b/patterns/hidden-sidebar.php
index 9bb5f1f6..46e40d0f 100644
--- a/patterns/hidden-sidebar.php
+++ b/patterns/hidden-sidebar.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Title: sidebar
- * Slug: twentytwentyfour/sidebar
- * Categories: hidden
+ * Title: Sidebar
+ * Slug: twentytwentyfour/hidden-sidebar
  * Inserter: no
  */
 ?>
diff --git a/patterns/page-01-business-home.php b/patterns/page-01-business-home.php
deleted file mode 100644
index de720fbe..00000000
--- a/patterns/page-01-business-home.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Title: Business Home Page
- * Slug: twentytwentyfour/home
- * Categories: page
- * Keywords: starter
- * Block Types: core/post-content
- * Post Types: page, wp_template
- * Viewport width: 1400
- */
-?>
-
-<!-- wp:pattern {"slug":"twentytwentyfour/hero"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/feature-grid"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/features-with-images"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/testimonial-centered"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/posts-featured"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/text-centered-cta-subscribe"} /-->
diff --git a/patterns/page-02-business-about.php b/patterns/page-02-business-about.php
deleted file mode 100644
index c1da19ad..00000000
--- a/patterns/page-02-business-about.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Title: Business About Page
- * Slug: twentytwentyfour/business-about
- * Categories: page
- * Keywords: starter
- * Block Types: core/post-content
- * Post Types: page, wp_template
- * Viewport width: 1400
- */
-?>
-
-<!-- wp:pattern {"slug":"twentytwentyfour/text-title-left-image-right"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/project-details"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/services-cta"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/team"} /-->
-<!-- wp:pattern {"slug":"clients-section"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/faq"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/left-aligned-cta-image"} /-->
diff --git a/patterns/page-03-portfolio-overview.php b/patterns/page-03-portfolio-overview.php
deleted file mode 100644
index 91865f88..00000000
--- a/patterns/page-03-portfolio-overview.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Title: Portfolio Overview Page
- * Slug: twentytwentyfour/portfolio-overview
- * Categories: page, featured
- * Keywords: starter
- * Block Types: core/post-content
- * Post Types: page, wp_template
- * Viewport width: 1400
- */
-?>
-
-<!-- wp:pattern {"slug":"twentytwentyfour/project-description"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/project-details"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/full-screen-image"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/centered-statement"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/project-layout"} /-->
diff --git a/patterns/page-05-portfolio-home.php b/patterns/page-05-portfolio-home.php
deleted file mode 100644
index 94a143d4..00000000
--- a/patterns/page-05-portfolio-home.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Title: Portfolio Home Page
- * Slug: twentytwentyfour/portfolio-home
- * Categories: page
- * Keywords: starter
- * Block Types: core/post-content
- * Post Types: page, wp_template
- * Viewport width: 1400
- */
-?>
-
-<!-- wp:pattern {"slug":"twentytwentyfour/intro-text-left"} /-->
-<!-- wp:pattern {"slug":"twentytwentyfour/offset-grid-image-posts"} /-->
diff --git a/patterns/page-about-business.php b/patterns/page-about-business.php
new file mode 100644
index 00000000..f04b2094
--- /dev/null
+++ b/patterns/page-about-business.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Title: About
+ * Slug: twentytwentyfour/page-about-business
+ * Categories: page
+ * Keywords: starter
+ * Block Types: core/post-content
+ * Post Types: page, wp_template
+ * Viewport width: 1400
+ */
+?>
+
+<!-- wp:pattern {"slug":"twentytwentyfour/text-title-left-image-right"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-project-details"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/cta-services-image-left"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/team-4-col"} /-->
+<!-- wp:pattern {"slug":"clients-section"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-faq"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/cta-content-image-on-right"} /-->
diff --git a/patterns/page-06-blogging-home.php b/patterns/page-home-blogging.php
similarity index 89%
rename from patterns/page-06-blogging-home.php
rename to patterns/page-home-blogging.php
index 99053861..d1c52425 100644
--- a/patterns/page-06-blogging-home.php
+++ b/patterns/page-home-blogging.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Title: Blogging Home
- * Slug: twentytwentyfour/blogging-home
- * Categories: text, page
+ * Title: Blogging home
+ * Slug: twentytwentyfour/page-home-blogging
+ * Categories: page
  * Keywords: page, starter
  * Post Types: page, wp_template
  * Viewport width: 1400
  */
 ?>
 
-<!-- wp:pattern {"slug":"twentytwentyfour/text-centered-title"}	/-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-centered-statement-small"}	/-->
 
 <!-- wp:group {"align":"wide","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignwide" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)">
@@ -53,7 +53,7 @@
 				<!-- /wp:query-pagination -->
 
 				<!-- wp:query-no-results -->
-				<!-- wp:pattern {"slug":"twentytwentyfour/no-results-content"} /-->
+				<!-- wp:pattern {"slug":"twentytwentyfour/hidden-no-results"} /-->
 				<!-- /wp:query-no-results -->
 			</div>
 			<!-- /wp:query -->
@@ -80,4 +80,4 @@
 </div>
 <!-- /wp:group -->
 
-<!-- wp:pattern {"slug":"twentytwentyfour/text-centered-cta-subscribe"}	/-->
+<!-- wp:pattern {"slug":"twentytwentyfour/cta-subscribe-centered"}	/-->
diff --git a/patterns/page-home-business.php b/patterns/page-home-business.php
new file mode 100644
index 00000000..fb526b25
--- /dev/null
+++ b/patterns/page-home-business.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Title: Business home
+ * Slug: twentytwentyfour/home-business
+ * Categories: page
+ * Keywords: starter
+ * Block Types: core/post-content
+ * Post Types: page, wp_template
+ * Viewport width: 1400
+ */
+?>
+
+<!-- wp:pattern {"slug":"twentytwentyfour/banner-hero"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-feature-grid-3-col"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-alternating-images"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/testimonial-centered"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/posts-grid-2-col"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/cta-subscribe-centered"} /-->
diff --git a/patterns/page-home-portfolio-gallery.php b/patterns/page-home-portfolio-gallery.php
new file mode 100644
index 00000000..cce1fdb1
--- /dev/null
+++ b/patterns/page-home-portfolio-gallery.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Title: Portfolio home image gallery
+ * Slug: twentytwentyfour/page-home-gallery
+ * Categories: page
+ * Keywords: starter
+ * Block Types: core/post-content
+ * Post Types: page, wp_template
+ * Viewport width: 1400
+ */
+?>
+
+<!-- wp:pattern {"slug":"twentytwentyfour/hidden-portfolio-hero"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/gallery-offset-images-grid-4-col"} /-->
diff --git a/patterns/page-home-portfolio.php b/patterns/page-home-portfolio.php
new file mode 100644
index 00000000..4f3c473f
--- /dev/null
+++ b/patterns/page-home-portfolio.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Title: Portfolio home with post featured images
+ * Slug: twentytwentyfour/page-home-portfolio
+ * Categories: page
+ * Keywords: starter
+ * Block Types: core/post-content
+ * Post Types: page, wp_template
+ * Viewport width: 1400
+ */
+?>
+
+<!-- wp:pattern {"slug":"twentytwentyfour/hidden-portfolio-hero"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/posts-images-only-offset-4-col"} /-->
diff --git a/patterns/page-04-newsletter-landing.php b/patterns/page-newsletter-landing.php
similarity index 97%
rename from patterns/page-04-newsletter-landing.php
rename to patterns/page-newsletter-landing.php
index 24aa7fb5..b731437c 100644
--- a/patterns/page-04-newsletter-landing.php
+++ b/patterns/page-newsletter-landing.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Newsletter Landing Page
- * Slug: twentytwentyfour/newsletter-landing
+ * Title: Newsletter landing
+ * Slug: twentytwentyfour/page-newsletter-landing
  * Categories: call-to-action, page, featured
  * Keywords: starter
  * Block Types: core/post-content
diff --git a/patterns/page-portfolio-overview.php b/patterns/page-portfolio-overview.php
new file mode 100644
index 00000000..3e29b113
--- /dev/null
+++ b/patterns/page-portfolio-overview.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Title: Portfolio project overview
+ * Slug: twentytwentyfour/page-portfolio-overview
+ * Categories: page, featured
+ * Keywords: starter
+ * Block Types: core/post-content
+ * Post Types: page, wp_template
+ * Viewport width: 1400
+ */
+?>
+
+<!-- wp:pattern {"slug":"twentytwentyfour/banner-project-description"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-project-details"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/gallery-full-screen-image"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/text-centered-statement"} /-->
+<!-- wp:pattern {"slug":"twentytwentyfour/gallery-project-layout"} /-->
diff --git a/patterns/page-07-rsvp-landing.php b/patterns/page-rsvp-landing.php
similarity index 98%
rename from patterns/page-07-rsvp-landing.php
rename to patterns/page-rsvp-landing.php
index 28b7cb81..469a1342 100644
--- a/patterns/page-07-rsvp-landing.php
+++ b/patterns/page-rsvp-landing.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: RSVP Landing Page
- * Slug: twentytwentyfour/rsvp-landing
+ * Title: RSVP landing
+ * Slug: twentytwentyfour/page-rsvp-landing
  * Categories: page
  * Keywords: starter
  * Block Types: core/post-content
diff --git a/patterns/posts-one-column.php b/patterns/posts-1-col.php
similarity index 93%
rename from patterns/posts-one-column.php
rename to patterns/posts-1-col.php
index d08f64d3..051ed14d 100644
--- a/patterns/posts-one-column.php
+++ b/patterns/posts-1-col.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: List of Posts in one column
- * Slug: twentytwentyfour/posts-one-column
+ * Title: List of posts, 1 column
+ * Slug: twentytwentyfour/posts-1-col
  * Categories: query
  * Block Types: core/query
  */
@@ -10,7 +10,7 @@
 <!-- wp:query {"query":{"perPage":3,"pages":0,"offset":"0","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"layout":{"type":"constrained"}} -->
 <div class="wp-block-query">
 	<!-- wp:query-no-results -->
-	<!-- wp:pattern {"slug":"twentytwentyfour/no-results-content"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/hidden-no-results"} /-->
 	<!-- /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"}} -->
diff --git a/patterns/posts-three-columns.php b/patterns/posts-3-col.php
similarity index 90%
rename from patterns/posts-three-columns.php
rename to patterns/posts-3-col.php
index 368cad42..62a48c49 100644
--- a/patterns/posts-three-columns.php
+++ b/patterns/posts-3-col.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Title: List of posts in three columns
- * Description: The default post list with featured images, title, date, author, categories and excerpt.
- * Slug: twentytwentyfour/posts-three-columns
+ * Title: List of posts, 3 columns
+ * Slug: twentytwentyfour/posts-3-col
  * Categories: query
  * Block Types: core/query
  */
@@ -11,7 +10,7 @@
 <!-- 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:pattern {"slug":"twentytwentyfour/hidden-no-results"} /-->
 	<!-- /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"}} -->
diff --git a/patterns/posts-featured.php b/patterns/posts-grid-2-col.php
similarity index 97%
rename from patterns/posts-featured.php
rename to patterns/posts-grid-2-col.php
index 2dce08f1..dd2881d4 100644
--- a/patterns/posts-featured.php
+++ b/patterns/posts-grid-2-col.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Three Featured posts
- * Slug: twentytwentyfour/posts-featured
+ * Title: Grid of posts featuring the first post, 2 columns
+ * Slug: twentytwentyfour/posts-grid-2-col
  * Categories: query
  * Block Types: core/query
  */
diff --git a/patterns/posts-three-columns-images.php b/patterns/posts-images-only-3-col.php
similarity index 84%
rename from patterns/posts-three-columns-images.php
rename to patterns/posts-images-only-3-col.php
index 500e5f98..48bf4d08 100644
--- a/patterns/posts-three-columns-images.php
+++ b/patterns/posts-images-only-3-col.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Title: List of posts with featured images in three columns
- * Description: This pattern only shows featured images. Make sure that you have assigned images to your posts.
- * Slug: twentytwentyfour/posts-three-columns-images
+ * Title: Posts with featured images only, 3 columns
+ * Slug: twentytwentyfour/posts-images-only-3-col
  * Categories: query
  * Block Types: core/query
  */
@@ -11,7 +10,7 @@
 <!-- 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:pattern {"slug":"twentytwentyfour/hidden-no-results"} /-->
 	<!-- /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"}} -->
diff --git a/patterns/offset-grid-image-posts.php b/patterns/posts-images-only-offset-4-col.php
similarity index 97%
rename from patterns/offset-grid-image-posts.php
rename to patterns/posts-images-only-offset-4-col.php
index e35804f3..808754b2 100644
--- a/patterns/offset-grid-image-posts.php
+++ b/patterns/posts-images-only-offset-4-col.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Offset Grid of Image Posts
- * Slug: twentytwentyfour/offset-grid-image-posts
+ * Title: Offset posts with featured images only, 4 columns
+ * Slug: twentytwentyfour/posts-images-only-offset-4-col
  * Categories: posts
  */
 ?>
diff --git a/patterns/team.php b/patterns/team-4-col.php
similarity index 98%
rename from patterns/team.php
rename to patterns/team-4-col.php
index a970b4e1..78211d26 100644
--- a/patterns/team.php
+++ b/patterns/team-4-col.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Team
- * Slug: twentytwentyfour/team
+ * Title: Team members, 4 columns
+ * Slug: twentytwentyfour/team-4-col
  * Categories: team, about
  * Viewport width: 1400
  */
diff --git a/patterns/template-archive-blogging.php b/patterns/template-archive-blogging.php
index b3c8403a..6d193a4c 100644
--- a/patterns/template-archive-blogging.php
+++ b/patterns/template-archive-blogging.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Blogging Archive
+ * Title: Blogging archive template
  * Slug: twentytwentyfour/template-archive-blogging
  * Template Types: archive, category, tag, author, date
  * Viewport width: 1400
@@ -14,7 +14,7 @@
 <main class="wp-block-group" style="margin-top:0">
 	<!-- wp:query-title {"type":"archive","style":{"typography":{"lineHeight":"1"},"spacing":{"padding":{"top":"var:preset|spacing|50"}}}} /-->
 
-	<!-- wp:pattern {"slug":"twentytwentyfour/posts-one-column"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-1-col"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/patterns/template-archive-portfolio.php b/patterns/template-archive-portfolio.php
index e9e3dfbc..aa347ad1 100644
--- a/patterns/template-archive-portfolio.php
+++ b/patterns/template-archive-portfolio.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Portfolio Archive
+ * Title: Portfolio archive template
  * Slug: twentytwentyfour/template-archive-portfolio
  * Template Types: archive
  * Viewport width: 1400
@@ -15,7 +15,7 @@
 
 	<!-- wp:query-title {"type":"archive","align":"wide","style":{"typography":{"lineHeight":"1"},"spacing":{"padding":{"top":"var:preset|spacing|50"}}}} /-->
 
-	<!-- wp:pattern {"slug":"twentytwentyfour/posts-three-columns-images"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-images-only-3-col"} /-->
 
 </main>
 <!-- /wp:group -->
diff --git a/patterns/template-home-blogging.php b/patterns/template-home-blogging.php
index b6703703..283e420a 100644
--- a/patterns/template-home-blogging.php
+++ b/patterns/template-home-blogging.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Blogging Home
+ * Title: Blogging home template
  * Slug: twentytwentyfour/template-home-blogging
  * Template Types: front-page, index, home, page
  * Viewport width: 1400
@@ -13,7 +13,7 @@
 <!-- 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/blogging-home"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/page-home-blogging"} /-->
 
 </main>
 <!-- /wp:group -->
diff --git a/patterns/template-home-business.php b/patterns/template-home-business.php
index 47c232f7..e6a41b74 100644
--- a/patterns/template-home-business.php
+++ b/patterns/template-home-business.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Business Home
+ * Title: Business home template
  * Slug: twentytwentyfour/template-home
  * Template Types: front-page, index, home
  * Viewport width: 1400
@@ -12,7 +12,7 @@
 
 <!-- wp:group {"tagName":"main","style":{"spacing":{"blockGap":"0","margin":{"top":"0"}}},"layout":{"type":"default"}} -->
 <main class="wp-block-group" style="margin-top:0">
-	<!-- wp:pattern {"slug":"twentytwentyfour/home"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/home-business"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/patterns/template-home-portfolio.php b/patterns/template-home-portfolio.php
index 5e8f6708..74eb6b2e 100644
--- a/patterns/template-home-portfolio.php
+++ b/patterns/template-home-portfolio.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Portfolio Home
+ * Title: Portfolio home template with post featured images
  * Slug: twentytwentyfour/template-home-portfolio
  * Template Types: front-page, index, home, page
  * Viewport width: 1400
@@ -13,8 +13,8 @@
 <!-- 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"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/hidden-portfolio-hero"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-images-only-offset-4-col"} /-->
 
 </main>
 <!-- /wp:group -->
diff --git a/patterns/template-index-blogging.php b/patterns/template-index-blogging.php
index fca4cfbe..b8101863 100644
--- a/patterns/template-index-blogging.php
+++ b/patterns/template-index-blogging.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Blogging Index
+ * Title: Blogging index template
  * Slug: twentytwentyfour/template-index-blogging
  * Template Types: index, home
  * Viewport width: 1400
@@ -16,7 +16,7 @@
 	<h1 class="wp-block-heading" style="padding-top:var(--wp--preset--spacing--50);line-height:1"><?php esc_html_e( 'Watch, Read, Listen', 'twentytwentyfour' ); ?></h1>
 	<!-- /wp:heading -->
 
-	<!-- wp:pattern {"slug":"twentytwentyfour/posts-one-column"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-1-col"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/patterns/template-index-portfolio.php b/patterns/template-index-portfolio.php
index 7f4da0c2..7b78323d 100644
--- a/patterns/template-index-portfolio.php
+++ b/patterns/template-index-portfolio.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Portfolio Index
+ * Title: Portfolio index template
  * Slug: twentytwentyfour/template-index-portfolio
  * Template Types: index
  * Viewport width: 1400
@@ -16,7 +16,7 @@
 	<h1 class="wp-block-heading alignwide" style="padding-top:var(--wp--preset--spacing--50)"><?php esc_html_e( 'Posts', 'twentytwentyfour' ); ?></h1>
 	<!-- /wp:heading -->
 
-	<!-- wp:pattern {"slug":"twentytwentyfour/offset-grid-image-posts"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-images-only-offset-4-col"} /-->
 
 </main>
 <!-- /wp:group -->
diff --git a/patterns/template-search-portfolio.php b/patterns/template-search-portfolio.php
index 840a05b5..1c60eb18 100644
--- a/patterns/template-search-portfolio.php
+++ b/patterns/template-search-portfolio.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Portfolio Search
+ * Title: Portfolio search template
  * Slug: twentytwentyfour/template-search-portfolio
  * Template Types: search
  * Viewport width: 1400
@@ -16,11 +16,11 @@
 
 	<!-- wp:group {"align":"wide","layout":{"type":"constrained","contentSize":"840px","justifyContent":"left"}} -->
 	<div class="wp-block-group alignwide">
-		<!-- wp:pattern {"slug":"twentytwentyfour/search"} /-->
+		<!-- wp:pattern {"slug":"twentytwentyfour/hidden-search"} /-->
 	</div>
 	<!-- /wp:group -->
 
-	<!-- wp:pattern {"slug":"twentytwentyfour/posts-three-columns-images"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-images-only-3-col"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/patterns/template-search-writer.php b/patterns/template-search-writer.php
index 9e79e9bf..ec9a29b8 100644
--- a/patterns/template-search-writer.php
+++ b/patterns/template-search-writer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Blogging Search Results
+ * Title: Blogging search template
  * Slug: twentytwentyfour/template-search-blogging
  * Template Types: search
  * Viewport width: 1400
@@ -15,11 +15,11 @@
 	<!-- wp:group {"layout":{"type":"default"}} -->
 	<div class="wp-block-group">
 		<!-- wp:query-title {"type":"search","style":{"typography":{"lineHeight":"1"},"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|30"}}}} /-->
-		<!-- wp:pattern {"slug":"twentytwentyfour/search"} /-->
+		<!-- wp:pattern {"slug":"twentytwentyfour/hidden-search"} /-->
 	</div>
 	<!-- /wp:group -->
 
-	<!-- wp:pattern {"slug":"twentytwentyfour/posts-one-column"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-1-col"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/patterns/template-single-portfolio.php b/patterns/template-single-portfolio.php
index 21e5a351..ba54d581 100644
--- a/patterns/template-single-portfolio.php
+++ b/patterns/template-single-portfolio.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Portfolio Single post
+ * Title: Portfolio single post template
  * Slug: twentytwentyfour/template-single-portfolio
  * Template Types: posts, single
  * Viewport width: 1400
diff --git a/patterns/testimonial-centered.php b/patterns/testimonial-centered.php
index 4bdbf776..8e63924b 100644
--- a/patterns/testimonial-centered.php
+++ b/patterns/testimonial-centered.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Centered Testimonial
+ * Title: Centered testimonial
  * Slug: twentytwentyfour/testimonial-centered
  * Keywords: quote, review, about
  * Categories: testimonials, text
diff --git a/patterns/features-with-images.php b/patterns/text-alternating-images.php
similarity index 98%
rename from patterns/features-with-images.php
rename to patterns/text-alternating-images.php
index 9915ba12..12a07724 100644
--- a/patterns/features-with-images.php
+++ b/patterns/text-alternating-images.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Title: Features with Images
- * Slug: twentytwentyfour/features-with-images
- * Categories: text
+ * Title: Text with alternating images
+ * Slug: twentytwentyfour/text-alternating-images
+ * Categories: text, about
  * Viewport width: 1400
  */
 ?>
diff --git a/patterns/text-centered-title.php b/patterns/text-centered-statement-small.php
similarity index 90%
rename from patterns/text-centered-title.php
rename to patterns/text-centered-statement-small.php
index 28349667..c24a51a5 100644
--- a/patterns/text-centered-title.php
+++ b/patterns/text-centered-statement-small.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Title: Centered title
- * Slug: twentytwentyfour/text-centered-title
+ * Title: Centered statement, small
+ * Slug: twentytwentyfour/text-centered-statement-small
  * Categories: text, about
+ * Keywords: mission, introduction
  * Viewport width: 1200
  */
 ?>
diff --git a/patterns/centered-statement.php b/patterns/text-centered-statement.php
similarity index 93%
rename from patterns/centered-statement.php
rename to patterns/text-centered-statement.php
index 7f684da6..ce7751e0 100644
--- a/patterns/centered-statement.php
+++ b/patterns/text-centered-statement.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Title: Centered Statement
- * Slug: twentytwentyfour/centered-statement
+ * Title: Centered statement
+ * Slug: twentytwentyfour/text-centered-statement
  * Categories: text, about, featured
- * Keywords: statement, centered
+ * Keywords: mission, introduction
  * Viewport width: 1400
  */
 ?>
diff --git a/patterns/faq.php b/patterns/text-faq.php
similarity index 98%
rename from patterns/faq.php
rename to patterns/text-faq.php
index f00c1a56..284e895c 100644
--- a/patterns/faq.php
+++ b/patterns/text-faq.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Title: Faq
- * Slug: twentytwentyfour/faq
+ * Title: FAQ
+ * Slug: twentytwentyfour/text-faq
  * Categories: text, about, featured
- * Keywords: faq, about
+ * Keywords: faq, about, frequently asked
  * Viewport width: 1400
  */
 ?>
diff --git a/patterns/feature-grid.php b/patterns/text-feature-grid-3-col.php
similarity index 98%
rename from patterns/feature-grid.php
rename to patterns/text-feature-grid-3-col.php
index d8523388..f03eaf3b 100644
--- a/patterns/feature-grid.php
+++ b/patterns/text-feature-grid-3-col.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Feature grid
- * Slug: twentytwentyfour/feature-grid
+ * Title: Feature grid, 3 columns
+ * Slug: twentytwentyfour/text-feature-grid-3-col
  * Categories: text, about
  * Viewport width: 1400
  */
diff --git a/patterns/project-details.php b/patterns/text-project-details.php
similarity index 97%
rename from patterns/project-details.php
rename to patterns/text-project-details.php
index 6521bbb0..b75f8694 100644
--- a/patterns/project-details.php
+++ b/patterns/text-project-details.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Title: Project Details
- * Slug: twentytwentyfour/project-details
+ * Title: Project details
+ * Slug: twentytwentyfour/text-project-details
  * Categories: text, portfolio
  * Viewport width: 1400
  */
diff --git a/templates/404.html b/templates/404.html
index a7510290..37abd55f 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -2,7 +2,7 @@
 
 <!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"},"blockGap":"var:preset|spacing|30"}},"layout":{"type":"constrained"}} -->
 <main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--50);margin-bottom:var(--wp--preset--spacing--50)">
-	<!-- wp:pattern {"slug":"twentytwentyfour/404"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/hidden-404"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/templates/archive.html b/templates/archive.html
index b0e08668..e4307229 100644
--- a/templates/archive.html
+++ b/templates/archive.html
@@ -5,7 +5,7 @@
 
 	<!-- wp:query-title {"type":"archive","align":"wide","style":{"typography":{"lineHeight":"1"},"spacing":{"padding":{"top":"var:preset|spacing|50"}}}} /-->
 
-	<!-- wp:pattern {"slug":"twentytwentyfour/posts-three-columns"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-3-col"} /-->
 
 </main>
 <!-- /wp:group -->
diff --git a/templates/index.html b/templates/index.html
index a388957b..fd93725d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,7 +5,7 @@
 	<!-- wp:heading {"level":1,"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|50"}}}} -->
 	<h1 class="wp-block-heading alignwide" style="padding-top:var(--wp--preset--spacing--50)">Posts</h1>
 	<!-- /wp:heading -->
-	<!-- wp:pattern {"slug":"twentytwentyfour/posts-three-columns"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-3-col"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/templates/search.html b/templates/search.html
index 43f42d3e..c4d2f90d 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -6,11 +6,11 @@
 
 	<!-- wp:group {"align":"wide","layout":{"type":"constrained","contentSize":"840px","justifyContent":"left"}} -->
 	<div class="wp-block-group alignwide">
-		<!-- wp:pattern {"slug":"twentytwentyfour/search"} /-->
+		<!-- wp:pattern {"slug":"twentytwentyfour/hidden-search"} /-->
 	</div>
 	<!-- /wp:group -->
 
-	<!-- wp:pattern {"slug":"twentytwentyfour/posts-three-columns"} /-->
+	<!-- wp:pattern {"slug":"twentytwentyfour/posts-3-col"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/templates/single-with-sidebar.html b/templates/single-with-sidebar.html
index 75d11d89..990a3a89 100644
--- a/templates/single-with-sidebar.html
+++ b/templates/single-with-sidebar.html
@@ -11,7 +11,7 @@
                 <!-- wp:post-featured-image {"style":{"spacing":{"padding":{"bottom":"2vh"}}}} /-->
 
                 <!-- wp:post-title {"level":1,"fontSize":"x-large"} /-->
-                
+
                 <!-- wp:template-part {"slug":"post-meta"} /-->
 
                 <!-- wp:spacer {"height":"var:preset|spacing|10"} -->
@@ -20,34 +20,34 @@
 
             </div>
             <!-- /wp:group -->
-    
+
             <!-- 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":"  "} /-->
             </div>
             <!-- /wp:group -->
-    
+
             <!-- wp:group {"layout":{"type":"constrained"}} -->
             <div class="wp-block-group">
                 <!-- wp:spacer {"height":"4rem"} -->
                 <div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
                 <!-- /wp:spacer -->
-    
-                <!-- wp:pattern {"slug":"twentytwentyfour/comments"} /-->
-    
+
+                <!-- wp:pattern {"slug":"twentytwentyfour/hidden-comments"} /-->
+
                 <!-- wp:spacer {"height":"4rem"} -->
                 <div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
                 <!-- /wp:spacer -->
-    
-                <!-- wp:pattern {"slug":"twentytwentyfour/post-navigation"} /-->
-    
+
+                <!-- wp:pattern {"slug":"twentytwentyfour/hidden-post-navigation"} /-->
+
             </div>
             <!-- /wp:group -->
         </div>
         <!-- /wp:column -->
-    
+
         <!-- wp:column {"width":"30%"} -->
         <div class="wp-block-column" style="flex-basis:30%">
             <!-- wp:template-part {"slug":"sidebar","tagName":"aside"} /-->
diff --git a/templates/single.html b/templates/single.html
index 9d1111f3..fced18d1 100644
--- a/templates/single.html
+++ b/templates/single.html
@@ -35,9 +35,9 @@
 			<hr class="wp-block-separator has-text-color has-base-3-color has-alpha-channel-opacity has-base-3-background-color has-background is-style-wide" style="margin-bottom:var(--wp--preset--spacing--40)"/>
 			<!-- /wp:separator -->
 
-			<!-- wp:pattern {"slug":"twentytwentyfour/comments"} /-->
+			<!-- wp:pattern {"slug":"twentytwentyfour/hidden-comments"} /-->
 
-			<!-- wp:pattern {"slug":"twentytwentyfour/post-navigation"} /-->
+			<!-- wp:pattern {"slug":"twentytwentyfour/hidden-post-navigation"} /-->
 
 		</div>
 		<!-- /wp:group -->