diff --git a/bysshe/patterns/404.php b/bysshe/patterns/404.php
index 665ef2e6a8..b2a0a6b896 100644
--- a/bysshe/patterns/404.php
+++ b/bysshe/patterns/404.php
@@ -2,7 +2,6 @@
 /**
  * Title: 404
  * Slug: bysshe/404
- * Categories: hidden
  * Inserter: no
  */
 ?>
@@ -11,7 +10,7 @@
 <header class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
 
 <!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('• •', 'Decorative symbols', 'bysshe');?></p>
+<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
 <!-- /wp:paragraph --></header>
 <!-- /wp:group -->
 
@@ -20,14 +19,14 @@
 <!-- /wp:spacer -->
 
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
-<main class="wp-block-group"><!-- wp:columns -->
+<main class="wp-block-group"><!-- wp:columns {"style":{"spacing":{"blockGap":{"top":"0","left":"var:preset|spacing|50"}}}} -->
 <div class="wp-block-columns"><!-- wp:column {"width":"40%"} -->
 <div class="wp-block-column" style="flex-basis:40%"></div>
 <!-- /wp:column -->
 
 <!-- wp:column {"width":"","style":{"spacing":{"padding":{"right":"var:preset|spacing|80"}}}} -->
 <div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--80)"><!-- wp:heading {"style":{"typography":{"textTransform":"lowercase","fontStyle":"normal","fontWeight":"400"}},"fontSize":"medium"} -->
-<h2 class="wp-block-heading has-medium-font-size" style="font-style:normal;font-weight:400;text-transform:lowercase"><?php echo esc_html_e('Oops, we lost you...', 'bysshe');?></h2>
+<h2 class="wp-block-heading has-medium-font-size" style="font-style:normal;font-weight:400;text-transform:lowercase"><?php esc_html_e('Oops, we lost you...', 'bysshe');?></h2>
 <!-- /wp:heading -->
 
 <!-- wp:spacer {"height":"50px","style":{"layout":[]}} -->
@@ -45,18 +44,12 @@
 
 <!-- wp:group {"tagName":"footer","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
 <footer class="wp-block-group"><!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('• •', 'Decorative symbols', 'bysshe');?></p>
+<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"className":"no-underline","style":{"typography":{"lineHeight":"1.3","textTransform":"uppercase","fontStyle":"normal","fontWeight":"400"}},"fontSize":"xxx-small"} -->
-<p class="no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php
-	/* Translators: WordPress link. */
-	$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'bysshe' ) ) . '" rel="nofollow">WordPress</a>';
-	echo sprintf(
-		esc_html__( 'Designed with %1$s', 'bysshe' ),
-		$wordpress_link
-	);
-?></p>
+<p class="no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php /* Translators: 1. is the start of a 'a' HTML element, 2. is the end of a 'a' HTML element */ 
+echo sprintf( esc_html__( 'Designed with %1$sWordPress%2$s', 'bysshe' ), '<a href="' . esc_url( 'https://wordpress.org' ) . '" rel="nofollow">', '</a>' ); ?></p>
 <!-- /wp:paragraph --></footer>
 <!-- /wp:group --></div>
-<!-- /wp:group -->
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/bysshe/patterns/archive.php b/bysshe/patterns/archive.php
index a72a3b3592..87a64a8b34 100644
--- a/bysshe/patterns/archive.php
+++ b/bysshe/patterns/archive.php
@@ -5,8 +5,8 @@
  * Inserter: no
  */
 ?>
-<!-- wp:group {"style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"top":"var:preset|spacing|80","right":"var:preset|spacing|80","bottom":"var:preset|spacing|80","left":"var:preset|spacing|80"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
-<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:columns {"verticalAlignment":null,"style":{"layout":{"selfStretch":"fill","flexSize":null}}} -->
+<!-- wp:group {"style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"right":"var:preset|spacing|80","left":"var:preset|spacing|80","top":"var:preset|spacing|80","bottom":"var:preset|spacing|80"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
+<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:columns {"style":{"layout":{"selfStretch":"fill","flexSize":null},"spacing":{"blockGap":{"top":"0","left":"var:preset|spacing|50"}}}} -->
 <div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"stretch","width":"45%"} -->
 <div class="wp-block-column is-vertically-aligned-stretch" style="flex-basis:45%"><!-- wp:group {"style":{"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
 <div class="wp-block-group" style="min-height:100%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
@@ -49,29 +49,29 @@
 
 <!-- wp:column {"width":"45%"} -->
 <div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"style":{"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
-<div class="wp-block-group" style="min-height:100%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
+<div class="wp-block-group" style="min-height:100%"><!-- wp:group {"tagName":"header","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<header class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
 <p class="has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:site-title {"textAlign":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /--></div>
+<!-- wp:site-title {"textAlign":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /--></header>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|80","left":"var:preset|spacing|80"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|80","left":"var:preset|spacing|80"}},"layout":{"selfStretch":"fill","flexSize":null},"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"center"}} -->
+<div class="wp-block-group" style="min-height:100%;padding-right:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
 <p class="has-xx-small-font-size" style="font-style:normal;font-weight:400"><?php esc_html_e('Poetry, in a general sense, may be defined to be “the expression of the imagination”: and poetry is connate with the origin of man.', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:spacer {"height":"40px","style":{"layout":[]}} -->
-<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"40px","selfStretch":"fixed"}}} -->
+<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:query {"queryId":10,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-<div class="wp-block-query"><!-- wp:post-template -->
+<!-- wp:query {"queryId":10,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"tagName":"main"} -->
+<main class="wp-block-query"><!-- wp:post-template -->
 <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30","margin":{"top":"0","bottom":"0"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
 <div class="wp-block-group" style="margin-top:0;margin-bottom:0"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontStyle":"normal","fontWeight":"400","textTransform":"none"},"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}},"fontSize":"small"} /-->
 
@@ -79,6 +79,12 @@
 <!-- /wp:group -->
 <!-- /wp:post-template -->
 
+<!-- wp:query-no-results -->
+<!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
+<p class="has-xx-small-font-size" style="font-style:normal;font-weight:400"><?php esc_html_e('Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'bysshe');?></p>
+<!-- /wp:paragraph -->
+<!-- /wp:query-no-results -->
+
 <!-- wp:spacer {"height":"40px","style":{"layout":[]}} -->
 <div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
@@ -87,7 +93,7 @@
 <!-- wp:query-pagination-previous {"label":"Previous"} /-->
 
 <!-- wp:query-pagination-next {"label":"Next"} /-->
-<!-- /wp:query-pagination --></div>
+<!-- /wp:query-pagination --></main>
 <!-- /wp:query --></div>
 <!-- /wp:group -->
 
@@ -95,13 +101,13 @@
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
+<!-- wp:group {"tagName":"footer","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<footer class="wp-block-group"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
 
 <!-- wp:paragraph {"className":"no-underline","style":{"typography":{"lineHeight":"1.3","textTransform":"uppercase","fontStyle":"normal","fontWeight":"400"}},"fontSize":"xxx-small"} -->
 <p class="no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php /* Translators: 1. is the start of a 'a' HTML element, 2. is the end of a 'a' HTML element */ 
 echo sprintf( esc_html__( 'Designed with %1$sWordPress%2$s', 'bysshe' ), '<a href="' . esc_url( 'https://wordpress.org' ) . '" rel="nofollow">', '</a>' ); ?></p>
-<!-- /wp:paragraph --></div>
+<!-- /wp:paragraph --></footer>
 <!-- /wp:group --></div>
 <!-- /wp:group --></div>
 <!-- /wp:column --></div>
diff --git a/bysshe/patterns/index.php b/bysshe/patterns/index.php
index 16cde87c2c..7ca451539c 100644
--- a/bysshe/patterns/index.php
+++ b/bysshe/patterns/index.php
@@ -2,40 +2,36 @@
 /**
  * Title: index
  * Slug: bysshe/index
- * Categories: hidden
  * Inserter: no
  */
 ?>
 <!-- wp:group {"style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"top":"var:preset|spacing|80","right":"var:preset|spacing|80","bottom":"var:preset|spacing|80","left":"var:preset|spacing|80"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
-<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:group {"tagName":"header","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<header class="wp-block-group"><!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('•', 'Decorative symbols', 'bysshe');?></p>
+<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group"><!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
+<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('•', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('• •', 'Decorative symbols', 'bysshe');?></p>
-<!-- /wp:paragraph --></header>
+<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
+<!-- /wp:paragraph --></div>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"tagName":"main","layout":{"type":"constrained","contentSize":""}} -->
-<main class="wp-block-group"><!-- wp:columns {"verticalAlignment":"center"} -->
-<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"45%"} -->
-<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:45%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"center","verticalAlignment":"center"}} -->
-<div class="wp-block-group"><!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
-<div class="wp-block-group"><!-- wp:group {"layout":{"type":"constrained","contentSize":"36px"}} -->
-<div class="wp-block-group"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/wolfgang-hasselmann-pVr6wvUneMk-unsplash-scaled.jpg","dimRatio":0,"minHeight":50,"minHeightUnit":"vh","isDark":false,"style":{"layout":{"selfStretch":"fixed","flexSize":"50vh"}}} -->
-<div class="wp-block-cover is-light" style="min-height:50vh"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/wolfgang-hasselmann-pVr6wvUneMk-unsplash-scaled.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"Write title…","fontSize":"xxx-small"} -->
+<!-- wp:columns {"verticalAlignment":"center","style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"padding":{"right":"0","left":"0","top":"0","bottom":"0"},"margin":{"top":"0","bottom":"0"},"blockGap":{"top":"0","left":"var:preset|spacing|50"}}}} -->
+<div class="wp-block-columns are-vertically-aligned-center" style="margin-top:0;margin-bottom:0;padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:column {"verticalAlignment":"center","width":"45%"} -->
+<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:45%"><!-- wp:group {"tagName":"header","style":{"dimensions":{"minHeight":""}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
+<header class="wp-block-group"><!-- wp:group {"layout":{"type":"constrained","contentSize":"36px"}} -->
+<div class="wp-block-group"><!-- wp:cover {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/wolfgang-hasselmann-pVr6wvUneMk-unsplash-scaled.jpg","dimRatio":0,"minHeight":50,"minHeightUnit":"vh","isDark":false,"style":{"layout":{"selfStretch":"fixed","flexSize":"50vh"}}} -->
+<div class="wp-block-cover is-light" style="min-height:50vh"><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/wolfgang-hasselmann-pVr6wvUneMk-unsplash-scaled.jpg" data-object-fit="cover"/><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"Write title…","fontSize":"xxx-small"} -->
 <p class="has-text-align-center has-xxx-small-font-size"></p>
 <!-- /wp:paragraph --></div></div>
 <!-- /wp:cover --></div>
 <!-- /wp:group -->
 
-<!-- wp:site-title {"level":0,"fontSize":"large"} /--></div>
-<!-- /wp:group --></div>
+<!-- wp:site-title {"level":0,"fontSize":"large"} /--></header>
 <!-- /wp:group --></div>
 <!-- /wp:column -->
 
@@ -44,47 +40,56 @@
 <!-- /wp:column -->
 
 <!-- wp:column {"verticalAlignment":"center","width":"45%"} -->
-<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:45%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|80"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--80)"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
+<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:45%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|80","left":"var:preset|spacing|80","top":"0","bottom":"0"}},"dimensions":{"minHeight":""}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
+<div class="wp-block-group" style="padding-top:0;padding-right:var(--wp--preset--spacing--80);padding-bottom:0;padding-left:var(--wp--preset--spacing--80)"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
 <p class="has-xx-small-font-size" style="font-style:normal;font-weight:400"><?php esc_html_e('Poetry, in a general sense, may be defined to be “the expression of the imagination”: and poetry is connate with the origin of man.', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:spacer {"height":"40px","style":{"layout":[]}} -->
-<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"40px","selfStretch":"fixed"}}} -->
+<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:query {"queryId":7,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-<div class="wp-block-query"><!-- wp:post-template -->
+<!-- wp:query {"queryId":7,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"tagName":"main"} -->
+<main class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default","columnCount":3}} -->
 <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
 <div class="wp-block-group"><!-- wp:post-title {"isLink":true} /-->
 
 <!-- wp:post-date {"format":"M j Y","isLink":true,"className":"nowrap"} /--></div>
 <!-- /wp:group -->
-<!-- /wp:post-template --></div>
+<!-- /wp:post-template -->
+
+<!-- wp:query-no-results -->
+<!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
+<p class="has-xx-small-font-size" style="font-style:normal;font-weight:400"><?php esc_html_e('Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'bysshe');?></p>
+<!-- /wp:paragraph -->
+<!-- /wp:query-no-results -->
+
+<!-- wp:spacer {"height":"40px","style":{"layout":[]}} -->
+<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:query-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<!-- wp:query-pagination-previous {"label":"Previous"} /-->
+
+<!-- wp:query-pagination-next {"label":"Next"} /-->
+<!-- /wp:query-pagination --></main>
 <!-- /wp:query --></div>
 <!-- /wp:group --></div>
 <!-- /wp:column --></div>
-<!-- /wp:columns --></main>
-<!-- /wp:group -->
+<!-- /wp:columns -->
 
 <!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"tagName":"footer","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<footer class="wp-block-group"><!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('• •', 'Decorative symbols', 'bysshe');?></p>
+<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group"><!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
+<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"align":"right","className":"no-underline","style":{"typography":{"lineHeight":"1.3","fontStyle":"normal","fontWeight":"400","textTransform":"uppercase"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php
-	/* Translators: WordPress link. */
-	$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'bysshe' ) ) . '" rel="nofollow">WordPress</a>';
-	echo sprintf(
-		esc_html__( 'Designed with %1$s', 'bysshe' ),
-		$wordpress_link
-	);
-?></p>
-<!-- /wp:paragraph --></footer>
+<p class="has-text-align-right no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php /* Translators: 1. is the start of a 'a' HTML element, 2. is the end of a 'a' HTML element */ 
+echo sprintf( esc_html__( 'Designed with %1$sWordPress%2$s', 'bysshe' ), '<a href="' . esc_url( 'https://wordpress.org' ) . '" rel="nofollow">', '</a>' ); ?></p>
+<!-- /wp:paragraph --></div>
 <!-- /wp:group --></div>
-<!-- /wp:group -->
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/bysshe/patterns/page.php b/bysshe/patterns/page.php
index 1bc5fc71b5..9cb3c8104a 100644
--- a/bysshe/patterns/page.php
+++ b/bysshe/patterns/page.php
@@ -2,7 +2,6 @@
 /**
  * Title: page
  * Slug: bysshe/page
- * Categories: hidden
  * Inserter: no
  */
 ?>
diff --git a/bysshe/patterns/search.php b/bysshe/patterns/search.php
index 8617385ab1..9072b2de32 100644
--- a/bysshe/patterns/search.php
+++ b/bysshe/patterns/search.php
@@ -2,71 +2,74 @@
 /**
  * Title: search
  * Slug: bysshe/search
- * Categories: hidden
  * Inserter: no
  */
 ?>
-<!-- wp:group {"style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"top":"var:preset|spacing|80","right":"var:preset|spacing|80","bottom":"var:preset|spacing|80","left":"var:preset|spacing|80"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
-<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:group {"tagName":"header","layout":{"type":"default"}} -->
-<header class="wp-block-group"><!-- wp:columns -->
-<div class="wp-block-columns"><!-- wp:column {"width":"45%"} -->
-<div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<!-- wp:group {"style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"top":"var:preset|spacing|80","right":"var:preset|spacing|80","bottom":"var:preset|spacing|80","left":"var:preset|spacing|80"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
+<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:columns {"style":{"layout":{"selfStretch":"fill","flexSize":null}}} -->
+<div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"stretch","width":"45%"} -->
+<div class="wp-block-column is-vertically-aligned-stretch" style="flex-basis:45%"><!-- wp:group {"style":{"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
+<div class="wp-block-group" style="min-height:100%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
 <div class="wp-block-group"><!-- wp:paragraph {"align":"right","style":{"typography":{"textTransform":"uppercase","fontStyle":"normal","fontWeight":"400","lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
 <p class="has-text-align-right has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php esc_html_e('Search', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:query-title {"type":"search"} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"width":"10%"} -->
-<div class="wp-block-column" style="flex-basis:10%"></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"width":"45%"} -->
-<div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('• •', 'Decorative symbols', 'bysshe');?></p>
-<!-- /wp:paragraph -->
-
-<!-- wp:site-title {"textAlign":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></header>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"constrained","contentSize":""}} -->
-<main class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:columns {"verticalAlignment":"center"} -->
-<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"45%","style":{"spacing":{"padding":{"right":"0"}}}} -->
-<div class="wp-block-column is-vertically-aligned-center" style="padding-right:0;flex-basis:45%"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0","right":"var:preset|spacing|70","bottom":"0","left":"var:preset|spacing|70"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"center","verticalAlignment":"center"}} -->
-<div class="wp-block-group" style="padding-top:0;padding-right:var(--wp--preset--spacing--70);padding-bottom:0;padding-left:var(--wp--preset--spacing--70)"><!-- wp:cover {"useFeaturedImage":true,"dimRatio":80,"overlayColor":"background","isUserOverlayColor":true,"minHeight":50,"minHeightUnit":"vh","isDark":false,"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","right":"var:preset|spacing|80","bottom":"var:preset|spacing|70","left":"var:preset|spacing|80"}},"color":{"duotone":["#000000","#ffffff"]}}} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0","right":"var:preset|spacing|80","bottom":"0","left":"var:preset|spacing|80"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"center","verticalAlignment":"center"}} -->
+<div class="wp-block-group" style="padding-top:0;padding-right:var(--wp--preset--spacing--80);padding-bottom:0;padding-left:var(--wp--preset--spacing--80)"><!-- wp:cover {"useFeaturedImage":true,"dimRatio":80,"overlayColor":"background","isUserOverlayColor":true,"minHeight":50,"minHeightUnit":"vh","isDark":false,"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","right":"var:preset|spacing|80","bottom":"var:preset|spacing|70","left":"var:preset|spacing|80"}},"color":{"duotone":["#000000","#ffffff"]}}} -->
 <div class="wp-block-cover is-light" style="padding-top:var(--wp--preset--spacing--70);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--80);min-height:50vh"><span aria-hidden="true" class="wp-block-cover__background has-background-background-color has-background-dim-80 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group"><!-- wp:post-featured-image {"width":"8rem","height":"15rem","style":{"color":{"duotone":["#000000","#ffffff"]}}} /--></div>
 <!-- /wp:group --></div></div>
 <!-- /wp:cover --></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
+<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group"><!-- wp:query-title {"type":"search"} /-->
+
+<!-- wp:paragraph {"align":"right","style":{"typography":{"textTransform":"uppercase","fontStyle":"normal","fontWeight":"400","lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
+<p class="has-text-align-right has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php esc_html_e('Search', 'bysshe');?></p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:group --></div>
 <!-- /wp:group --></div>
 <!-- /wp:column -->
 
-<!-- wp:column {"verticalAlignment":"center","width":"10%","style":{"spacing":{"padding":{"right":"0"}}}} -->
-<div class="wp-block-column is-vertically-aligned-center" style="padding-right:0;flex-basis:10%"></div>
+<!-- wp:column {"width":"10%"} -->
+<div class="wp-block-column" style="flex-basis:10%"></div>
 <!-- /wp:column -->
 
-<!-- wp:column {"verticalAlignment":"center","width":"45%","style":{"spacing":{"padding":{"right":"0","left":"0"}}}} -->
-<div class="wp-block-column is-vertically-aligned-center" style="padding-right:0;padding-left:0;flex-basis:45%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|80"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--80)">
+<!-- wp:column {"width":"45%"} -->
+<div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"style":{"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
+<div class="wp-block-group" style="min-height:100%"><!-- wp:group {"tagName":"header","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<header class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
+<p class="has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
+<!-- /wp:paragraph -->
+
+<!-- wp:site-title {"textAlign":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /--></header>
+<!-- /wp:group -->
 
-<!-- wp:search {"showLabel":false,"placeholder":"Search...","buttonUseIcon":true} /-->
+<!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
+<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|80","left":"var:preset|spacing|80"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:search {"showLabel":false,"placeholder":"Search...","widthUnit":"%","buttonUseIcon":true} /-->
 
 <!-- wp:spacer {"height":"40px","style":{"layout":[]}} -->
 <div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:query {"queryId":10,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-<div class="wp-block-query"><!-- wp:post-template -->
+<!-- wp:query {"queryId":10,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"tagName":"main"} -->
+<main class="wp-block-query"><!-- wp:post-template -->
 <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30","margin":{"top":"0","bottom":"0"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
 <div class="wp-block-group" style="margin-top:0;margin-bottom:0"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontStyle":"normal","fontWeight":"400","textTransform":"none"},"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}},"fontSize":"small"} /-->
 
@@ -75,62 +78,36 @@
 <!-- /wp:post-template -->
 
 <!-- wp:query-no-results -->
-	<!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
-	<p class="has-xx-small-font-size" style="font-style:normal;font-weight:400"><?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', 'bysshe' ); ?></p>
+<!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
+<p class="has-xx-small-font-size" style="font-style:normal;font-weight:400"><?php esc_html_e('Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 <!-- /wp:query-no-results -->
 
-<!-- wp:spacer {"height":"64px","style":{"layout":[]}} -->
-<div style="height:64px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- wp:spacer {"height":"40px","style":{"layout":[]}} -->
+<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
 <!-- wp:query-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
 <!-- wp:query-pagination-previous {"label":"Previous"} /-->
 
 <!-- wp:query-pagination-next {"label":"Next"} /-->
-<!-- /wp:query-pagination --></div>
+<!-- /wp:query-pagination --></main>
 <!-- /wp:query --></div>
-<!-- /wp:group --></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></main>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"tagName":"footer","layout":{"type":"default"}} -->
-<footer class="wp-block-group"><!-- wp:columns -->
-<div class="wp-block-columns"><!-- wp:column {"width":"45%"} -->
-<div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:query-title {"type":"search"} /-->
+<!-- wp:group {"tagName":"footer","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<footer class="wp-block-group"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
 
-<!-- wp:paragraph {"align":"right","style":{"typography":{"textTransform":"uppercase","fontStyle":"normal","fontWeight":"400","lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php esc_html_e('Search', 'bysshe');?></p>
-<!-- /wp:paragraph --></div>
+<!-- wp:paragraph {"className":"no-underline","style":{"typography":{"lineHeight":"1.3","textTransform":"uppercase","fontStyle":"normal","fontWeight":"400"}},"fontSize":"xxx-small"} -->
+<p class="no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php /* Translators: 1. is the start of a 'a' HTML element, 2. is the end of a 'a' HTML element */ 
+echo sprintf( esc_html__( 'Designed with %1$sWordPress%2$s', 'bysshe' ), '<a href="' . esc_url( 'https://wordpress.org' ) . '" rel="nofollow">', '</a>' ); ?></p>
+<!-- /wp:paragraph --></footer>
 <!-- /wp:group --></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"width":"10%"} -->
-<div class="wp-block-column" style="flex-basis:10%"></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"width":"45%"} -->
-<div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
-
-<!-- wp:paragraph {"align":"right","className":"no-underline","style":{"typography":{"lineHeight":"1.3","fontStyle":"normal","fontWeight":"400","textTransform":"uppercase"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php
-	/* Translators: WordPress link. */
-	$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'bysshe' ) ) . '" rel="nofollow">WordPress</a>';
-	echo sprintf(
-		esc_html__( 'Designed with %1$s', 'bysshe' ),
-		$wordpress_link
-	);
-?></p>
-<!-- /wp:paragraph --></div>
 <!-- /wp:group --></div>
 <!-- /wp:column --></div>
-<!-- /wp:columns --></footer>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
+<!-- /wp:columns --></div>
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/bysshe/patterns/single.php b/bysshe/patterns/single.php
index 744895b171..cb04b4a638 100644
--- a/bysshe/patterns/single.php
+++ b/bysshe/patterns/single.php
@@ -2,7 +2,6 @@
 /**
  * Title: single
  * Slug: bysshe/single
- * Categories: hidden
  * Inserter: no
  */
 ?>
@@ -11,7 +10,7 @@
 <header class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
 
 <!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('• •', 'Decorative symbols', 'bysshe');?></p>
+<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
 <!-- /wp:paragraph --></header>
 <!-- /wp:group -->
 
@@ -24,7 +23,7 @@
 <div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--80)"><!-- wp:post-featured-image {"width":"36px","height":"300px"} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:post-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase","fontSize":"0.9rem"}}} /-->
+<!-- wp:post-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"x-small"} /-->
 
 <!-- wp:spacer {"height":"50px","style":{"layout":[]}} -->
 <div style="height:50px" aria-hidden="true" class="wp-block-spacer"></div>
@@ -33,7 +32,7 @@
 <!-- wp:post-content {"layout":{"type":"default"}} /--></main>
 <!-- /wp:group -->
 
-<!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"120px","selfStretch":"fixed"}}} -->
+<!-- wp:spacer {"height":"0px","style":{"layout":{"selfStretch":"fixed","flexSize":"50px"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
@@ -52,21 +51,15 @@
 <!-- /wp:column -->
 
 <!-- wp:column {"width":"45%"} -->
-<div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:post-navigation-link {"textAlign":"right"} /-->
+<div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"tagName":"footer","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<footer class="wp-block-group"><!-- wp:post-navigation-link {"textAlign":"right"} /-->
 
 <!-- wp:paragraph {"align":"right","className":"no-underline","style":{"typography":{"lineHeight":"1.3","fontStyle":"normal","fontWeight":"400","textTransform":"uppercase"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php
-	/* Translators: WordPress link. */
-	$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'bysshe' ) ) . '" rel="nofollow">WordPress</a>';
-	echo sprintf(
-		esc_html__( 'Designed with %1$s', 'bysshe' ),
-		$wordpress_link
-	);
-?></p>
-<!-- /wp:paragraph --></div>
+<p class="has-text-align-right no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php /* Translators: 1. is the start of a 'a' HTML element, 2. is the end of a 'a' HTML element */ 
+echo sprintf( esc_html__( 'Designed with %1$sWordPress%2$s', 'bysshe' ), '<a href="' . esc_url( 'https://wordpress.org' ) . '" rel="nofollow">', '</a>' ); ?></p>
+<!-- /wp:paragraph --></footer>
 <!-- /wp:group --></div>
 <!-- /wp:column --></div>
 <!-- /wp:columns --></footer>
 <!-- /wp:group --></div>
-<!-- /wp:group -->
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/bysshe/readme.txt b/bysshe/readme.txt
index cef0e76977..d54c78913d 100644
--- a/bysshe/readme.txt
+++ b/bysshe/readme.txt
@@ -1,7 +1,8 @@
 === Bysshe ===
-Contributors: 
+
+Contributors: Automattic
 Requires at least: 6.0
-Tested up to: 6.6
+Tested up to: 6.7
 Requires PHP: 5.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -43,4 +44,3 @@ https://unsplash.com/photos/dessert-field-pVr6wvUneMk
 Roboto Serif Font, Copyright The Roboto Serif Project Authors
 Licensed under the terms of the SIL Open Font License (v1.1)
 Source: https://fonts.google.com/specimen/Roboto+Serif
--- End of Roboto Serif Font credits --
diff --git a/bysshe/style.css b/bysshe/style.css
index 1cdf567e3a..630686e2b7 100644
--- a/bysshe/style.css
+++ b/bysshe/style.css
@@ -5,13 +5,13 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Bysshe is crafted light and elegantly for poetry. It explores using blocks of text as the primary design element.
 Requires at least: 6.0
-Tested up to: 6.6
+Tested up to: 6.7
 Requires PHP: 5.7
 Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: bysshe
-Tags: blog, one-column, featured-images, block-styles, full-site-editing, rtl-language-support, threaded-comments, translation-ready, wide-blocks
+Tags: blog, one-column, two-columns, featured-images, block-styles, full-site-editing, rtl-language-support, translation-ready
 */
 
 /*
diff --git a/bysshe/theme.json b/bysshe/theme.json
index 97bccf864f..a2e76c3fbb 100644
--- a/bysshe/theme.json
+++ b/bysshe/theme.json
@@ -41,8 +41,7 @@
 			"text": true
 		},
 		"layout": {
-			"contentSize": "90vw",
-			"wideSize": "90vw"
+			"contentSize": "90vw"
 		},
 		"shadow": {
 			"defaultPresets": true,
@@ -290,24 +289,6 @@
 					"name": "Large",
 					"size": "1.37rem",
 					"slug": "large"
-				},
-				{
-					"fluid": {
-						"max": "2.25rem",
-						"min": "1.75rem"
-					},
-					"name": "Extra Large",
-					"size": "2rem",
-					"slug": "x-large"
-				},
-				{
-					"fluid": {
-						"max": "3rem",
-						"min": "2.25rem"
-					},
-					"name": "Huge",
-					"size": "2.25rem",
-					"slug": "xx-large"
 				}
 			],
 			"fontStyle": true,
@@ -339,32 +320,6 @@
 					"fontFamily": "monospace"
 				}
 			},
-			"core/comment-author-name": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/comment-date": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/comment-edit-link": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
-				}
-			},
-			"core/comment-reply-link": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"textDecoration": "underline"
-				}
-			},
-			"core/comments-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)"
-				}
-			},
 			"core/gallery": {
 				"spacing": {
 					"margin": {