From 681be699b503591229aed80e994dc4a9ec2c6ae2 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 6 Jul 2022 11:43:46 +0200
Subject: [PATCH 01/10] Theme update

Move templates and parts to the correct folder
Update theme.json version
---
 tt1-blocks/assets/css/blocks.css              |  41 +------
 tt1-blocks/assets/css/style-shared.css        |   7 --
 tt1-blocks/block-template-parts/footer.html   |  46 --------
 tt1-blocks/block-template-parts/header.html   |  25 ----
 tt1-blocks/block-templates/index.html         |  63 ----------
 tt1-blocks/block-templates/page.html          |  29 -----
 tt1-blocks/block-templates/single.html        |  55 ---------
 tt1-blocks/functions.php                      |  10 --
 tt1-blocks/inc/block-patterns.php             | 109 +-----------------
 tt1-blocks/index.php                          |  12 +-
 tt1-blocks/parts/footer.html                  |  56 +++++++++
 tt1-blocks/parts/header.html                  |  26 +++++
 tt1-blocks/patterns/contact-information.php   |  40 +++++++
 tt1-blocks/patterns/large-text.php            |  17 +++
 tt1-blocks/patterns/links-area.php            |  38 ++++++
 tt1-blocks/patterns/media-text-article.php    |  25 ++++
 .../patterns/overlapping-images-and-text.php  |  37 ++++++
 tt1-blocks/patterns/overlapping-images.php    |  32 +++++
 tt1-blocks/patterns/portfolio-list.php        | 101 ++++++++++++++++
 tt1-blocks/patterns/two-images.php            |  17 +++
 tt1-blocks/readme.txt                         |   6 +-
 tt1-blocks/style.css                          |  14 +--
 .../{block-templates => templates}/404.html   |   0
 tt1-blocks/templates/archive.html             |  54 +++++++++
 tt1-blocks/templates/index.html               |  54 +++++++++
 .../page-without-title.html}                  |   0
 tt1-blocks/theme.json                         |  26 +++--
 27 files changed, 524 insertions(+), 416 deletions(-)
 delete mode 100644 tt1-blocks/block-template-parts/footer.html
 delete mode 100644 tt1-blocks/block-template-parts/header.html
 delete mode 100644 tt1-blocks/block-templates/index.html
 delete mode 100644 tt1-blocks/block-templates/page.html
 delete mode 100644 tt1-blocks/block-templates/single.html
 create mode 100644 tt1-blocks/parts/footer.html
 create mode 100644 tt1-blocks/parts/header.html
 create mode 100644 tt1-blocks/patterns/contact-information.php
 create mode 100644 tt1-blocks/patterns/large-text.php
 create mode 100644 tt1-blocks/patterns/links-area.php
 create mode 100644 tt1-blocks/patterns/media-text-article.php
 create mode 100644 tt1-blocks/patterns/overlapping-images-and-text.php
 create mode 100644 tt1-blocks/patterns/overlapping-images.php
 create mode 100644 tt1-blocks/patterns/portfolio-list.php
 create mode 100644 tt1-blocks/patterns/two-images.php
 rename tt1-blocks/{block-templates => templates}/404.html (100%)
 create mode 100644 tt1-blocks/templates/archive.html
 create mode 100644 tt1-blocks/templates/index.html
 rename tt1-blocks/{block-templates/page-home.html => templates/page-without-title.html} (100%)

diff --git a/tt1-blocks/assets/css/blocks.css b/tt1-blocks/assets/css/blocks.css
index f73b309..f18414c 100644
--- a/tt1-blocks/assets/css/blocks.css
+++ b/tt1-blocks/assets/css/blocks.css
@@ -50,10 +50,6 @@
 # Image
 --------------------------------------------------------------*/
 
-.wp-block-image img {
-	height: auto;
-}
-
 .wp-block-image.is-style-twentytwentyone-border img,
 .wp-block-image.is-style-twentytwentyone-image-frame img {
 	border: 3px solid var(--wp--preset--color--dark-gray);
@@ -160,54 +156,19 @@
 # Separator
 --------------------------------------------------------------*/
 
-hr,
-.wp-block-separator {
+.wp-block-separator :not(.has-text-color) {
 	border-bottom: 1px solid var(--wp--preset--color--dark-gray);
-	clear: both;
-	opacity: 1;
 }
 
-hr[style*="text-align:right"],
-hr[style*="text-align: right"],
-.wp-block-separator[style*="text-align:right"],
-.wp-block-separator[style*="text-align: right"] {
-	border-right-color: var(--wp--preset--color--dark-gray);
-}
-
-hr.is-style-twentytwentyone-separator-thick,
 .wp-block-separator.is-style-twentytwentyone-separator-thick {
 	border-bottom-width: 3px;
 }
 
-.wp-block-separator.is-style-dots {
-	border-bottom: none;
-}
-
-.wp-block-separator.is-style-dots > hr {
-	display: none;
-}
-
 /* In Twenty Twenty-One, separators are 100% wide. This replicates that approach */
 .wp-block-separator:not(.is-style-wide):not(.is-style-dots) {
 	width: 100%;
 }
 
-/*--------------------------------------------------------------
-# Site Tagline
---------------------------------------------------------------*/
-
-.wp-block-site-tagline {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-/*--------------------------------------------------------------
-# Site Title
---------------------------------------------------------------*/
-
-h1.wp-block-site-title a:not(:hover):not(:focus):not(:active) {
-	text-decoration: none;
-}
 
 /*--------------------------------------------------------------
 # Single view Post Title
diff --git a/tt1-blocks/assets/css/style-shared.css b/tt1-blocks/assets/css/style-shared.css
index 1649321..a4277b1 100644
--- a/tt1-blocks/assets/css/style-shared.css
+++ b/tt1-blocks/assets/css/style-shared.css
@@ -24,13 +24,6 @@ a:hover {
 	text-decoration-skip-ink: none;
 }
 
-/*
- * Gutenberg remotes this underline, but Twenty Twenty-One uses it. 
- */
-.site-header h1.wp-block-site-title a:not(:hover):not(:focus):not(:active) {
-	text-decoration: underline;
-}
-
 /*
  * Alignment styles.
  * These rules are temporary, and should not be relied on or 
diff --git a/tt1-blocks/block-template-parts/footer.html b/tt1-blocks/block-template-parts/footer.html
deleted file mode 100644
index 72a847a..0000000
--- a/tt1-blocks/block-template-parts/footer.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:paragraph -->
-<p><a href="mailto:#">example@example.com<br></a>T. +00 (0)1 22 33 44 55</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:column -->
-<!-- wp:column -->
-<div class="wp-block-column"><!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">2, Rue Louis-Boilly<br>Paris, France</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:column -->
-<!-- wp:column {"verticalAlignment":"center"} -->
-<div class="wp-block-column is-vertically-aligned-center"><!-- wp:social-links {"align":"right"} -->
-<ul class="wp-block-social-links alignright"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->
-<!-- wp:social-link {"url":"https://www.facebook.com/WordPress/","service":"facebook"} /-->
-<!-- wp:social-link {"url":"https://twitter.com/WordPress","service":"twitter"} /-->
-<!-- wp:social-link {"url":"https://www.youtube.com/wordpress","service":"youtube"} /--></ul>
-<!-- /wp:social-links --></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns -->
-
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:separator {"align":"wide","className":"is-style-twentytwentyone-separator-thick"} -->
-<hr class="wp-block-separator alignwide is-style-twentytwentyone-separator-thick"/>
-<!-- /wp:separator -->
-
-<!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column {"verticalAlignment":"center"} -->
-<div class="wp-block-column is-vertically-aligned-center"><!-- wp:site-title /--></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"verticalAlignment":"center"} -->
-<div class="wp-block-column is-vertically-aligned-center"><!-- wp:paragraph {"align":"right"} -->
-<p class="has-text-align-right">Proudly powered by <a href="https://wordpress.org/">WordPress</a>.</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
-<!-- /wp:group -->
diff --git a/tt1-blocks/block-template-parts/header.html b/tt1-blocks/block-template-parts/header.html
deleted file mode 100644
index 8bd2b5a..0000000
--- a/tt1-blocks/block-template-parts/header.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:site-title /-->
-
-<!-- wp:site-tagline /--></div>
-<!-- /wp:column -->
-
-<!-- wp:column -->
-<div class="wp-block-column">
-<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right"}} -->
-<!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /-->
-<!-- /wp:navigation -->
-</div>
-<!-- /wp:column --></div>
-<!-- /wp:columns -->
-
-<!-- wp:spacer {"height":70} -->
-<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer --></div>
-<!-- /wp:group -->
\ No newline at end of file
diff --git a/tt1-blocks/block-templates/index.html b/tt1-blocks/block-templates/index.html
deleted file mode 100644
index df3dc12..0000000
--- a/tt1-blocks/block-templates/index.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:query {"queryId":1,"query":{"perPage":"10","pages":"100","offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":"","inherit":true},"displayLayout":{"type":"list"}} -->
-	<div class="wp-block-query">
-		<!-- wp:post-template -->
-
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-			<!-- wp:post-title {"isLink":true} /-->
-			<!-- wp:post-excerpt /-->
-		</div>
-		<!-- /wp:group -->
-
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-			<!-- wp:spacer {"height":70} -->
-			<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-			<!-- /wp:spacer -->
-
-			<!-- wp:separator {"align":"center","className":"is-style-twentytwentyone-separator-thick"} -->
-			<hr class="wp-block-separator aligncenter is-style-twentytwentyone-separator-thick"/>
-			<!-- /wp:separator -->
-
-			<!-- wp:columns -->
-			<div class="wp-block-columns"><!-- wp:column -->
-			<div class="wp-block-column"><!-- wp:post-date /-->
-
-			<!-- wp:post-author {"showAvatar":false} /--></div>
-			<!-- /wp:column -->
-
-			<!-- wp:column -->
-			<div class="wp-block-column"><!-- wp:post-terms {"term":"category","textAlign":"right"} /-->
-
-			<!-- wp:post-terms {"term":"post_tag","textAlign":"right"} /--></div>
-			<!-- /wp:column --></div>
-			<!-- /wp:columns -->
-
-			<!-- wp:spacer {"height":70} -->
-			<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-			<!-- /wp:spacer -->
-		</div>
-		<!-- /wp:group -->
-		<!-- /wp:post-template -->
-
-		<!-- wp:group {"layout":{"inherit":true}} -->
-		<div class="wp-block-group">
-			<!-- wp:query-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
-			<!-- wp:query-pagination-previous /-->
-
-			<!-- wp:query-pagination-numbers /-->
-
-			<!-- wp:query-pagination-next /-->
-			<!-- /wp:query-pagination -->
-		</div>
-		<!-- /wp:group -->
-	</div>
-	<!-- /wp:query -->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
diff --git a/tt1-blocks/block-templates/page.html b/tt1-blocks/block-templates/page.html
deleted file mode 100644
index 214ab4b..0000000
--- a/tt1-blocks/block-templates/page.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"level":1,"align":"wide"} /-->
-
-		<!-- wp:separator {"align":"wide","className":"is-style-twentytwentyone-separator-thick"} -->
-		<hr class="wp-block-separator alignwide is-style-twentytwentyone-separator-thick"/>
-		<!-- /wp:separator -->
-
-		<!-- wp:spacer {"height":70} -->
-		<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
diff --git a/tt1-blocks/block-templates/single.html b/tt1-blocks/block-templates/single.html
deleted file mode 100644
index b355cf7..0000000
--- a/tt1-blocks/block-templates/single.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
-
-<!-- wp:group {"tagName":"main"} -->
-<div class="wp-block-group">
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"level":1,"align":"wide"} /-->
-
-		<!-- wp:separator {"align":"wide","className":"is-style-twentytwentyone-separator-thick"} -->
-		<hr class="wp-block-separator alignwide is-style-twentytwentyone-separator-thick"/>
-		<!-- /wp:separator -->
-
-		<!-- wp:spacer {"height":70} -->
-		<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:spacer {"height":70} -->
-		<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-
-		<!-- wp:separator {"align":"center","className":"is-style-twentytwentyone-separator-thick"} -->
-		<hr class="wp-block-separator aligncenter is-style-twentytwentyone-separator-thick"/>
-		<!-- /wp:separator -->
-
-		<!-- wp:columns -->
-		<div class="wp-block-columns"><!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:post-date /-->
-
-		<!-- wp:post-author {"showAvatar":false,"byline":""} /--></div>
-		<!-- /wp:column -->
-
-		<!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:post-terms {"term":"category","textAlign":"right"} /-->
-
-		<!-- wp:post-terms {"term":"post_tag","textAlign":"right"} /--></div>
-		<!-- /wp:column --></div>
-		<!-- /wp:columns -->
-
-		<!-- wp:spacer {"height":70} -->
-		<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-
-		<!-- wp:post-comments /-->
-	</div>
-	<!-- /wp:group -->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
diff --git a/tt1-blocks/functions.php b/tt1-blocks/functions.php
index 53f8f18..0514c9b 100644
--- a/tt1-blocks/functions.php
+++ b/tt1-blocks/functions.php
@@ -28,16 +28,6 @@ function tt1_blocks_setup() {
 		 * to change 'tt1-blocks' to the name of your theme in all the template files.
 		 */
 		load_theme_textdomain( 'tt1-blocks', get_template_directory() . '/languages' );
-
-		// Add default posts and comments RSS feed links to head.
-		add_theme_support( 'automatic-feed-links' );
-
-		/*
-		 * Enable support for Post Thumbnails on posts and pages.
-		 *
-		 * @link https://developer.wordpress.org/themes/functionality/featured-images-post-thumbnails/
-		 */
-		add_theme_support( 'post-thumbnails' );
 		set_post_thumbnail_size( 1568, 9999 );
 
 		// Add support for Block Styles.
diff --git a/tt1-blocks/inc/block-patterns.php b/tt1-blocks/inc/block-patterns.php
index 474aef0..3fd3d72 100644
--- a/tt1-blocks/inc/block-patterns.php
+++ b/tt1-blocks/inc/block-patterns.php
@@ -12,108 +12,7 @@
 /**
  * Register Block Pattern Category.
  */
-if ( function_exists( 'register_block_pattern_category' ) ) {
-
-	register_block_pattern_category(
-		'tt1-blocks',
-		array( 'label' => esc_html__( 'TT1 Blocks', 'tt1-blocks' ) )
-	);
-}
-
-/**
- * Register Block Patterns.
- */
-if ( function_exists( 'register_block_pattern' ) ) {
-
-	// Large Text.
-	register_block_pattern(
-		'tt1-blocks/large-text',
-		array(
-			'title'         => esc_html__( 'Large Text', 'tt1-blocks' ),
-			'categories'    => array( 'tt1-blocks' ),
-			'viewportWidth' => 1440,
-			'content'       => '<!-- wp:heading {"align":"wide","fontSize":"gigantic","style":{"typography":{"lineHeight":"1.1"}}} --><h2 class="alignwide has-text-align-wide has-gigantic-font-size" style="line-height:1.1">' . esc_html__( 'A new portfolio default theme for WordPress', 'tt1-blocks' ) . '</h2><!-- /wp:heading -->',
-		)
-	);
-
-	// Links Area.
-	register_block_pattern(
-		'tt1-blocks/links-area',
-		array(
-			'title'         => esc_html__( 'Links Area', 'tt1-blocks' ),
-			'categories'    => array( 'tt1-blocks' ),
-			'viewportWidth' => 1440,
-			'description'   => esc_html_x( 'A huge text followed by social networks and email address links.', 'Block pattern description', 'tt1-blocks' ),
-			'content'       => '<!-- wp:cover {"overlayColor":"green","contentPosition":"center center","align":"wide","className":"is-style-twentytwentyone-border"} --><div class="wp-block-cover alignwide has-green-background-color has-background-dim is-style-twentytwentyone-border"><div class="wp-block-cover__inner-container"><!-- wp:spacer {"height":20} --><div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer --><!-- wp:paragraph {"fontSize":"huge"} --><p class="has-huge-font-size">' . wp_kses_post( __( 'Let&#8217;s Connect.', 'tt1-blocks' ) ) . '</p><!-- /wp:paragraph --><!-- wp:spacer {"height":75} --><div style="height:75px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer --><!-- wp:columns --><div class="wp-block-columns"><!-- wp:column --><div class="wp-block-column"><!-- wp:paragraph --><p><a href="#" data-type="URL">' . esc_html__( 'Twitter', 'tt1-blocks' ) . '</a> / <a href="#" data-type="URL">' . esc_html__( 'Instagram', 'tt1-blocks' ) . '</a> / <a href="#" data-type="URL">' . esc_html__( 'Dribbble', 'tt1-blocks' ) . '</a></p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column --><div class="wp-block-column"><!-- wp:paragraph --><p><a href="#">' . esc_html__( 'example@example.com', 'tt1-blocks' ) . '</a></p><!-- /wp:paragraph --></div><!-- /wp:column --></div><!-- /wp:columns --><!-- wp:spacer {"height":20} --><div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer --></div></div><!-- /wp:cover --><!-- wp:paragraph --><p></p><!-- /wp:paragraph -->',
-		)
-	);
-
-	// Media & Text Article Title.
-	register_block_pattern(
-		'tt1-blocks/media-text-article-title',
-		array(
-			'title'         => esc_html__( 'Media and Text Article Title', 'tt1-blocks' ),
-			'categories'    => array( 'tt1-blocks' ),
-			'viewportWidth' => 1440,
-			'description'   => esc_html_x( 'A Media & Text block with a big image on the left and a heading on the right. The heading is followed by a separator and a description paragraph.', 'Block pattern description', 'tt1-blocks' ),
-			'content'       => '<!-- wp:media-text {"mediaId":1752,"mediaLink":"' . esc_url( get_template_directory_uri() ) . '/assets/images/playing-in-the-sand.jpg","mediaType":"image","className":"is-style-twentytwentyone-border"} --><div class="wp-block-media-text alignwide is-stacked-on-mobile is-style-twentytwentyone-border"><figure class="wp-block-media-text__media"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/playing-in-the-sand.jpg" alt="' . esc_attr__( '&#8220;Playing in the Sand&#8221; by Berthe Morisot', 'tt1-blocks' ) . '" class="wp-image-1752"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"align":"center"} --><h2 class="has-text-align-center">' . esc_html__( 'Playing in the Sand', 'tt1-blocks' ) . '</h2><!-- /wp:heading --><!-- wp:separator {"className":"is-style-dots"} --><hr class="wp-block-separator is-style-dots"/><!-- /wp:separator --><!-- wp:paragraph {"align":"center","fontSize":"small"} --><p class="has-text-align-center has-small-font-size">' . wp_kses_post( __( 'Berthe Morisot<br>(French, 1841-1895)', 'tt1-blocks' ) ) . '</p><!-- /wp:paragraph --></div></div><!-- /wp:media-text -->',
-		)
-	);
-
-	// Overlapping Images.
-	register_block_pattern(
-		'tt1-blocks/overlapping-images',
-		array(
-			'title'         => esc_html__( 'Overlapping Images', 'tt1-blocks' ),
-			'categories'    => array( 'tt1-blocks' ),
-			'viewportWidth' => 1024,
-			'description'   => esc_html_x( 'Three images inside an overlapping columns block.', 'Block pattern description', 'tt1-blocks' ),
-			'content'       => '<!-- wp:columns {"verticalAlignment":"center","align":"wide","className":"is-style-twentytwentyone-columns-overlap"} --><div class="wp-block-columns alignwide are-vertically-aligned-center is-style-twentytwentyone-columns-overlap"><!-- wp:column {"verticalAlignment":"center"} --><div class="wp-block-column is-vertically-aligned-center"><!-- wp:image {"align":"full","sizeSlug":"full"} --><figure class="wp-block-image alignfull size-full"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/roses-tremieres-hollyhocks-1884.jpg" alt="' . esc_attr__( '&#8220;Roses Trémières&#8221; by Berthe Morisot', 'tt1-blocks' ) . '"/></figure><!-- /wp:image --><!-- wp:spacer --><div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer --><!-- wp:image {"align":"full","sizeSlug":"full"} --><figure class="wp-block-image alignfull size-full"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/in-the-bois-de-boulogne.jpg" alt="' . esc_attr__( '&#8220;In the Bois de Boulogne&#8221; by Berthe Morisot', 'tt1-blocks' ) . '"/></figure><!-- /wp:image --></div><!-- /wp:column --><!-- wp:column {"verticalAlignment":"center"} --><div class="wp-block-column is-vertically-aligned-center"><!-- wp:spacer --><div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer --><!-- wp:image {"align":"full",sizeSlug":"full"} --><figure class="wp-block-image alignfull size-full"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/young-woman-in-mauve.jpg" alt="' . esc_attr__( '&#8220;Young Woman in Mauve&#8221; by Berthe Morisot', 'tt1-blocks' ) . '"/></figure><!-- /wp:image --></div><!-- /wp:column --></div><!-- /wp:columns -->',
-		)
-	);
-
-	// Two Images Showcase.
-	register_block_pattern(
-		'tt1-blocks/two-images-showcase',
-		array(
-			'title'         => esc_html__( 'Two Images Showcase', 'tt1-blocks' ),
-			'categories'    => array( 'tt1-blocks' ),
-			'viewportWidth' => 1440,
-			'description'   => esc_html_x( 'A Media & Text block with a big image on the left and a smaller one with bordered frame on the right.', 'Block pattern description', 'tt1-blocks' ),
-			'content'       => '<!-- wp:media-text {"mediaId":1747,"mediaLink":"' . esc_url( get_template_directory_uri() ) . '/assets/images/Daffodils.jpg","mediaType":"image"} --><div class="wp-block-media-text alignwide is-stacked-on-mobile"><figure class="wp-block-media-text__media"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/Daffodils.jpg" alt="' . esc_attr__( '&#8220;Daffodils&#8221; by Berthe Morisot', 'tt1-blocks' ) . '" size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:image {"align":"center","width":400,"height":512,"sizeSlug":"large","className":"is-style-twentytwentyone-image-frame"} --><figure class="wp-block-image aligncenter size-large is-resized is-style-twentytwentyone-image-frame"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/self-portrait-1885.jpg" alt="' . esc_attr__( '&#8220;Self portrait&#8221; by Berthe Morisot', 'tt1-blocks' ) . '" width="400" height="512"/></figure><!-- /wp:image --></div></div><!-- /wp:media-text -->',
-		)
-	);
-
-	// Overlapping Images and Text.
-	register_block_pattern(
-		'tt1-blocks/overlapping-images-and-text',
-		array(
-			'title'         => esc_html__( 'Overlapping Images and Text', 'tt1-blocks' ),
-			'categories'    => array( 'tt1-blocks' ),
-			'viewportWidth' => 1440,
-			'description'   => esc_html_x( 'An overlapping columns block with two images and a text description.', 'Block pattern description', 'tt1-blocks' ),
-			'content'       => '<!-- wp:columns {"verticalAlignment":null,"align":"wide","className":"is-style-twentytwentyone-columns-overlap"} --> <div class="wp-block-columns alignwide is-style-twentytwentyone-columns-overlap"><!-- wp:column --> <div class="wp-block-column"><!-- wp:image {sizeSlug":"full"} --> <figure class="wp-block-image size-full"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/the-garden-at-bougival-1884.jpg" alt="' . esc_attr__( '&#8220;The Garden at Bougival&#8221; by Berthe Morisot', 'tt1-blocks' ) . '"/></figure> <!-- /wp:image --></div> <!-- /wp:column --> <!-- wp:column {"verticalAlignment":"bottom"} --> <div class="wp-block-column is-vertically-aligned-bottom"><!-- wp:group {"className":"is-style-twentytwentyone-border","backgroundColor":"green"} --> <div class="wp-block-group is-style-twentytwentyone-border has-green-background-color has-background"><div class="wp-block-group__inner-container"><!-- wp:paragraph {"fontSize":"extra-large","style":{"typography":{"lineHeight":"1.4"}}} --> <p class="has-extra-large-font-size" style="line-height:1.4">' . esc_html__( 'Beautiful gardens painted by Berthe Morisot in the late 1800s', 'tt1-blocks' ) . '</p> <!-- /wp:paragraph --></div></div> <!-- /wp:group --></div> <!-- /wp:column --> <!-- wp:column --> <div class="wp-block-column"><!-- wp:image {sizeSlug":"full"} --> <figure class="wp-block-image size-full"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/villa-with-orange-trees-nice.jpg" alt="' . esc_attr__( '&#8220;Villa with Orange Trees, Nice&#8221; by Berthe Morisot', 'tt1-blocks' ) . '"/></figure> <!-- /wp:image --></div> <!-- /wp:column --></div> <!-- /wp:columns -->',
-		)
-	);
-
-	// Portfolio List.
-	register_block_pattern(
-		'tt1-blocks/portfolio-list',
-		array(
-			'title'       => esc_html__( 'Portfolio List', 'tt1-blocks' ),
-			'categories'  => array( 'tt1-blocks' ),
-			'description' => esc_html_x( 'A list of projects with thumbnail images.', 'Block pattern description', 'tt1-blocks' ),
-			'content'     => '<!-- wp:separator {"className":"is-style-twentytwentyone-separator-thick"} --> <hr class="wp-block-separator is-style-twentytwentyone-separator-thick"/> <!-- /wp:separator --> <!-- wp:columns --> <div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"center","width":80} --> <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:paragraph {"fontSize":"extra-large"} --> <p class="has-extra-large-font-size"><a href="#">' . esc_html__( 'Roses Trémières', 'tt1-blocks' ) . '</a></p> <!-- /wp:paragraph --></div> <!-- /wp:column --> <!-- wp:column {"verticalAlignment":"center"} --> <div class="wp-block-column is-vertically-aligned-center"><!-- wp:image {"align":"right","width":46,"height":67,"sizeSlug":"large"} --> <figure class="wp-block-image alignright size-large is-resized"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/roses-tremieres-hollyhocks-1884.jpg" alt="' . esc_attr__( '&#8220;Roses Trémières&#8221; by Berthe Morisot', 'tt1-blocks' ) . '" width="46" height="67"/></figure> <!-- /wp:image --></div> <!-- /wp:column --></div> <!-- /wp:columns --> <!-- wp:separator {"className":"is-style-default"} --> <hr class="wp-block-separator is-style-default"/> <!-- /wp:separator --> <!-- wp:columns --> <div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"center","width":80} --> <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:paragraph {"fontSize":"extra-large"} --> <p class="has-extra-large-font-size"><a href="#">' . esc_html__( 'Villa with Orange Trees, Nice', 'tt1-blocks' ) . '</a></p> <!-- /wp:paragraph --></div> <!-- /wp:column --> <!-- wp:column {"verticalAlignment":"center"} --> <div class="wp-block-column is-vertically-aligned-center"><!-- wp:image {"align":"right","width":84,"height":67,"className":"alignright size-large is-resized"} --><figure class="wp-block-image is-resized alignright size-large"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/villa-with-orange-trees-nice.jpg" alt="&#8220;Villa with Orange Trees, Nice&#8221; by Berthe Morisot" width="84" height="67"/></figure><!-- /wp:image --></div> <!-- /wp:column --></div> <!-- /wp:columns --> <!-- wp:separator {"className":"is-style-default"} --> <hr class="wp-block-separator is-style-default"/> <!-- /wp:separator --> <!-- wp:columns --> <div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"center","width":80} --> <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:paragraph {"fontSize":"extra-large"} --> <p class="has-extra-large-font-size"><a href="#">' . esc_html__( 'In the Bois de Boulogne', 'tt1-blocks' ) . '</a></p> <!-- /wp:paragraph --></div> <!-- /wp:column --> <!-- wp:column {"verticalAlignment":"center"} --> <div class="wp-block-column is-vertically-aligned-center"><!-- wp:image {"align":"right","width":55,"height":67,"sizeSlug":"large"} --> <figure class="wp-block-image alignright size-large is-resized"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/in-the-bois-de-boulogne.jpg" alt="' . esc_attr__( '&#8220;In the Bois de Boulogne&#8221; by Berthe Morisot', 'tt1-blocks' ) . '" width="55" height="67"/></figure> <!-- /wp:image --></div> <!-- /wp:column --></div> <!-- /wp:columns --> <!-- wp:separator {"className":"is-style-default"} --> <hr class="wp-block-separator is-style-default"/> <!-- /wp:separator --> <!-- wp:columns --> <div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"center","width":80} --> <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:paragraph {"fontSize":"extra-large"} --> <p class="has-extra-large-font-size"><a href="#">' . esc_html__( 'The Garden at Bougival', 'tt1-blocks' ) . '</a></p> <!-- /wp:paragraph --></div> <!-- /wp:column --> <!-- wp:column {"verticalAlignment":"center"} --> <div class="wp-block-column is-vertically-aligned-center"><!-- wp:image {"align":"right","width":52,"height":67,"sizeSlug":"large"} --> <figure class="wp-block-image alignright size-large is-resized"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/the-garden-at-bougival-1884.jpg" alt="' . esc_attr__( '&#8220;The Garden at Bougival&#8221; by Berthe Morisot', 'tt1-blocks' ) . '" width="52" height="67"/></figure> <!-- /wp:image --></div> <!-- /wp:column --></div> <!-- /wp:columns --> <!-- wp:separator {"className":"is-style-default"} --> <hr class="wp-block-separator is-style-default"/> <!-- /wp:separator --> <!-- wp:columns --> <div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"center","width":80} --> <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:paragraph {"fontSize":"extra-large"} --> <p class="has-extra-large-font-size"><a href="#">' . esc_html__( 'Young Woman in Mauve', 'tt1-blocks' ) . '</a></p> <!-- /wp:paragraph --></div> <!-- /wp:column --> <!-- wp:column {"verticalAlignment":"center"} --> <div class="wp-block-column is-vertically-aligned-center"><!-- wp:image {"align":"right","width":50,"height":67,"sizeSlug":"large"} --> <figure class="wp-block-image alignright size-large is-resized"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/young-woman-in-mauve.jpg" alt="' . esc_attr__( '&#8220;Young Woman in Mauve&#8221; by Berthe Morisot', 'tt1-blocks' ) . '" width="50" height="67"/></figure> <!-- /wp:image --></div> <!-- /wp:column --></div> <!-- /wp:columns --> <!-- wp:separator {"className":"is-style-default"} --> <hr class="wp-block-separator is-style-default"/> <!-- /wp:separator --> <!-- wp:columns --> <div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"center","width":80} --> <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:paragraph {"fontSize":"extra-large"} --> <p class="has-extra-large-font-size"><a href="#">' . esc_html__( 'Reading', 'tt1-blocks' ) . '</a></p> <!-- /wp:paragraph --></div> <!-- /wp:column --> <!-- wp:column {"verticalAlignment":"center"} --> <div class="wp-block-column is-vertically-aligned-center"><!-- wp:image {"align":"right","width":51,"height":67,"sizeSlug":"large"} --> <figure class="wp-block-image alignright size-large is-resized"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/Reading.jpg" alt="' . esc_attr__( '&#8220;Reading&#8221; by Berthe Morisot', 'tt1-blocks' ) . '" width="51" height="67"/></figure> <!-- /wp:image --></div> <!-- /wp:column --></div> <!-- /wp:columns --> <!-- wp:separator {"className":"is-style-twentytwentyone-separator-thick"} --> <hr class="wp-block-separator is-style-twentytwentyone-separator-thick"/> <!-- /wp:separator -->',
-		)
-	);
-
-	register_block_pattern(
-		'tt1-blocks/contact-information',
-		array(
-			'title'       => esc_html__( 'Contact Information', 'tt1-blocks' ),
-			'categories'  => array( 'tt1-blocks' ),
-			'description' => esc_html_x( 'A block with 3 columns that display contact information and social media links.', 'Block pattern description', 'tt1-blocks' ),
-			'content'     => '<!-- wp:columns {"align":"wide"} --><div class="wp-block-columns alignwide"><!-- wp:column --><div class="wp-block-column"><!-- wp:paragraph --><p><a href="mailto:#">' . esc_html__( 'example@example.com', 'tt1-blocks' ) . '<br></a>' . esc_html__( '123-456-7890', 'tt1-blocks' ) . '</p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column --><div class="wp-block-column"><!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center">' . esc_html__( '123 Main Street', 'tt1-blocks' ) . '<br>' . esc_html__( 'Cambridge, MA, 02139', 'tt1-blocks' ) . '</p><!-- /wp:paragraph --></div><!-- /wp:column --><!-- wp:column {"verticalAlignment":"center"} --><div class="wp-block-column is-vertically-aligned-center"><!-- wp:social-links {"align":"right"} --><ul class="wp-block-social-links alignright"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /--><!-- wp:social-link {"url":"https://www.facebook.com/WordPress/","service":"facebook"} /--><!-- wp:social-link {"url":"https://twitter.com/WordPress","service":"twitter"} /--><!-- wp:social-link {"service":"instagram"} /--><!-- wp:social-link {"service":"linkedin"} /--><!-- wp:social-link {"service":"youtube"} /--><!-- wp:social-link {"url":"https://www.youtube.com/wordpress","service":"youtube"} /--></ul><!-- /wp:social-links --></div><!-- /wp:column --></div><!-- /wp:columns --><!-- wp:paragraph --><p></p><!-- /wp:paragraph -->',
-		)
-	);
-}
+register_block_pattern_category(
+	'tt1-blocks',
+	array( 'label' => esc_html__( 'TT1 Blocks', 'tt1-blocks' ) )
+);
diff --git a/tt1-blocks/index.php b/tt1-blocks/index.php
index e3d90ad..41f500e 100644
--- a/tt1-blocks/index.php
+++ b/tt1-blocks/index.php
@@ -1,11 +1,3 @@
 <?php
-/**
- * Without this file, WordPress will consider the theme broken.
- *
- * @package tt1-blocks
- */
-
-if ( current_user_can( 'activate_plugins' ) ) {
-	esc_html_e( 'This theme was built for the WordPress experimental full site editing feature. You need to install and activate the Gutenberg plugin to make it work. ', 'tt1-blocks' );
-}
-
+// There is nothing output here because block themes do not use php templates.
+// https://core.trac.wordpress.org/ticket/54272.
diff --git a/tt1-blocks/parts/footer.html b/tt1-blocks/parts/footer.html
new file mode 100644
index 0000000..52fa39d
--- /dev/null
+++ b/tt1-blocks/parts/footer.html
@@ -0,0 +1,56 @@
+<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"50px"}}},"layout":{"inherit":true}} -->
+<div class="wp-block-group" style="padding-bottom:50px">
+	<!-- wp:spacer {"height":70} -->
+	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+
+	<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide">
+		<!-- wp:column -->
+		<div class="wp-block-column">
+			<!-- wp:heading {"style":{"typography":{"fontStyle":"normal","fontWeight":"700"}},"fontSize":"small"} -->
+			<h2 class="has-small-font-size" style="font-style:normal;font-weight:700">Categories</h2>
+			<!-- /wp:heading -->
+			<!-- wp:categories /-->
+		</div>
+		<!-- /wp:column -->
+		<!-- wp:column -->
+		<div class="wp-block-column">
+			<!-- wp:paragraph {"align":"center"} --><p class="has-text-align-center">2, Rue Louis-Boilly<br>Paris, France</p><!-- /wp:paragraph -->
+		</div>
+		<!-- /wp:column -->
+		<!-- wp:column {"verticalAlignment":"center"} -->
+		<div class="wp-block-column is-vertically-aligned-center">
+		</div>
+		<!-- /wp:column -->
+	</div>
+	<!-- /wp:columns -->
+
+	<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"30px"}}},"layout":{"inherit":true}} -->
+	<div class="wp-block-group alignfull" style="padding-bottom:30px">
+		<!-- wp:navigation {"layout":{"type":"flex","justifyContent":"center"}} /-->
+	</div>
+	<!-- /wp:group -->
+
+	<!-- wp:separator {"align":"wide","className":"is-style-twentytwentyone-separator-thick"} -->
+	<hr class="wp-block-separator alignwide is-style-twentytwentyone-separator-thick"/>
+	<!-- /wp:separator -->
+
+	<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide">
+		<!-- wp:column {"verticalAlignment":"center"} -->
+		<div class="wp-block-column is-vertically-aligned-center">
+			<!-- wp:site-title {"level":0} /-->
+		</div>
+		<!-- /wp:column -->
+		<!-- wp:column {"verticalAlignment":"center"} -->
+		<div class="wp-block-column is-vertically-aligned-center">
+			<!-- wp:paragraph {"align":"right"} -->
+			<p class="has-text-align-right">Proudly powered by <a href="https://wordpress.org/">WordPress</a>.</p>
+			<!-- /wp:paragraph -->
+		</div>
+		<!-- /wp:column -->
+	</div>
+	<!-- /wp:columns -->
+</div>
+<!-- /wp:group -->
diff --git a/tt1-blocks/parts/header.html b/tt1-blocks/parts/header.html
new file mode 100644
index 0000000..751ba4e
--- /dev/null
+++ b/tt1-blocks/parts/header.html
@@ -0,0 +1,26 @@
+<!-- wp:group {"layout":{"inherit":true}} -->
+<div class="wp-block-group">
+	<!-- wp:spacer {"height":70} -->
+	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+
+	<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide">
+		<!-- wp:column -->
+		<div class="wp-block-column">
+			<!-- wp:site-title /-->
+			<!-- wp:site-tagline /-->
+		</div>
+		<!-- /wp:column -->
+	<!-- wp:column -->
+	<div class="wp-block-column">
+		<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right"}} /-->
+	</div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->
+
+	<!-- wp:spacer {"height":70} -->
+	<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+</div>
+<!-- /wp:group -->
diff --git a/tt1-blocks/patterns/contact-information.php b/tt1-blocks/patterns/contact-information.php
new file mode 100644
index 0000000..ebc5bb4
--- /dev/null
+++ b/tt1-blocks/patterns/contact-information.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Title: Contact Information
+ * Slug: tt1-blocks/contact-information
+ * Categories: tt1-blocks
+ * Block Types: core/columns, core/social-links
+ * Keywords: contact
+ * Description: A block with 3 columns that display contact information and social media links.
+ *
+ * @package TT1_Blocks
+ * @since 0.4.9
+ */
+
+?>
+<!-- wp:columns {"align":"wide"} --><div class="wp-block-columns alignwide">
+	<!-- wp:column -->
+	<div class="wp-block-column">
+		<!-- wp:paragraph --><p><a href="mailto:#"><?php esc_html_e( 'example@example.com', 'tt1-blocks' ); ?><br></a>
+		<?php esc_html_e( '123-456-7890', 'tt1-blocks' ); ?></p><!-- /wp:paragraph -->
+	</div><!-- /wp:column -->
+	<!-- wp:column --><div class="wp-block-column">
+		<!-- wp:paragraph {"align":"center"} -->
+		<p class="has-text-align-center"><?php esc_html_e( '123 Main Street', 'tt1-blocks' ); ?><br>
+		<?php esc_html_e( 'Cambridge, MA, 02139', 'tt1-blocks' ); ?></p>
+		<!-- /wp:paragraph -->
+	</div><!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:social-links {"align":"right"} -->
+		<ul class="wp-block-social-links alignright">
+		<!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->
+		<!-- wp:social-link {"url":"https://www.facebook.com/WordPress/","service":"facebook"} /-->
+		<!-- wp:social-link {"url":"https://twitter.com/WordPress","service":"twitter"} /-->
+		<!-- wp:social-link {"service":"instagram"} /--><!-- wp:social-link {"service":"linkedin"} /-->
+		<!-- wp:social-link {"service":"youtube"} /-->
+		<!-- wp:social-link {"url":"https://www.youtube.com/wordpress","service":"youtube"} /-->
+		</ul>
+		<!-- /wp:social-links -->
+	</div><!-- /wp:column -->
+</div><!-- /wp:columns -->
diff --git a/tt1-blocks/patterns/large-text.php b/tt1-blocks/patterns/large-text.php
new file mode 100644
index 0000000..1269293
--- /dev/null
+++ b/tt1-blocks/patterns/large-text.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Title: Large text
+ * Slug: tt1-blocks/large-text
+ * Categories: tt1-blocks
+ * Block Types: core/heading
+ * ViewportWidth: 1440
+ *
+ * @package TT1_Blocks
+ * @since 0.4.9
+ */
+
+?>
+<!-- wp:heading {"align":"wide","fontSize":"gigantic","style":{"typography":{"lineHeight":"1.1"}}} -->
+<h2 class="alignwide has-text-align-wide has-gigantic-font-size" style="line-height:1.1">
+<?php esc_html_e( 'A new portfolio default theme for WordPress', 'tt1-blocks' ); ?>
+</h2><!-- /wp:heading -->
diff --git a/tt1-blocks/patterns/links-area.php b/tt1-blocks/patterns/links-area.php
new file mode 100644
index 0000000..be58755
--- /dev/null
+++ b/tt1-blocks/patterns/links-area.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Title: Links Area
+ * Slug: tt1-blocks/links-area
+ * Categories: tt1-blocks
+ * Block Types: core/cover
+ * Keywords: links
+ * Description: A huge text followed by social networks and email address links.
+ * ViewportWidth: 1440
+ *
+ * @package TT1_Blocks
+ * @since 0.4.9
+ */
+
+?>
+<!-- wp:cover {"overlayColor":"green","contentPosition":"center center","align":"wide","className":"is-style-twentytwentyone-border"} -->
+<div class="wp-block-cover alignwide has-green-background-color has-background-dim is-style-twentytwentyone-border">
+	<div class="wp-block-cover__inner-container">
+		<!-- wp:spacer {"height":20} --><div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
+		<!-- wp:paragraph {"fontSize":"huge"} --><p class="has-huge-font-size"><?php echo wp_kses_post( __( 'Let&#8217;s Connect.', 'tt1-blocks' ) ); ?></p><!-- /wp:paragraph -->
+		<!-- wp:spacer {"height":75} --><div style="height:75px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
+		<!-- wp:columns -->
+		<div class="wp-block-columns">
+			<!-- wp:column -->
+			<div class="wp-block-column">
+				<!-- wp:paragraph --><p><a href="#" data-type="URL"><?php esc_html_e( 'Twitter', 'tt1-blocks' ); ?></a> / <a href="#" data-type="URL"><?php esc_html_e( 'Instagram', 'tt1-blocks' )?> </a> / <a href="#" data-type="URL"> <?php esc_html_e( 'Dribbble', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+			</div><!-- /wp:column -->
+			<!-- wp:column -->
+			<div class="wp-block-column">
+				<!-- wp:paragraph --><p><a href="#"><?php esc_html_e( 'example@example.com', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+			</div>
+			<!-- /wp:column -->
+		</div>
+		<!-- /wp:columns -->
+		<!-- wp:spacer {"height":20} --><div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
+	</div>
+</div>
+<!-- /wp:cover -->
diff --git a/tt1-blocks/patterns/media-text-article.php b/tt1-blocks/patterns/media-text-article.php
new file mode 100644
index 0000000..8d22416
--- /dev/null
+++ b/tt1-blocks/patterns/media-text-article.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Title: Media and Text Article Title
+ * Slug: tt1-blocks/media-text-article-title
+ * Categories: tt1-blocks
+ * Block Types: core/media-text
+ * Description: A Media & Text block with a big image on the left and a heading on the right. The heading is followed by a separator and a description paragraph.
+ * ViewportWidth: 1440
+ *
+ * @package TT1_Blocks
+ * @since 0.4.9
+ */
+?>
+
+<!-- wp:media-text {"mediaId":1752,"mediaLink":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/playing-in-the-sand.jpg","mediaType":"image","className":"is-style-twentytwentyone-border"} -->
+<div class="wp-block-media-text alignwide is-stacked-on-mobile is-style-twentytwentyone-border">
+	<figure class="wp-block-media-text__media"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/playing-in-the-sand.jpg" alt="<?php esc_attr_e( '&#8220;Playing in the Sand&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" class="wp-image-1752"/></figure><div class="wp-block-media-text__content">
+		<!-- wp:heading {"align":"center"} --><h2 class="has-text-align-center"><?php esc_html_e( 'Playing in the Sand', 'tt1-blocks' ); ?></h2><!-- /wp:heading -->
+		<!-- wp:separator {"className":"is-style-dots"} --><hr class="wp-block-separator is-style-dots"/>
+		<!-- /wp:separator -->
+		<!-- wp:paragraph {"align":"center","fontSize":"small"} -->
+		<p class="has-text-align-center has-small-font-size"><?php echo wp_kses_post( __( 'Berthe Morisot<br>(French, 1841-1895)', 'tt1-blocks' ) ); ?></p><!-- /wp:paragraph -->
+	</div>
+</div><!-- /wp:media-text -->
+
diff --git a/tt1-blocks/patterns/overlapping-images-and-text.php b/tt1-blocks/patterns/overlapping-images-and-text.php
new file mode 100644
index 0000000..9062b79
--- /dev/null
+++ b/tt1-blocks/patterns/overlapping-images-and-text.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Title: Overlapping Images and Text
+ * Slug: tt1-blocks/overlapping-images-and-text
+ * Categories: tt1-blocks
+ * Block Types: core/columns
+ * Description: An overlapping columns block with two images and a text description.
+ * ViewportWidth: 1024
+ *
+ * @package TT1_Blocks
+ * @since 0.4.9
+ */
+
+?>
+<!-- wp:columns {"verticalAlignment":null,"align":"wide","className":"is-style-twentytwentyone-columns-overlap"} -->
+<div class="wp-block-columns alignwide is-style-twentytwentyone-columns-overlap">
+	<!-- wp:column -->
+	<div class="wp-block-column">
+		<!-- wp:image {sizeSlug":"full"} --><figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/the-garden-at-bougival-1884.jpg" alt="<?php esc_attr_e( '&#8220;The Garden at Bougival&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/></figure>
+		<!-- /wp:image -->
+	</div><!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"bottom"} -->
+	<div class="wp-block-column is-vertically-aligned-bottom">
+		<!-- wp:group {"className":"is-style-twentytwentyone-border","backgroundColor":"green"} -->
+		<div class="wp-block-group is-style-twentytwentyone-border has-green-background-color has-background">
+			<div class="wp-block-group__inner-container">
+				<!-- wp:paragraph {"fontSize":"extra-large","style":{"typography":{"lineHeight":"1.4"}}} -->
+				<p class="has-extra-large-font-size" style="line-height:1.4"><?php esc_html_e( 'Beautiful gardens painted by Berthe Morisot in the late 1800s', 'tt1-blocks' ); ?></p><!-- /wp:paragraph -->
+			</div>
+		</div><!-- /wp:group -->
+	</div><!-- /wp:column -->
+	<!-- wp:column -->
+	<div class="wp-block-column">
+		<!-- wp:image {sizeSlug":"full"} --><figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/villa-with-orange-trees-nice.jpg" alt="<?php esc_attr_e( '&#8220;Villa with Orange Trees, Nice&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/></figure><!-- /wp:image -->
+	</div><!-- /wp:column -->
+</div>
+<!-- /wp:columns -->
\ No newline at end of file
diff --git a/tt1-blocks/patterns/overlapping-images.php b/tt1-blocks/patterns/overlapping-images.php
new file mode 100644
index 0000000..8dce715
--- /dev/null
+++ b/tt1-blocks/patterns/overlapping-images.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Title: Overlapping Images
+ * Slug: tt1-blocks/overlapping-images
+ * Categories: tt1-blocks
+ * Block Types: core/columns
+ * Description: Three images inside an overlapping columns block.
+ * ViewportWidth: 1440
+ *
+ * @package TT1_Blocks
+ * @since 0.4.9
+ */
+
+?>
+<!-- wp:columns {"verticalAlignment":"center","align":"wide","className":"is-style-twentytwentyone-columns-overlap"} --><div class="wp-block-columns alignwide are-vertically-aligned-center is-style-twentytwentyone-columns-overlap">
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:image {"align":"full","sizeSlug":"full"} --><figure class="wp-block-image alignfull size-full">
+			<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/roses-tremieres-hollyhocks-1884.jpg" alt="<?php esc_attr_e( '&#8220;Roses Trémières&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/>
+		</figure><!-- /wp:image -->
+		<!-- wp:spacer --><div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
+		<!-- wp:image {"align":"full","sizeSlug":"full"} --><figure class="wp-block-image alignfull size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?> /assets/images/in-the-bois-de-boulogne.jpg" alt="<?php esc_attr_e( '&#8220;In the Bois de Boulogne&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/></figure><!-- /wp:image -->
+	</div><!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:spacer --><div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
+		<!-- wp:image {"align":"full",sizeSlug":"full"} --><figure class="wp-block-image alignfull size-full">
+			<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/young-woman-in-mauve.jpg" alt="<?php esc_attr_e( '&#8220;Young Woman in Mauve&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/></figure>
+			<!-- /wp:image -->
+	</div><!-- /wp:column -->
+</div><!-- /wp:columns -->
+
diff --git a/tt1-blocks/patterns/portfolio-list.php b/tt1-blocks/patterns/portfolio-list.php
new file mode 100644
index 0000000..ce81009
--- /dev/null
+++ b/tt1-blocks/patterns/portfolio-list.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Title: Portfolio List
+ * Slug: tt1-blocks/portfolio-list
+ * Categories: tt1-blocks
+ * Block Types: core/columns
+ * Description: A list of projects with thumbnail images.
+ *
+ * @package TT1_Blocks
+ * @since 0.4.9
+ */
+
+?>
+<!-- wp:separator {"className":"is-style-twentytwentyone-separator-thick"} -->
+<hr class="wp-block-separator is-style-twentytwentyone-separator-thick"/>
+<!-- /wp:separator -->
+<!-- wp:columns -->
+<div class="wp-block-columns">
+	<!-- wp:column {"verticalAlignment":"center","width":80} -->
+	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%">
+		<!-- wp:paragraph {"fontSize":"extra-large"} --><p class="has-extra-large-font-size"><a href="#"><?php esc_html_e( 'Roses Trémières', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+	</div><!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:image {"align":"right","width":46,"height":67,"sizeSlug":"large"} -->
+		<figure class="wp-block-image alignright size-large is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/roses-tremieres-hollyhocks-1884.jpg" alt="<?php esc_attr_e( '&#8220;Roses Trémières&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="46" height="67"/></figure>
+		<!-- /wp:image --></div>
+		<!-- /wp:column -->
+</div>
+<!-- /wp:columns -->
+<!-- wp:separator {"className":"is-style-default"} --><hr class="wp-block-separator is-style-default"/>
+<!-- /wp:separator -->
+<!-- wp:columns -->
+<div class="wp-block-columns">
+	<!-- wp:column {"verticalAlignment":"center","width":80} -->
+	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%">
+		<!-- wp:paragraph {"fontSize":"extra-large"} --><p class="has-extra-large-font-size"><a href="#"><?php esc_html_e( 'Villa with Orange Trees, Nice', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+	</div><!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:image {"align":"right","width":84,"height":67,"className":"alignright size-large is-resized"} --><figure class="wp-block-image is-resized alignright size-large"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/villa-with-orange-trees-nice.jpg" alt="<?php esc_attr_e( '&#8220;Villa with Orange Trees, Nice&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="84" height="67"/></figure><!-- /wp:image -->
+	</div>
+	<!-- /wp:column -->
+</div>
+<!-- /wp:columns -->
+<!-- wp:separator {"className":"is-style-default"} --><hr class="wp-block-separator is-style-default"/><!-- /wp:separator -->
+<!-- wp:columns -->
+<div class="wp-block-columns">
+	<!-- wp:column {"verticalAlignment":"center","width":80} -->
+	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%">
+		<!-- wp:paragraph {"fontSize":"extra-large"} --><p class="has-extra-large-font-size"><a href="#"><?php esc_html_e( 'In the Bois de Boulogne', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+	</div><!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:image {"align":"right","width":55,"height":67,"sizeSlug":"large"} --><figure class="wp-block-image alignright size-large is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/in-the-bois-de-boulogne.jpg" alt="<?php esc_attr_e( '&#8220;In the Bois de Boulogne&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="55" height="67"/></figure><!-- /wp:image -->
+	</div>
+	<!-- /wp:column -->
+</div>
+<!-- /wp:columns -->
+<!-- wp:separator {"className":"is-style-default"} -->
+<hr class="wp-block-separator is-style-default"/><!-- /wp:separator -->
+<!-- wp:columns -->
+<div class="wp-block-columns">
+	<!-- wp:column {"verticalAlignment":"center","width":80} -->
+	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%">
+		<!-- wp:paragraph {"fontSize":"extra-large"} --><p class="has-extra-large-font-size"><a href="#"><?php esc_html_e( 'The Garden at Bougival', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+	</div><!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:image {"align":"right","width":52,"height":67,"sizeSlug":"large"} --><figure class="wp-block-image alignright size-large is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/the-garden-at-bougival-1884.jpg" alt="<?php esc_attr_e( '&#8220;The Garden at Bougival&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="52" height="67"/></figure><!-- /wp:image -->
+	</div>
+	<!-- /wp:column -->
+</div>
+<!-- /wp:columns -->
+<!-- wp:separator {"className":"is-style-default"} --><hr class="wp-block-separator is-style-default"/><!-- /wp:separator -->
+<!-- wp:columns -->
+<div class="wp-block-columns">
+	<!-- wp:column {"verticalAlignment":"center","width":80} -->
+	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%">
+		<!-- wp:paragraph {"fontSize":"extra-large"} --><p class="has-extra-large-font-size"><a href="#"><?php esc_html_e( 'Young Woman in Mauve', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+	</div><!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:image {"align":"right","width":50,"height":67,"sizeSlug":"large"} -->
+		<figure class="wp-block-image alignright size-large is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/young-woman-in-mauve.jpg" alt="<?php esc_attr_e( '&#8220;Young Woman in Mauve&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="50" height="67"/></figure><!-- /wp:image -->
+	</div><!-- /wp:column -->
+</div><!-- /wp:columns -->
+<!-- wp:separator {"className":"is-style-default"} --><hr class="wp-block-separator is-style-default"/><!-- /wp:separator -->
+<!-- wp:columns -->
+<div class="wp-block-columns">
+	<!-- wp:column {"verticalAlignment":"center","width":80} -->
+	<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%">
+	<!-- wp:paragraph {"fontSize":"extra-large"} --><p class="has-extra-large-font-size"><a href="#"><?php esc_html_e( 'Reading', 'tt1-blocks' ); ?></a></p><!-- /wp:paragraph -->
+	</div>
+	<!-- /wp:column -->
+	<!-- wp:column {"verticalAlignment":"center"} -->
+	<div class="wp-block-column is-vertically-aligned-center">
+		<!-- wp:image {"align":"right","width":51,"height":67,"sizeSlug":"large"} --><figure class="wp-block-image alignright size-large is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/Reading.jpg" alt="<?php esc_attr_e( '&#8220;Reading&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="51" height="67"/></figure><!-- /wp:image -->
+	</div><!-- /wp:column -->
+</div><!-- /wp:columns -->
+<!-- wp:separator {"className":"is-style-twentytwentyone-separator-thick"} --><hr class="wp-block-separator is-style-twentytwentyone-separator-thick"/><!-- /wp:separator -->
diff --git a/tt1-blocks/patterns/two-images.php b/tt1-blocks/patterns/two-images.php
new file mode 100644
index 0000000..1abd8e3
--- /dev/null
+++ b/tt1-blocks/patterns/two-images.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Title: Two Images Showcase
+ * Slug: tt1-blocks/two-images-showcase
+ * Categories: tt1-blocks
+ * Block Types: core/columns
+ * Description: A Media & Text block with a big image on the left and a smaller one with bordered frame on the right.
+ * ViewportWidth: 1440
+ *
+ * @package TT1_Blocks
+ * @since 0.4.9
+ */
+
+?>
+<!-- wp:media-text {"mediaLink":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/Daffodils.jpg","mediaType":"image"} --><div class="wp-block-media-text alignwide is-stacked-on-mobile"><figure class="wp-block-media-text__media"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/Daffodils.jpg" alt="<?php esc_attr_e( '&#8220;Daffodils&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" /></figure>
+<div class="wp-block-media-text__content"><!-- wp:image {"align":"center","width":400,"height":512,"sizeSlug":"large","className":"is-style-twentytwentyone-image-frame"} --><figure class="wp-block-image aligncenter size-large is-resized is-style-twentytwentyone-image-frame"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>'/assets/images/self-portrait-1885.jpg" alt="<?php esc_attr_e( '&#8220;Self portrait&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="400" height="512"/></figure><!-- /wp:image -->
+</div></div><!-- /wp:media-text -->
diff --git a/tt1-blocks/readme.txt b/tt1-blocks/readme.txt
index f030bdf..4714c3b 100644
--- a/tt1-blocks/readme.txt
+++ b/tt1-blocks/readme.txt
@@ -1,9 +1,9 @@
 === TT1 Blocks ===
 Contributors: wordpressdotorg
-Requires at least: 5.6
-Tested up to: 5.8
+Requires at least: 6.0
+Tested up to: 6.0
 Requires PHP: 5.6
-Stable tag: 0.4.8
+Stable tag: 0.4.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
diff --git a/tt1-blocks/style.css b/tt1-blocks/style.css
index a13dd86..2398039 100644
--- a/tt1-blocks/style.css
+++ b/tt1-blocks/style.css
@@ -4,10 +4,10 @@ Theme URI: https://github.com/WordPress/theme-experiments/tree/master/tt1-blocks
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: TT1 Blocks is an experimental block-based version of the Twenty Twenty-One theme. It is built to leverage the full-site editing functionality that is being built in the Gutenberg plugin. This theme is not meant for use on a production site.
-Requires at least: 5.6
-Tested up to: 5.8
+Requires at least: 6.0
+Tested up to: 6.0
 Requires PHP: 5.6
-Version: 0.4.8
+Version: 0.4.9
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: tt1-blocks
@@ -16,11 +16,3 @@ Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, feature
 TT1 Blocks WordPress Theme, (C) 2020 WordPress.org
 TT1 Blocks is distributed under the terms of the GNU GPL.
 */
-
-/*--------------------------------------------------------------
-# Defaults
---------------------------------------------------------------*/
-
-body {
-	margin: 0;
-}
diff --git a/tt1-blocks/block-templates/404.html b/tt1-blocks/templates/404.html
similarity index 100%
rename from tt1-blocks/block-templates/404.html
rename to tt1-blocks/templates/404.html
diff --git a/tt1-blocks/templates/archive.html b/tt1-blocks/templates/archive.html
new file mode 100644
index 0000000..4e2bab6
--- /dev/null
+++ b/tt1-blocks/templates/archive.html
@@ -0,0 +1,54 @@
+<!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
+
+<!-- wp:group {"tagName":"main"} -->
+<main class="wp-block-group">
+	<!-- wp:query {"query":{"perPage":"10","pages":"100","offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":"","inherit":true},"displayLayout":{"type":"list"}} -->
+	<div class="wp-block-query">
+		<!-- wp:post-template -->
+			<!-- wp:group {"layout":{"inherit":true}} -->
+			<div class="wp-block-group">
+				<!-- wp:post-title {"isLink":true} /-->
+				<!-- wp:post-excerpt /-->
+			</div><!-- /wp:group -->
+
+			<!-- wp:group {"style":{"spacing":{"padding":{"top":"50px"},"blockGap":"0px"}},"layout":{"inherit":true}} -->
+			<div class="wp-block-group" style="padding-top:50px">
+				<!-- wp:group {"style":{"spacing":{"blockGap":"6px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+				<div class="wp-block-group">
+					<!-- wp:paragraph {"fontSize":"extra-small"} -->
+					<p class="has-extra-small-font-size">Published</p>
+					<!-- /wp:paragraph -->
+					<!-- wp:post-date /-->
+				</div>
+				<!-- /wp:group -->
+				
+				<!-- wp:post-terms {"term":"category","textAlign":"left","prefix":"Categorized as "} /-->
+				<!-- wp:post-terms {"term":"post_tag","textAlign":"left","prefix":"Tagged "} /-->
+
+				<!-- wp:spacer {"height":"70px"} -->
+				<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+				<!-- /wp:spacer -->
+				<!-- wp:separator {"opacity":"css","className":"aligncenter is-style-default"} -->
+				<hr class="wp-block-separator has-css-opacity aligncenter is-style-default"/>
+				<!-- /wp:separator -->
+				<!-- wp:spacer {"height":"70px"} -->
+				<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+				<!-- /wp:spacer -->
+			</div>
+			<!-- /wp:group -->
+		<!-- /wp:post-template -->
+		<!-- wp:group {"layout":{"inherit":true}} -->
+		<div class="wp-block-group">
+			<!-- wp:query-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+			<!-- wp:query-pagination-previous /-->
+			<!-- wp:query-pagination-numbers /-->
+			<!-- wp:query-pagination-next /-->
+			<!-- /wp:query-pagination -->
+		</div>
+		<!-- /wp:group -->
+	</div>
+	<!-- /wp:query -->
+</main>
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
diff --git a/tt1-blocks/templates/index.html b/tt1-blocks/templates/index.html
new file mode 100644
index 0000000..4e2bab6
--- /dev/null
+++ b/tt1-blocks/templates/index.html
@@ -0,0 +1,54 @@
+<!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
+
+<!-- wp:group {"tagName":"main"} -->
+<main class="wp-block-group">
+	<!-- wp:query {"query":{"perPage":"10","pages":"100","offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":"","inherit":true},"displayLayout":{"type":"list"}} -->
+	<div class="wp-block-query">
+		<!-- wp:post-template -->
+			<!-- wp:group {"layout":{"inherit":true}} -->
+			<div class="wp-block-group">
+				<!-- wp:post-title {"isLink":true} /-->
+				<!-- wp:post-excerpt /-->
+			</div><!-- /wp:group -->
+
+			<!-- wp:group {"style":{"spacing":{"padding":{"top":"50px"},"blockGap":"0px"}},"layout":{"inherit":true}} -->
+			<div class="wp-block-group" style="padding-top:50px">
+				<!-- wp:group {"style":{"spacing":{"blockGap":"6px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+				<div class="wp-block-group">
+					<!-- wp:paragraph {"fontSize":"extra-small"} -->
+					<p class="has-extra-small-font-size">Published</p>
+					<!-- /wp:paragraph -->
+					<!-- wp:post-date /-->
+				</div>
+				<!-- /wp:group -->
+				
+				<!-- wp:post-terms {"term":"category","textAlign":"left","prefix":"Categorized as "} /-->
+				<!-- wp:post-terms {"term":"post_tag","textAlign":"left","prefix":"Tagged "} /-->
+
+				<!-- wp:spacer {"height":"70px"} -->
+				<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+				<!-- /wp:spacer -->
+				<!-- wp:separator {"opacity":"css","className":"aligncenter is-style-default"} -->
+				<hr class="wp-block-separator has-css-opacity aligncenter is-style-default"/>
+				<!-- /wp:separator -->
+				<!-- wp:spacer {"height":"70px"} -->
+				<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+				<!-- /wp:spacer -->
+			</div>
+			<!-- /wp:group -->
+		<!-- /wp:post-template -->
+		<!-- wp:group {"layout":{"inherit":true}} -->
+		<div class="wp-block-group">
+			<!-- wp:query-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+			<!-- wp:query-pagination-previous /-->
+			<!-- wp:query-pagination-numbers /-->
+			<!-- wp:query-pagination-next /-->
+			<!-- /wp:query-pagination -->
+		</div>
+		<!-- /wp:group -->
+	</div>
+	<!-- /wp:query -->
+</main>
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
diff --git a/tt1-blocks/block-templates/page-home.html b/tt1-blocks/templates/page-without-title.html
similarity index 100%
rename from tt1-blocks/block-templates/page-home.html
rename to tt1-blocks/templates/page-without-title.html
diff --git a/tt1-blocks/theme.json b/tt1-blocks/theme.json
index dd30eac..d350758 100644
--- a/tt1-blocks/theme.json
+++ b/tt1-blocks/theme.json
@@ -1,15 +1,5 @@
 {
-	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
-		{
-			"name": "footer",
-			"area": "footer"
-		}
-	],
+	"version": 2,
 	"settings": {
 		"appearanceTools": true,
 		"color": {
@@ -332,8 +322,20 @@
 	},
 	"customTemplates": [
 		{
-			"name": "page-home",
+			"name": "page-without-title",
 			"title": "Page without title"
 		}
+	],
+	"templateParts": [
+		{
+			"name": "header",
+			"area": "header",
+			"title": "Header"
+		},
+		{
+			"name": "footer",
+			"area": "footer",
+			"title": "Footer"
+		}
 	]
 }
\ No newline at end of file

From b00a85941ddfbb93327b2e3be70c7822cf7fac57 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 6 Jul 2022 12:25:44 +0200
Subject: [PATCH 02/10] Update blocks.css

---
 tt1-blocks/assets/css/blocks.css | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tt1-blocks/assets/css/blocks.css b/tt1-blocks/assets/css/blocks.css
index f18414c..37ad697 100644
--- a/tt1-blocks/assets/css/blocks.css
+++ b/tt1-blocks/assets/css/blocks.css
@@ -168,12 +168,3 @@
 .wp-block-separator:not(.is-style-wide):not(.is-style-dots) {
 	width: 100%;
 }
-
-
-/*--------------------------------------------------------------
-# Single view Post Title
---------------------------------------------------------------*/
-
-h1.wp-block-post-title {
-	font-weight: var(--wp--custom--font-weight--light);
-}

From 127d91750f3374136cdb9d87029cda447f0f476a Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 6 Jul 2022 13:06:24 +0200
Subject: [PATCH 03/10] Sort theme.json, remove duplicate tagline style

---
 tt1-blocks/theme.json | 196 +++++++++++++++++++++---------------------
 1 file changed, 97 insertions(+), 99 deletions(-)

diff --git a/tt1-blocks/theme.json b/tt1-blocks/theme.json
index 6008d5e..8e15696 100644
--- a/tt1-blocks/theme.json
+++ b/tt1-blocks/theme.json
@@ -1,5 +1,11 @@
 {
 	"version": 2,
+	"customTemplates": [
+		{
+			"name": "page-without-title",
+			"title": "Page without title"
+		}
+	],
 	"settings": {
 		"appearanceTools": true,
 		"color": {
@@ -98,6 +104,24 @@
 				}
 			]
 		},
+		"custom": {
+			"font-primary": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
+			"line-height": {
+				"body": 1.7,
+				"heading": 1.3,
+				"page-title": 1.1
+			},
+			"spacing": {
+				"unit": "20px",
+				"horizontal": "25px",
+				"vertical": "30px",
+				"outer": "calc(0.6 * var(--wp--custom--spacing--horizontal))"
+			},
+			"font-weight":{
+				"light": "300",
+				"normal": "normal"
+			}
+		},
 		"layout": {
 			"contentSize": "610px",
 			"wideSize": "1240px"
@@ -163,88 +187,10 @@
 					"slug": "hoefler-times-new-roman"
 				}
 			]
-		},
-		"custom": {
-			"font-primary": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
-			"line-height": {
-				"body": 1.7,
-				"heading": 1.3,
-				"page-title": 1.1
-			},
-			"spacing": {
-				"unit": "20px",
-				"horizontal": "25px",
-				"vertical": "30px",
-				"outer": "calc(0.6 * var(--wp--custom--spacing--horizontal))"
-			},
-			"font-weight":{
-				"light": "300",
-				"normal": "normal"
-			}
 		}
 	},
 	"styles": {
-		"color": {
-			"background": "var(--wp--preset--color--green)",
-			"text": "var(--wp--preset--color--dark-gray)"
-		},
-		"typography": {
-			"fontSize": "var(--wp--preset--font-size--normal)",
-			"lineHeight": "var(--wp--custom--line-height--body)"
-		},
-		"elements": {
-			"link": {
-				"color": {
-					"text": "var(--wp--preset--color--dark-gray)"
-				}
-			},
-			"h1": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--gigantic)",
-					"lineHeight": "var(--wp--custom--line-height--page-title)",
-					"fontWeight": "var(--wp--custom--font-weight--normal)"
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--extra-large)",
-					"lineHeight": "var(--wp--custom--line-height--heading)",
-					"fontWeight": "var(--wp--custom--font-weight--normal)"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontSize": "calc(1.25 * var(--wp--preset--font-size--large))",
-					"lineHeight": "var(--wp--custom--line-height--heading)",
-					"fontWeight": "var(--wp--custom--font-weight--normal)"
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"lineHeight": "var(--wp--custom--line-height--heading)"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": "var(--wp--custom--line-height--heading)"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--extra-small)",
-					"lineHeight": "var(--wp--custom--line-height--heading)"
-				}
-			}
-		},
 		"blocks": {
-			"core/site-tagline": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": 1.4
-				}
-			},
 			"core/button": {
 				"border": {
 					"radius": "0px"
@@ -258,6 +204,22 @@
 					"fontWeight": 500
 				}
 			},
+			"core/code": {
+				"spacing": {
+					"padding": {
+						"top": "var(--wp--custom--spacing--unit)",
+						"bottom": "var(--wp--custom--spacing--unit)",
+						"left": "var(--wp--custom--spacing--unit)",
+						"right": "var(--wp--custom--spacing--unit)"
+					}
+				},
+				"border": {
+					"radius": "0px",
+					"color": "var(--wp--preset--color--dark-gray)",
+					"style": "solid",
+					"width": "1.5px"
+				}
+			},
 			"core/post-author": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--extra-small)",
@@ -296,6 +258,10 @@
 				}
 			},
 			"core/site-tagline": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": 1.4
+				},
 				"spacing": {
 					"margin": {
 						"top": "0",
@@ -309,31 +275,63 @@
 					"fontWeight": "var(--wp--custom--font-weight--normal)",
 					"textTransform": "uppercase"
 				}
+			}
+		},
+		"color": {
+			"background": "var(--wp--preset--color--green)",
+			"text": "var(--wp--preset--color--dark-gray)"
+		},
+		"elements": {
+			"link": {
+				"color": {
+					"text": "var(--wp--preset--color--dark-gray)"
+				}
 			},
-			"core/code": {
-				"spacing": {
-					"padding": {
-						"top": "var(--wp--custom--spacing--unit)",
-						"bottom": "var(--wp--custom--spacing--unit)",
-						"left": "var(--wp--custom--spacing--unit)",
-						"right": "var(--wp--custom--spacing--unit)"
-					}
-				},
-				"border": {
-					"radius": "0px",
-					"color": "var(--wp--preset--color--dark-gray)",
-					"style": "solid",
-					"width": "1.5px"
+			"h1": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--gigantic)",
+					"lineHeight": "var(--wp--custom--line-height--page-title)",
+					"fontWeight": "var(--wp--custom--font-weight--normal)"
+				}
+			},
+			"h2": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--extra-large)",
+					"lineHeight": "var(--wp--custom--line-height--heading)",
+					"fontWeight": "var(--wp--custom--font-weight--normal)"
+				}
+			},
+			"h3": {
+				"typography": {
+					"fontSize": "calc(1.25 * var(--wp--preset--font-size--large))",
+					"lineHeight": "var(--wp--custom--line-height--heading)",
+					"fontWeight": "var(--wp--custom--font-weight--normal)"
+				}
+			},
+			"h4": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": "var(--wp--custom--line-height--heading)"
+				}
+			},
+			"h5": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "var(--wp--custom--line-height--heading)"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--extra-small)",
+					"lineHeight": "var(--wp--custom--line-height--heading)"
 				}
 			}
+		},
+		"typography": {
+			"fontSize": "var(--wp--preset--font-size--normal)",
+			"lineHeight": "var(--wp--custom--line-height--body)"
 		}
 	},
-	"customTemplates": [
-		{
-			"name": "page-without-title",
-			"title": "Page without title"
-		}
-	],
 	"templateParts": [
 		{
 			"name": "header",
@@ -346,4 +344,4 @@
 			"title": "Footer"
 		}
 	]
-}
\ No newline at end of file
+}

From 259a6e67c25b927a45d92e27ea78bd683d430f02 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 6 Jul 2022 13:08:14 +0200
Subject: [PATCH 04/10] Update theme.json

---
 tt1-blocks/theme.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tt1-blocks/theme.json b/tt1-blocks/theme.json
index 8e15696..5e16533 100644
--- a/tt1-blocks/theme.json
+++ b/tt1-blocks/theme.json
@@ -220,6 +220,26 @@
 					"width": "1.5px"
 				}
 			},
+			"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)"
+				}
+			},
 			"core/post-author": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--extra-small)",

From e43f01a58c2a6560126bd3d65b9f94339a6436b8 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 6 Jul 2022 13:20:34 +0200
Subject: [PATCH 05/10] Fixes an image path in a pattern.

---
 tt1-blocks/patterns/overlapping-images.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tt1-blocks/patterns/overlapping-images.php b/tt1-blocks/patterns/overlapping-images.php
index 8dce715..4c8b422 100644
--- a/tt1-blocks/patterns/overlapping-images.php
+++ b/tt1-blocks/patterns/overlapping-images.php
@@ -19,7 +19,7 @@
 			<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/roses-tremieres-hollyhocks-1884.jpg" alt="<?php esc_attr_e( '&#8220;Roses Trémières&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/>
 		</figure><!-- /wp:image -->
 		<!-- wp:spacer --><div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div><!-- /wp:spacer -->
-		<!-- wp:image {"align":"full","sizeSlug":"full"} --><figure class="wp-block-image alignfull size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?> /assets/images/in-the-bois-de-boulogne.jpg" alt="<?php esc_attr_e( '&#8220;In the Bois de Boulogne&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/></figure><!-- /wp:image -->
+		<!-- wp:image {"align":"full","sizeSlug":"full"} --><figure class="wp-block-image alignfull size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/in-the-bois-de-boulogne.jpg" alt="<?php esc_attr_e( '&#8220;In the Bois de Boulogne&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/></figure><!-- /wp:image -->
 	</div><!-- /wp:column -->
 	<!-- wp:column {"verticalAlignment":"center"} -->
 	<div class="wp-block-column is-vertically-aligned-center">

From 2ab53528d27f465d7b8017b57da08c8e6dfc0ccd Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 6 Jul 2022 13:23:42 +0200
Subject: [PATCH 06/10] Fixes another image path, and file endings

---
 tt1-blocks/patterns/media-text-article.php          | 1 -
 tt1-blocks/patterns/overlapping-images-and-text.php | 2 +-
 tt1-blocks/patterns/overlapping-images.php          | 1 -
 tt1-blocks/patterns/two-images.php                  | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tt1-blocks/patterns/media-text-article.php b/tt1-blocks/patterns/media-text-article.php
index 8d22416..0444a29 100644
--- a/tt1-blocks/patterns/media-text-article.php
+++ b/tt1-blocks/patterns/media-text-article.php
@@ -22,4 +22,3 @@
 		<p class="has-text-align-center has-small-font-size"><?php echo wp_kses_post( __( 'Berthe Morisot<br>(French, 1841-1895)', 'tt1-blocks' ) ); ?></p><!-- /wp:paragraph -->
 	</div>
 </div><!-- /wp:media-text -->
-
diff --git a/tt1-blocks/patterns/overlapping-images-and-text.php b/tt1-blocks/patterns/overlapping-images-and-text.php
index 9062b79..331af00 100644
--- a/tt1-blocks/patterns/overlapping-images-and-text.php
+++ b/tt1-blocks/patterns/overlapping-images-and-text.php
@@ -34,4 +34,4 @@
 		<!-- wp:image {sizeSlug":"full"} --><figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/villa-with-orange-trees-nice.jpg" alt="<?php esc_attr_e( '&#8220;Villa with Orange Trees, Nice&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>"/></figure><!-- /wp:image -->
 	</div><!-- /wp:column -->
 </div>
-<!-- /wp:columns -->
\ No newline at end of file
+<!-- /wp:columns -->
diff --git a/tt1-blocks/patterns/overlapping-images.php b/tt1-blocks/patterns/overlapping-images.php
index 4c8b422..9e33662 100644
--- a/tt1-blocks/patterns/overlapping-images.php
+++ b/tt1-blocks/patterns/overlapping-images.php
@@ -29,4 +29,3 @@
 			<!-- /wp:image -->
 	</div><!-- /wp:column -->
 </div><!-- /wp:columns -->
-
diff --git a/tt1-blocks/patterns/two-images.php b/tt1-blocks/patterns/two-images.php
index 1abd8e3..5d39a02 100644
--- a/tt1-blocks/patterns/two-images.php
+++ b/tt1-blocks/patterns/two-images.php
@@ -13,5 +13,5 @@
 
 ?>
 <!-- wp:media-text {"mediaLink":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/Daffodils.jpg","mediaType":"image"} --><div class="wp-block-media-text alignwide is-stacked-on-mobile"><figure class="wp-block-media-text__media"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/Daffodils.jpg" alt="<?php esc_attr_e( '&#8220;Daffodils&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" /></figure>
-<div class="wp-block-media-text__content"><!-- wp:image {"align":"center","width":400,"height":512,"sizeSlug":"large","className":"is-style-twentytwentyone-image-frame"} --><figure class="wp-block-image aligncenter size-large is-resized is-style-twentytwentyone-image-frame"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>'/assets/images/self-portrait-1885.jpg" alt="<?php esc_attr_e( '&#8220;Self portrait&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="400" height="512"/></figure><!-- /wp:image -->
+<div class="wp-block-media-text__content"><!-- wp:image {"align":"center","width":400,"height":512,"sizeSlug":"large","className":"is-style-twentytwentyone-image-frame"} --><figure class="wp-block-image aligncenter size-large is-resized is-style-twentytwentyone-image-frame"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/self-portrait-1885.jpg" alt="<?php esc_attr_e( '&#8220;Self portrait&#8221; by Berthe Morisot', 'tt1-blocks' ); ?>" width="400" height="512"/></figure><!-- /wp:image -->
 </div></div><!-- /wp:media-text -->

From 771c769ae65c6feb257120355f63a161a112e99e Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 6 Jul 2022 13:33:28 +0200
Subject: [PATCH 07/10] Add missing border to pattern.

---
 tt1-blocks/patterns/overlapping-images-and-text.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tt1-blocks/patterns/overlapping-images-and-text.php b/tt1-blocks/patterns/overlapping-images-and-text.php
index 331af00..f0dbc31 100644
--- a/tt1-blocks/patterns/overlapping-images-and-text.php
+++ b/tt1-blocks/patterns/overlapping-images-and-text.php
@@ -21,8 +21,8 @@
 	</div><!-- /wp:column -->
 	<!-- wp:column {"verticalAlignment":"bottom"} -->
 	<div class="wp-block-column is-vertically-aligned-bottom">
-		<!-- wp:group {"className":"is-style-twentytwentyone-border","backgroundColor":"green"} -->
-		<div class="wp-block-group is-style-twentytwentyone-border has-green-background-color has-background">
+		<!-- wp:group {"style":{"border":{"width":"3px"}},"borderColor":"dark-gray","backgroundColor":"green"} -->
+		<div class="wp-block-group has-border-color has-dark-gray-border-color has-green-background-color has-background" style="border-width:3px">
 			<div class="wp-block-group__inner-container">
 				<!-- wp:paragraph {"fontSize":"extra-large","style":{"typography":{"lineHeight":"1.4"}}} -->
 				<p class="has-extra-large-font-size" style="line-height:1.4"><?php esc_html_e( 'Beautiful gardens painted by Berthe Morisot in the late 1800s', 'tt1-blocks' ); ?></p><!-- /wp:paragraph -->

From f2d56c28a88ce10d0f60eaa2092c3534aca5539b Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Wed, 6 Jul 2022 13:38:05 +0200
Subject: [PATCH 08/10] Simplify border style CSS

---
 tt1-blocks/assets/css/blocks.css | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/tt1-blocks/assets/css/blocks.css b/tt1-blocks/assets/css/blocks.css
index 37ad697..5bc21bf 100644
--- a/tt1-blocks/assets/css/blocks.css
+++ b/tt1-blocks/assets/css/blocks.css
@@ -1,8 +1,11 @@
+
 /*--------------------------------------------------------------
-# Cover
+# Border, for backwards compatibility
 --------------------------------------------------------------*/
 
-.wp-block-cover.is-style-twentytwentyone-border {
+.is-style-twentytwentyone-border,
+.wp-block-image.is-style-twentytwentyone-border img,
+.wp-block-image.is-style-twentytwentyone-image-frame img {
 	border: 3px solid var(--wp--preset--color--dark-gray);
 }
 
@@ -50,11 +53,6 @@
 # Image
 --------------------------------------------------------------*/
 
-.wp-block-image.is-style-twentytwentyone-border img,
-.wp-block-image.is-style-twentytwentyone-image-frame img {
-	border: 3px solid var(--wp--preset--color--dark-gray);
-}
-
 .wp-block-image.is-style-twentytwentyone-image-frame img {
 	padding: var(--wp--custom--spacing--unit);
 }
@@ -133,14 +131,6 @@
 	margin-bottom: var(--wp--custom--spacing--horizontal);
 }
 
-/*--------------------------------------------------------------
-# Media & Text
---------------------------------------------------------------*/
-
-.wp-block-media-text.is-style-twentytwentyone-border {
-	border: 3px solid var(--wp--preset--color--dark-gray);
-}
-
 /*--------------------------------------------------------------
 # Navigation
 --------------------------------------------------------------*/
@@ -156,7 +146,7 @@
 # Separator
 --------------------------------------------------------------*/
 
-.wp-block-separator :not(.has-text-color) {
+.wp-block-separator:not(.has-text-color) {
 	border-bottom: 1px solid var(--wp--preset--color--dark-gray);
 }
 

From e40c61807af9d8c1ee1ab37a2d8090cdb7142270 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Wed, 6 Jul 2022 14:05:01 +0200
Subject: [PATCH 09/10] Update tt1-blocks/style.css

---
 tt1-blocks/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tt1-blocks/style.css b/tt1-blocks/style.css
index 2398039..0a80d50 100644
--- a/tt1-blocks/style.css
+++ b/tt1-blocks/style.css
@@ -7,7 +7,7 @@ Description: TT1 Blocks is an experimental block-based version of the Twenty Twe
 Requires at least: 6.0
 Tested up to: 6.0
 Requires PHP: 5.6
-Version: 0.4.9
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: tt1-blocks

From 59cf3046f1138adb2ddc429f4ee1bec0492dd172 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Wed, 6 Jul 2022 14:06:24 +0200
Subject: [PATCH 10/10] Update tt1-blocks/readme.txt

---
 tt1-blocks/readme.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tt1-blocks/readme.txt b/tt1-blocks/readme.txt
index 4714c3b..887956b 100644
--- a/tt1-blocks/readme.txt
+++ b/tt1-blocks/readme.txt
@@ -3,7 +3,6 @@ Contributors: wordpressdotorg
 Requires at least: 6.0
 Tested up to: 6.0
 Requires PHP: 5.6
-Stable tag: 0.4.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html