diff --git a/rainfall/assets/images/home.jpg b/rainfall/assets/images/home.jpg
new file mode 100644
index 0000000000..4755d5f3a0
Binary files /dev/null and b/rainfall/assets/images/home.jpg differ
diff --git a/rainfall/parts/footer.html b/rainfall/parts/footer.html
index 6796a450d2..f9fb79fdbe 100644
--- a/rainfall/parts/footer.html
+++ b/rainfall/parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"layout":{"type":"default"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|110","right":"var:preset|spacing|90","left":"var:preset|spacing|90"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--110);padding-right:var(--wp--preset--spacing--90);padding-left:var(--wp--preset--spacing--90)"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|110","right":"var:preset|spacing|90","left":"var:preset|spacing|90"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--90);padding-bottom:var(--wp--preset--spacing--110);padding-left:var(--wp--preset--spacing--90)"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
 <!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","orientation":"horizontal"}} -->
-<div class="wp-block-group"><!-- wp:navigation {"overlayMenu":"never","overlayBackgroundColor":"black","overlayTextColor":"white","layout":{"type":"flex","justifyContent":"left"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"var:preset|spacing|90"}}} /--></div>
+<div class="wp-block-group"><!-- wp:navigation {"overlayMenu":"never","overlayBackgroundColor":"black","overlayTextColor":"white","style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"20px"}},"layout":{"type":"flex","justifyContent":"left"}} /--></div>
 <!-- /wp:group --></div>
 <!-- /wp:group --></div>
-<!-- /wp:group -->
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/rainfall/parts/header.html b/rainfall/parts/header.html
index 5ff293d8b2..790ee461b6 100644
--- a/rainfall/parts/header.html
+++ b/rainfall/parts/header.html
@@ -1,11 +1,11 @@
-<!-- wp:group {"layout":{"type":"default"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","right":"var:preset|spacing|90","left":"var:preset|spacing|90"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--90);padding-left:var(--wp--preset--spacing--90)"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","right":"var:preset|spacing|90","left":"var:preset|spacing|90"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--90);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--90)"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
-<!-- wp:navigation {"overlayMenu":"never","overlayBackgroundColor":"black","overlayTextColor":"white","layout":{"type":"flex","justifyContent":"left"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"var:preset|spacing|90"}}} /--></div>
+<!-- wp:navigation {"overlayBackgroundColor":"black","overlayTextColor":"white","style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"20px"}},"layout":{"type":"flex","justifyContent":"left"}} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--110)"} -->
+<!-- wp:spacer {"height":"var:preset|spacing|110"} -->
 <div style="height:var(--wp--preset--spacing--110)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer --></div>
-<!-- /wp:group -->
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/rainfall/parts/query.html b/rainfall/parts/query.html
index 5e2827a28e..7111df270f 100644
--- a/rainfall/parts/query.html
+++ b/rainfall/parts/query.html
@@ -1,51 +1,45 @@
-<!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignwide">
-    <!-- wp:columns {"align":"wide"} -->
-    <div class="wp-block-columns alignwide">
-        <!-- wp:column {"width":"70%","style":{"spacing":{"padding":{"top":"var:preset|spacing|40","right":"0px","bottom":"var:preset|spacing|40","left":"0px"}}}} -->
-        <div class="wp-block-column" style="padding-top:var(--wp--preset--spacing--40);padding-right:0px;padding-bottom:var(--wp--preset--spacing--40);padding-left:0px;flex-basis:70%">
-            <!-- wp:query {"queryId":0,"query":{"pages":0,"offset":0,"postType":"post","inherit":true,"perPage":10},"displayLayout":{"type":"list"}} -->
-            <div class="wp-block-query">
-                <!-- wp:post-template -->
-                    <!-- wp:columns {"verticalAlignment":"center","align":"wide","style":{"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"width":"1px"},"left":{"width":"0px","style":"none"}},"spacing":{"margin":{"bottom":"0px"},"padding":{"top":"0px","right":"0px","bottom":"var(--wp--style--block-gap)","left":"0px"}}}} -->
-                    <div class="wp-block-columns alignwide are-vertically-aligned-center" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:var(--wp--style--block-gap);padding-left:0px">
-                        <!-- wp:column {"verticalAlignment":"center","width":"100px"} -->
-                        <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:100px">
-                            <!-- wp:post-date {"format":"M j","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
-                        </div>
-                        <!-- /wp:column -->
-
-                        <!-- wp:column {"verticalAlignment":"center","width":"53.34%"} -->
-                        <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:53.34%">
-                            <!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.1","textTransform":"uppercase","fontStyle":"normal","fontWeight":"400"},"color":{"text":"#ffffff","link":"#ffffff"}},"fontSize":"large"} /-->
-                        </div>
-                        <!-- /wp:column -->
-
-                        <!-- wp:column {"width":"180px"} -->
-                        <div class="wp-block-column" style="flex-basis:180px">
-                            <!-- wp:post-featured-image {"width":"179px","height":"100px"} /-->
-                        </div>
-                        <!-- /wp:column -->
-                    </div>
-                    <!-- /wp:columns -->
-                <!-- /wp:post-template -->
-
-                <!-- wp:query-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
-                    <!-- wp:query-pagination-previous /-->
-
-                    <!-- wp:query-pagination-next /-->
-                <!-- /wp:query-pagination -->
-            </div>
-            <!-- /wp:query -->
-        </div>
-        <!-- /wp:column -->
-
-        <!-- wp:column {"width":"30%","style":{"spacing":{"padding":{"top":"var:preset|spacing|40","right":"0px","bottom":"var:preset|spacing|40","left":"0px"}}}} -->
-        <div class="wp-block-column" style="padding-top:var(--wp--preset--spacing--40);padding-right:0px;padding-bottom:var(--wp--preset--spacing--40);padding-left:0px;flex-basis:30%">
-            <!-- wp:template-part {"slug":"sidebar"} /-->
-        </div>
-        <!-- /wp:column -->
-    </div>
-    <!-- /wp:columns -->
-</div>
-<!-- /wp:group -->
+<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group alignwide" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:spacer {"height":"var:preset|spacing|50"} -->
+<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|100","left":"var:preset|spacing|200"}}}} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"width":"70%","style":{"spacing":{"padding":{"top":"var:preset|spacing|40","right":"0px","bottom":"var:preset|spacing|40","left":"0px"}}}} -->
+<div class="wp-block-column" style="padding-top:var(--wp--preset--spacing--40);padding-right:0px;padding-bottom:var(--wp--preset--spacing--40);padding-left:0px;flex-basis:70%"><!-- wp:query {"queryId":0,"query":{"pages":0,"offset":0,"postType":"post","inherit":true,"perPage":10}} -->
+<div class="wp-block-query"><!-- wp:post-template {"layout":{"type":"default"}} -->
+<!-- wp:columns {"verticalAlignment":"center","align":"wide","style":{"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"width":"1px"},"left":{"width":"0px","style":"none"}},"spacing":{"margin":{"bottom":"0px"},"padding":{"top":"0px","right":"0px","bottom":"20px","left":"0px"}}}} -->
+<div class="wp-block-columns alignwide are-vertically-aligned-center" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:20px;padding-left:0px"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->
+<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"format":"M j","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"verticalAlignment":"center","width":"65%"} -->
+<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:65%"><!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.1","textTransform":"uppercase","fontStyle":"normal","fontWeight":"400"},"color":{"text":"#ffffff","link":"#ffffff"}},"fontSize":"large"} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"width":"15%"} -->
+<div class="wp-block-column" style="flex-basis:15%"><!-- wp:post-featured-image {"isLink":true,"aspectRatio":"4/3","width":"","height":""} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+<!-- /wp:post-template -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:query-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<!-- wp:query-pagination-previous /-->
+
+<!-- wp:query-pagination-next /-->
+<!-- /wp:query-pagination --></div>
+<!-- /wp:query --></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"width":"30%","style":{"spacing":{"padding":{"top":"var:preset|spacing|40","right":"0px","bottom":"var:preset|spacing|40","left":"0px"}}}} -->
+<div class="wp-block-column" style="padding-top:var(--wp--preset--spacing--40);padding-right:0px;padding-bottom:var(--wp--preset--spacing--40);padding-left:0px;flex-basis:30%"><!-- wp:template-part {"slug":"sidebar"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|110"} -->
+<div style="height:var(--wp--preset--spacing--110)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/rainfall/parts/sidebar.html b/rainfall/parts/sidebar.html
index 7ce14a1621..09e6e6cf6a 100644
--- a/rainfall/parts/sidebar.html
+++ b/rainfall/parts/sidebar.html
@@ -1 +1 @@
-<!-- wp:pattern {"slug":"rainfall/sidebar"} /-->
+<!-- wp:pattern {"slug":"rainfall/sidebar"} /-->
\ No newline at end of file
diff --git a/rainfall/patterns/404.php b/rainfall/patterns/404.php
new file mode 100644
index 0000000000..f41c79a7a9
--- /dev/null
+++ b/rainfall/patterns/404.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Title: 404
+ * Slug: rainfall/404
+ * Inserter: no
+ */
+?>
+<!-- wp:group {"backgroundColor":"light-orange"} -->
+<div class="wp-block-group has-light-orange-background-color has-background"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"align":"wide"} -->
+<div class="wp-block-group alignwide"><!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"width":"100%"} -->
+<div class="wp-block-column" style="flex-basis:100%"><!-- wp:heading {"level":1,"fontSize":"xx-large"} -->
+<h1 class="wp-block-heading has-xx-large-font-size"><?php esc_html_e('Page not Found', 'rainfall');?></h1>
+<!-- /wp:heading --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|50"} -->
+<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"0","left":"0"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group alignfull" style="padding-right:0;padding-left:0"><!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:spacer {"height":"var:preset|spacing|50"} -->
+<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:paragraph -->
+<p><?php esc_html_e('The page you requested cannot be found, maybe try a search?', 'rainfall');?></p>
+<!-- /wp:paragraph -->
+
+<!-- wp:search {"label":"Search","showLabel":false,"placeholder":"Type something...","buttonText":"Search"} /--></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"30vh"} -->
+<div style="height:30vh" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/rainfall/patterns/index.php b/rainfall/patterns/index.php
new file mode 100644
index 0000000000..3a56686869
--- /dev/null
+++ b/rainfall/patterns/index.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Title: index
+ * Slug: rainfall/index
+ * Inserter: no
+ */
+?>
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"}}},"backgroundColor":"orange","layout":{"type":"default"}} -->
+<div class="wp-block-group has-orange-background-color has-background" style="padding-right:0;padding-left:0"><!-- wp:template-part {"slug":"header"} /-->
+
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"width":"75%"} -->
+<div class="wp-block-column" style="flex-basis:75%"><!-- wp:heading {"className":"indented-post-title","fontSize":"xx-large"} -->
+<h2 class="wp-block-heading indented-post-title has-xx-large-font-size"><?php esc_html_e('The City That Never Sleeps', 'rainfall');?></h2>
+<!-- /wp:heading --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+
+<!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"bottom","width":"33.33%"} -->
+<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:33.33%"><!-- wp:heading {"fontSize":"xx-large"} -->
+<h2 class="wp-block-heading has-xx-large-font-size"><?php esc_html_e('002', 'rainfall');?></h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph {"style":{"typography":{"textTransform":"uppercase"}}} -->
+<p style="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__( '%1$sRead Issue%2$s', 'rainfall' ), '<a href="' . esc_url( '/about' ) . '">', '</a>' ); ?></p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"width":"66.66%"} -->
+<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:image {"sizeSlug":"large","linkDestination":"custom","align":"right"} -->
+<figure class="wp-block-image alignright size-large"><a href="/about"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/home.jpg" alt="<?php esc_attr_e('Person with umbrella', 'rainfall');?>"/></a></figure>
+<!-- /wp:image --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"12px"} -->
+<div style="height:12px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:spacer {"height":"20px"} -->
+<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|110","left":"var:preset|spacing|200"}}}} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"width":"70%"} -->
+<div class="wp-block-column" style="flex-basis:70%"><!-- wp:heading {"style":{"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}},"fontSize":"xx-large"} -->
+<h2 class="wp-block-heading has-xx-large-font-size" style="margin-top:0;margin-right:0;margin-bottom:0;margin-left:0"><?php esc_html_e('Issues', 'rainfall');?></h2>
+<!-- /wp:heading -->
+
+<!-- wp:separator {"className":"is-style-wide"} -->
+<hr class="wp-block-separator has-alpha-channel-opacity is-style-wide"/>
+<!-- /wp:separator -->
+
+<!-- wp:query {"queryId":0,"query":{"pages":0,"offset":0,"postType":"post","inherit":false,"perPage":4}} -->
+<div class="wp-block-query"><!-- wp:post-template {"style":{"spacing":{"blockGap":"var:preset|spacing|100"}},"layout":{"type":"grid","columnCount":2,"minimumColumnWidth":null}} -->
+<!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"1rem"}},"layout":{"type":"flex","orientation":"vertical"}} -->
+<div class="wp-block-group alignwide"><!-- wp:post-featured-image {"width":"100%","height":"max(32vw, 50vh)"} /-->
+
+<!-- wp:post-date {"format":"M j","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
+
+<!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.1","textTransform":"uppercase","fontStyle":"normal","fontWeight":"400"},"color":{"text":"#ffffff","link":"#ffffff"}},"fontSize":"large"} /-->
+
+<!-- wp:post-excerpt /--></div>
+<!-- /wp:group -->
+<!-- /wp:post-template -->
+
+<!-- wp:query-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<!-- wp:query-pagination-previous /-->
+
+<!-- wp:query-pagination-next /-->
+<!-- /wp:query-pagination --></div>
+<!-- /wp:query --></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"width":"30%","style":{"spacing":{"padding":{"top":"20px","right":"0","bottom":"20px","left":"0"}}}} -->
+<div class="wp-block-column" style="padding-top:20px;padding-right:0;padding-bottom:20px;padding-left:0;flex-basis:30%"><!-- wp:template-part {"slug":"sidebar"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"black","textColor":"white","layout":{"type":"default"}} -->
+<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color"><!-- wp:spacer {"height":"var:preset|spacing|200"} -->
+<div style="height:var(--wp--preset--spacing--200)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"spacing":{"padding":{"top":"0","right":"var:preset|spacing|50","bottom":"0","left":"var:preset|spacing|50"},"blockGap":"0"}},"backgroundColor":"black","textColor":"white","layout":{"type":"default"}} -->
+<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color" style="padding-top:0;padding-right:var(--wp--preset--spacing--50);padding-bottom:0;padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"0rem","right":"0rem","left":"0rem","top":"0rem"}}},"backgroundColor":"black","layout":{"type":"default"}} -->
+<div class="wp-block-group alignwide has-black-background-color has-background" style="padding-top:0rem;padding-right:0rem;padding-bottom:0rem;padding-left:0rem"><!-- wp:heading {"level":1,"textColor":"white"} -->
+<h1 class="wp-block-heading has-white-color has-text-color"><?php esc_html_e('Work With Us', 'rainfall');?></h1>
+<!-- /wp:heading -->
+
+<!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"center","width":"70%"} -->
+<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:70%"><!-- wp:paragraph {"textColor":"white"} -->
+<p class="has-white-color has-text-color"><?php esc_html_e('Rainfall is an online magazine featuring curated stories about real people. We are passionate about interviewing people from self-employed entrepreneurs to established CEO’s and represent the times.', 'rainfall');?></p>
+<!-- /wp:paragraph -->
+
+<!-- wp:spacer {"height":"20px"} -->
+<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"right"}} -->
+<div class="wp-block-buttons"><!-- wp:button {"backgroundColor":"white","textColor":"black","width":100,"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} -->
+<div class="wp-block-button has-custom-width wp-block-button__width-100 has-custom-font-size has-small-font-size" style="text-transform:uppercase"><a class="wp-block-button__link has-black-color has-white-background-color has-text-color has-background wp-element-button"><?php esc_html_e('Browse Open Positions', 'rainfall');?></a></div>
+<!-- /wp:button --></div>
+<!-- /wp:buttons --></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"verticalAlignment":"center","width":"30%"} -->
+<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:30%"></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|200"} -->
+<div style="height:var(--wp--preset--spacing--200)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:template-part {"slug":"footer"} /--></div>
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/rainfall/patterns/sidebar.php b/rainfall/patterns/sidebar.php
index c7e18ad0eb..8f09ef3ed0 100644
--- a/rainfall/patterns/sidebar.php
+++ b/rainfall/patterns/sidebar.php
@@ -1,34 +1,50 @@
 <?php
 /**
- * Title: Sidebar Content
+ * Title: sidebar
  * Slug: rainfall/sidebar
- * Categories: columns
+ * Inserter: no
  */
 ?>
 <!-- wp:group {"tagName":"aside","layout":{"type":"constrained"}} -->
-<aside class="wp-block-group"><!-- wp:heading {"level":6,"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|20"}}}} -->
-<h6 style="margin-top:0;margin-bottom:var(--wp--preset--spacing--20)"><?php echo esc_html__( 'Search for a Topic', 'rainfall' ); ?></h6>
+<aside class="wp-block-group"><!-- wp:spacer {"height":"10px"} -->
+<div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:heading {"level":6,"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|20"}}}} -->
+<h6 class="wp-block-heading" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--20)"><?php esc_html_e('Search for a Topic', 'rainfall');?></h6>
 <!-- /wp:heading -->
 
-<!-- wp:search {"label":"<?php echo esc_html__( 'Search for a Topic', 'rainfall' ); ?>","showLabel":false,"buttonText":"<?php echo esc_html__( 'Search', 'rainfall' ); ?>"} /-->
+<!-- wp:search {"label":"Search for a Topic","showLabel":false,"placeholder":"Type something...","buttonText":"Search"} /-->
+
+<!-- wp:spacer {"height":"20px"} -->
+<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
 <!-- wp:heading {"level":6,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|20"}}}} -->
-<h6 style="margin-bottom:var(--wp--preset--spacing--20)"><?php echo esc_html__( 'Categories', 'rainfall' ); ?></h6>
+<h6 class="wp-block-heading" style="margin-bottom:var(--wp--preset--spacing--20)"><?php esc_html_e('Categories', 'rainfall');?></h6>
 <!-- /wp:heading -->
 
 <!-- wp:categories /-->
 
+<!-- wp:spacer {"height":"20px"} -->
+<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
 <!-- wp:heading {"level":6,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|20"}}}} -->
-<h6 style="margin-bottom:var(--wp--preset--spacing--20)"><?php echo esc_html__( 'Posted Recently', 'rainfall' ); ?></h6>
+<h6 class="wp-block-heading" style="margin-bottom:var(--wp--preset--spacing--20)"><?php esc_html_e('Posted Recently', 'rainfall');?></h6>
 <!-- /wp:heading -->
 
 <!-- wp:latest-posts {"postsToShow":3} /-->
 
+<!-- wp:spacer {"height":"20px"} -->
+<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
 <!-- wp:heading {"level":6,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|20"}}}} -->
-<h6 style="margin-bottom:var(--wp--preset--spacing--20)"><?php echo esc_html__( 'Submissions', 'rainfall' ); ?></h6>
+<h6 class="wp-block-heading" style="margin-bottom:var(--wp--preset--spacing--20)"><?php esc_html_e('Submissions', 'rainfall');?></h6>
 <!-- /wp:heading -->
 
 <!-- wp:paragraph -->
-<p><?php echo esc_html__( 'Would you like to contribute as an editor or a writer to our blog? Let us know all the details about yourself and send us a message.', 'rainfall' ); ?></p>
+<p><?php esc_html_e('Would you like to contribute as an editor or a writer to our blog? Let us know all the details about yourself and send us a message.', 'rainfall');?></p>
 <!-- /wp:paragraph --></aside>
-<!-- /wp:group -->
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/rainfall/style.css b/rainfall/style.css
index 4066c94fc1..0c3418a770 100644
--- a/rainfall/style.css
+++ b/rainfall/style.css
@@ -108,3 +108,18 @@ footer .wp-block-navigation__container {
 .wp-block-navigation__responsive-container.has-white-color.has-black-background-color.is-menu-open a:active {
 	color: var(--wp--preset--color--orange);
 }
+
+/** Remove Bullets in Block Categories List
+ * 
+ */
+.wp-block-categories {
+	list-style: none;
+    padding-inline-start: 0px;
+}
+
+/** Style Citation on Pullquotes
+ */
+.wp-block-pullquote cite {
+    font-size: var(--wp--preset--font-size--small);
+	font-style: normal;
+}
\ No newline at end of file
diff --git a/rainfall/templates/404.html b/rainfall/templates/404.html
index 89246ee70b..c67d9e3885 100644
--- a/rainfall/templates/404.html
+++ b/rainfall/templates/404.html
@@ -1,13 +1 @@
-<!-- wp:group {"backgroundColor":"light-orange"} -->
-<div class="wp-block-group has-light-orange-background-color has-background">
-    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"type":"constrained"},"tagName":"main","style":{"spacing":{"margin":{"top":"0px"}}}} -->
-<main class="wp-block-group" style="margin-top:0px">
-    <!-- wp:pattern {"slug":"rainfall/hidden-404"} /-->
-</main>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
+<!-- wp:pattern {"slug":"rainfall/404"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/archive.html b/rainfall/templates/archive.html
index 7c92bde419..1cd6696623 100644
--- a/rainfall/templates/archive.html
+++ b/rainfall/templates/archive.html
@@ -1,35 +1,21 @@
 <!-- wp:group {"backgroundColor":"light-orange"} -->
-<div class="wp-block-group has-light-orange-background-color has-background">
-    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<div class="wp-block-group has-light-orange-background-color has-background"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-    <!-- wp:group {"layout":{"type":"constrained"}} -->
-    <div class="wp-block-group">
-        <!-- wp:group {"align":"wide"} -->
-        <div class="wp-block-group alignwide">
-            <!-- wp:columns -->
-            <div class="wp-block-columns">
-                <!-- wp:column {"width":"55rem"} -->
-                <div class="wp-block-column" style="flex-basis:55rem">
-                    <!-- wp:query-title {"type":"archive"} /-->
-                </div>
-                <!-- /wp:column -->
-
-                <!-- wp:column -->
-                <div class="wp-block-column"></div>
-                <!-- /wp:column -->
-            </div>
-            <!-- /wp:columns -->
-        </div>
-        <!-- /wp:group -->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"align":"wide"} -->
+<div class="wp-block-group alignwide"><!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"width":"100%"} -->
+<div class="wp-block-column" style="flex-basis:100%"><!-- wp:query-title {"type":"archive","fontSize":"xx-large"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
+<!-- /wp:group -->
 
-        <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-        <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-        <!-- /wp:spacer -->
-    </div>
-    <!-- /wp:group -->
-</div>
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"query"} /-->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/index.html b/rainfall/templates/index.html
index bd04e68141..635463d804 100644
--- a/rainfall/templates/index.html
+++ b/rainfall/templates/index.html
@@ -1,54 +1 @@
-<!-- wp:group {"backgroundColor":"orange"} -->
-<div class="wp-block-group has-orange-background-color has-background">
-
-	<!-- wp:template-part {"slug":"header","tag":"header"} /-->
-	<!-- wp:pattern {"slug":"rainfall/big-header"} /-->
-
-	<!-- wp:spacer {"height":"12px"} -->
-	<div style="height:12px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"}} -->
-<div class="wp-block-group">
-	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":"9.36rem"}}} -->
-	<div class="wp-block-columns alignwide">
-		<!-- wp:column {"width":"70%","style":{"spacing":{"padding":{"top":"20px","right":"0","bottom":"20px","left":"0"}}}} -->
-		<div class="wp-block-column" style="padding-top:20px;padding-right:0;padding-bottom:20px;padding-left:0;flex-basis:70%">
-
-			<!-- wp:pattern {"slug":"rainfall/home-query"} /-->
-
-		</div>
-		<!-- /wp:column -->
-
-		<!-- wp:column {"width":"30%","style":{"spacing":{"padding":{"top":"20px","right":"0","bottom":"20px","left":"0"}}}} -->
-		<div class="wp-block-column" style="padding-top:20px;padding-right:0;padding-bottom:20px;padding-left:0;flex-basis:30%">
-
-			<!-- wp:template-part {"slug":"sidebar"} /-->
-
-		</div>
-		<!-- /wp:column -->
-
-	</div>
-	<!-- /wp:columns -->
-
-</div>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"type":"default"},"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"black","textColor":"white"} -->
-<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color">
-
-	<!-- wp:spacer {"height":"4rem"} -->
-	<div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:pattern {"slug":"rainfall/cta"} /-->
-
-	<!-- wp:spacer {"height":"4rem"} -->
-	<div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-	
-	<!-- wp:template-part {"slug":"footer","tag":"footer"} /-->
-</div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- wp:pattern {"slug":"rainfall/index"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/page-header-black.html b/rainfall/templates/page-header-black.html
index 0d747b77c0..fa71a4e0e2 100644
--- a/rainfall/templates/page-header-black.html
+++ b/rainfall/templates/page-header-black.html
@@ -1,67 +1,53 @@
 <!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"black","textColor":"white"} -->
-<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color">
-    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-    <!-- wp:group {"layout":{"type":"constrained"}} -->
-    <div class="wp-block-group">
-        <!-- wp:group {"align":"full"} -->
-        <div class="wp-block-group alignfull">
-            <!-- wp:columns -->
-            <div class="wp-block-columns">
-                <!-- wp:column {"width":"55rem"} -->
-                <div class="wp-block-column" style="flex-basis:55rem">
-                    <!-- wp:post-title {"className":"indented-post-title"} /-->
-                </div>
-                <!-- /wp:column -->
-    
-                <!-- wp:column -->
-                <div class="wp-block-column">
-                    <!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /-->
-                </div>
-                <!-- /wp:column -->
-            </div>
-            <!-- /wp:columns -->
-        </div>
-        <!-- /wp:group -->
-    
-        <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-        <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-        <!-- /wp:spacer -->
-    </div>
-    <!-- /wp:group -->
-</div>
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:columns {"align":"full"} -->
+<div class="wp-block-columns alignfull"><!-- wp:column {"width":"55rem"} -->
+<div class="wp-block-column" style="flex-basis:55rem"><!-- wp:post-title {"className":"indented-post-title"} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
-    <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-    <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:spacer {"height":"var:preset|spacing|50"} -->
+<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|100","left":"var:preset|spacing|200"}}}} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"width":"60%","layout":{"type":"default"}} -->
+<div class="wp-block-column" style="flex-basis:60%"><!-- wp:post-featured-image /-->
+
+<!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
+
+<!-- wp:spacer {"height":"var:preset|spacing|110"} -->
+<div style="height:var(--wp--preset--spacing--110)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
 
-    <!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
-    <div class="wp-block-columns">
-        <!-- wp:column {"layout":{"type":"default"}} -->
-        <div class="wp-block-column">
-            <!-- wp:post-featured-image /-->
-            <!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
+<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:column -->
 
-            <!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-            <div class="wp-block-group">
-                <!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
-                <!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /-->
-            </div>
-            <!-- /wp:group -->
-        </div>
-        <!-- /wp:column -->
+<!-- wp:column {"width":"35%"} -->
+<div class="wp-block-column" style="flex-basis:35%"><!-- wp:template-part {"slug":"sidebar"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
 
-        <!-- wp:column {"width":"18rem"} -->
-        <div class="wp-block-column" style="flex-basis:18rem">
-            <!-- wp:template-part {"slug":"sidebar"} /-->
-        </div>
-        <!-- /wp:column -->
-    </div>
-    <!-- /wp:columns -->
-</div>
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/page-no-sidebar.html b/rainfall/templates/page-no-sidebar.html
index 297ab6b527..77691f2a9e 100644
--- a/rainfall/templates/page-no-sidebar.html
+++ b/rainfall/templates/page-no-sidebar.html
@@ -1,46 +1,45 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
-    <!-- wp:group {"align":"full"} -->
-    <div class="wp-block-group alignfull">
-        <!-- wp:columns -->
-        <div class="wp-block-columns">
-            <!-- wp:column {"width":"55rem"} -->
-            <div class="wp-block-column" style="flex-basis:55rem">
-                <!-- wp:post-title {"className":"indented-post-title"} /-->
-            </div>
-            <!-- /wp:column -->
-
-            <!-- wp:column -->
-            <div class="wp-block-column">
-                <!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /-->
-            </div>
-            <!-- /wp:column -->
-        </div>
-        <!-- /wp:columns -->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-    <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-</div>
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:columns {"align":"wide"} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"width":"55rem"} -->
+<div class="wp-block-column" style="flex-basis:55rem"><!-- wp:post-title {"className":"indented-post-title"} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|50"} -->
+<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-featured-image /--></div>
 <!-- /wp:group -->
 
-<!-- wp:post-featured-image /-->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:post-content {"layout":{"type":"constrained"},"lock":{"move":false,"remove":true}} /-->
+<!-- wp:post-content {"lock":{"move":false,"remove":false},"layout":{"type":"constrained"}} /-->
+
+<!-- wp:spacer {"height":"20px"} -->
+<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
-    <!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-    <div class="wp-block-group">
-        <!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
-        <!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /-->
-    </div>
-    <!-- /wp:group -->
-</div>
+<div class="wp-block-group"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left"}} -->
+<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
+
+<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/page.html b/rainfall/templates/page.html
index 4af455e344..3d2fc02c50 100644
--- a/rainfall/templates/page.html
+++ b/rainfall/templates/page.html
@@ -1,67 +1,39 @@
 <!-- wp:group {"backgroundColor":"light-orange","layout":{"type":"default"}} -->
-<div class="wp-block-group has-light-orange-background-color has-background">
-    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<div class="wp-block-group has-light-orange-background-color has-background"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-    <!-- wp:group {"layout":{"type":"constrained"}} -->
-    <div class="wp-block-group">
-        <!-- wp:group {"align":"full"} -->
-        <div class="wp-block-group alignfull">
-            <!-- wp:columns -->
-            <div class="wp-block-columns">
-                <!-- wp:column {"width":"55rem"} -->
-                <div class="wp-block-column" style="flex-basis:55rem">
-                    <!-- wp:post-title {"className":"indented-post-title"} /-->
-                </div>
-                <!-- /wp:column -->
-    
-                <!-- wp:column -->
-                <div class="wp-block-column">
-                    <!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /-->
-                </div>
-                <!-- /wp:column -->
-            </div>
-            <!-- /wp:columns -->
-        </div>
-        <!-- /wp:group -->
-    
-        <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-        <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-        <!-- /wp:spacer -->
-    </div>
-    <!-- /wp:group -->
-</div>
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:columns {"align":"full"} -->
+<div class="wp-block-columns alignfull"><!-- wp:column {"width":"55rem"} -->
+<div class="wp-block-column" style="flex-basis:55rem"><!-- wp:post-title {"className":"indented-post-title"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|50"} -->
+<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
-    <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-    <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"constrained","justifyContent":"center"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-    <!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
-    <div class="wp-block-columns">
-        <!-- wp:column {"layout":{"type":"default"}} -->
-        <div class="wp-block-column">
-            <!-- wp:post-featured-image /-->
-            <!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
+<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|50","left":"var:preset|spacing|110"}}}} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"width":"60%","layout":{"type":"default"}} -->
+<div class="wp-block-column" style="flex-basis:60%"><!-- wp:post-featured-image /-->
 
-            <!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-            <div class="wp-block-group">
-                <!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
-                <!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /-->
-            </div>
-            <!-- /wp:group -->
-        </div>
-        <!-- /wp:column -->
+<!-- wp:post-content {"lock":{"move":false,"remove":true}} /--></div>
+<!-- /wp:column -->
 
-        <!-- wp:column {"width":"18rem"} -->
-        <div class="wp-block-column" style="flex-basis:18rem">
-            <!-- wp:template-part {"slug":"sidebar"} /-->
-        </div>
-        <!-- /wp:column -->
-    </div>
-    <!-- /wp:columns -->
-</div>
+<!-- wp:column {"width":"35%"} -->
+<div class="wp-block-column" style="flex-basis:35%"><!-- wp:template-part {"slug":"sidebar"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/search.html b/rainfall/templates/search.html
index 3c6d15efdf..0a199da880 100644
--- a/rainfall/templates/search.html
+++ b/rainfall/templates/search.html
@@ -1,23 +1,19 @@
 <!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"black","textColor":"white"} -->
-<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color">
-    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-    <!-- wp:group {"layout":{"type":"constrained"}} -->
-    <div class="wp-block-group">
-        <!-- wp:group {"align":"wide"} -->
-        <div class="wp-block-group alignwide">
-            <!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","backgroundColor":"white","textColor":"black","border":{"width":"1px"},"borderColor":"white"} /-->
-        </div>
-        <!-- /wp:group -->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"align":"wide"} -->
+<div class="wp-block-group alignwide"><!-- wp:query-title {"type":"search","fontSize":"xx-large"} /-->
 
-        <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-        <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-        <!-- /wp:spacer -->
-    </div>
-    <!-- /wp:group -->
-</div>
+<!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","backgroundColor":"white","textColor":"black","borderColor":"white"} /--></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"query"} /-->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/single.html b/rainfall/templates/single.html
index d9edfd83c4..0baa570304 100644
--- a/rainfall/templates/single.html
+++ b/rainfall/templates/single.html
@@ -1,142 +1,115 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
-	<!-- wp:group {"align":"full"} -->
-	<div class="wp-block-group alignfull">
-		<!-- wp:columns -->
-		<div class="wp-block-columns">
-			<!-- wp:column {"width":"80%"} -->
-			<div class="wp-block-column" style="flex-basis:80%">
-				<!-- wp:post-title {"className":"indented-post-title"} /-->
-			</div>
-			<!-- /wp:column -->
-
-			<!-- wp:column {"width":"20%","verticalAlignment":"bottom"} -->
-			<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:20%">
-				<!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /-->
-			</div>
-			<!-- /wp:column -->
-		</div>
-		<!-- /wp:columns -->
-	</div>
-	<!-- /wp:group -->
-</div>
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:columns {"align":"wide"} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"width":"55rem"} -->
+<div class="wp-block-column" style="flex-basis:55rem"><!-- wp:post-title {"className":"indented-post-title"} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|50"} -->
+<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-featured-image /--></div>
 <!-- /wp:group -->
 
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
-<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:post-featured-image {"align":"wide","height":"30rem"} /-->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":"9.36rem"}}} -->
+<div class="wp-block-columns alignwide"><!-- wp:column {"layout":{"type":"default"}} -->
+<div class="wp-block-column"><!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
 
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
-<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
-	<!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
-	<div class="wp-block-columns">
-		<!-- wp:column {"layout":{"type":"default"}} -->
-		<div class="wp-block-column">
-			<!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
-
-			<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
-			<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
-			<!-- /wp:spacer -->
-
-			<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-			<div class="wp-block-group">
-				<!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
-				<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /-->
-			</div>
-			<!-- /wp:group -->
-
-			<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
-			<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
-			<!-- /wp:spacer -->
-
-		</div>
-		<!-- /wp:column -->
-
-		<!-- wp:column {"width":"18rem"} -->
-		<div class="wp-block-column" style="flex-basis:18rem">
-			<!-- wp:template-part {"slug":"sidebar"} /-->
-		</div>
-		<!-- /wp:column -->
-	</div>
-	<!-- /wp:columns -->
-</div>
+<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap"}} -->
+<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
+
+<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /--></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"var(\u002d\u002dwp\u002d\u002dpreset\u002d\u002dspacing\u002d\u002d10)"} -->
+<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"width":"18rem"} -->
+<div class="wp-block-column" style="flex-basis:18rem"><!-- wp:template-part {"slug":"sidebar"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
 <!-- /wp:group -->
 
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
 <!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"black","textColor":"white","layout":{"type":"constrained"}} -->
-<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color">
-	<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
-	<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- wp:columns -->
-	<div class="wp-block-columns">
-		<!-- wp:column {"width":""} -->
-		<div class="wp-block-column">
-			<!-- wp:comments-query-loop -->
-			<div class="wp-block-comments-query-loop">
-				<!-- wp:comments-title /-->
-
-				<!-- wp:comment-template -->
-					<!-- wp:columns {"style":{"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"color":"var:preset|color|white","width":"1px"},"left":{"width":"0px","style":"none"}},"spacing":{"margin":{"top":"0px","bottom":"0px"},"padding":{"top":"var(--wp--preset--spacing--90)","bottom":"var(--wp--preset--spacing--90)"}}}} -->
-					<div class="wp-block-columns" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-color:var(--wp--preset--color--white);border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-top:0px;margin-bottom:0px;padding-top:var(--wp--preset--spacing--90);padding-bottom:var(--wp--preset--spacing--90)">
-						<!-- wp:column -->
-						<div class="wp-block-column">
-							<!-- wp:comment-author-name {"fontSize":"small"} /-->
-
-							<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"flex"}} -->
-							<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px">
-								<!-- wp:comment-date {"fontSize":"small"} /-->
-								<!-- wp:comment-edit-link {"fontSize":"small"} /-->
-							</div>
-							<!-- /wp:group -->
-
-							<!-- wp:comment-content /-->
-							<!-- wp:comment-reply-link {"fontSize":"small"} /-->
-						</div>
-						<!-- /wp:column -->
-					</div>
-					<!-- /wp:columns -->
-				<!-- /wp:comment-template -->
-
-				<!-- wp:comments-pagination -->
-				<!-- wp:comments-pagination-previous /-->
-
-				<!-- wp:comments-pagination-numbers /-->
-
-				<!-- wp:comments-pagination-next /-->
-				<!-- /wp:comments-pagination -->
-
-				<!-- wp:post-comments-form /-->
-			</div>
-			<!-- /wp:comments-query-loop -->
-		</div>
-		<!-- /wp:column -->
-
-		<!-- wp:column {"width":"18rem"} -->
-		<div class="wp-block-column" style="flex-basis:18rem">
-			<!-- wp:paragraph -->
-			<p></p>
-			<!-- /wp:paragraph -->
-		</div>
-		<!-- /wp:column -->
-	</div>
-	<!-- /wp:columns -->
-
-	<!-- wp:columns {"align":"full"} -->
-	<div class="wp-block-columns alignfull"><!-- wp:column -->
-		<div class="wp-block-column">
-			<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
-		</div>
-		<!-- /wp:column -->
-	</div>
-	<!-- /wp:columns -->
-</div>
+<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color"><!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"width":""} -->
+<div class="wp-block-column"><!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
+<div class="wp-block-comments wp-block-comments-query-loop"><!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:comments-title /-->
+
+<!-- wp:comment-template -->
+<!-- wp:columns {"style":{"border":{"width":"0px","style":"none"},"spacing":{"margin":{"top":"0px","bottom":"30px"},"padding":{"top":"var(\u002d\u002dwp\u002d\u002dpreset\u002d\u002dspacing\u002d\u002d90)","bottom":"var(\u002d\u002dwp\u002d\u002dpreset\u002d\u002dspacing\u002d\u002d90)"}}}} -->
+<div class="wp-block-columns" style="border-style:none;border-width:0px;margin-top:0px;margin-bottom:30px;padding-top:var(--wp--preset--spacing--90);padding-bottom:var(--wp--preset--spacing--90)"><!-- wp:column -->
+<div class="wp-block-column"><!-- wp:comment-author-name {"fontSize":"small"} /-->
+
+<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"flex"}} -->
+<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px"><!-- wp:comment-date {"fontSize":"small"} /-->
+
+<!-- wp:comment-edit-link {"fontSize":"small"} /--></div>
 <!-- /wp:group -->
+
+<!-- wp:comment-content /-->
+
+<!-- wp:comment-reply-link {"fontSize":"small"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+<!-- /wp:comment-template -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:comments-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<!-- wp:comments-pagination-previous /-->
+
+<!-- wp:comments-pagination-numbers /-->
+
+<!-- wp:comments-pagination-next /-->
+<!-- /wp:comments-pagination -->
+
+<!-- wp:post-comments-form /--></div>
+<!-- /wp:comments --></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"width":"18rem"} -->
+<div class="wp-block-column" style="flex-basis:18rem"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+
+<!-- wp:spacer {"height":"var:preset|spacing|100"} -->
+<div style="height:var(--wp--preset--spacing--100)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:columns {"align":"full"} -->
+<div class="wp-block-columns alignfull"><!-- wp:column -->
+<div class="wp-block-column"><!-- wp:template-part {"slug":"footer","tagName":"footer"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/rainfall/theme.json b/rainfall/theme.json
index dce87891ef..76eb623baf 100644
--- a/rainfall/theme.json
+++ b/rainfall/theme.json
@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/theme.json",
 	"customTemplates": [
 		{
 			"name": "page-header-black",
@@ -23,12 +22,7 @@
 		"color": {
 			"palette": [
 				{
-					"color": "#000",
-					"name": "Black",
-					"slug": "black"
-				},
-				{
-					"color": "#636363",
+					"color": "#4d4d4d",
 					"name": "Dark Grey",
 					"slug": "dark-grey"
 				},
@@ -37,11 +31,6 @@
 					"name": "Light Grey",
 					"slug": "light-grey"
 				},
-				{
-					"color": "#FFF",
-					"name": "White",
-					"slug": "white"
-				},
 				{
 					"color": "#A43D00",
 					"name": "Brown",
@@ -60,27 +49,31 @@
 			]
 		},
 		"layout": {
-			"contentSize": "119ch",
+			"contentSize": "700px",
 			"wideSize": "1280px"
 		},
 		"spacing": {
-			"spacingScale": {
-				"operator": "+",
-				"increment": 0.25,
-				"steps": 9,
-				"mediumStep": 1.5,
-				"unit": "rem"
-			},
+			"defaultSpacingSizes": false,
 			"spacingSizes": [
 				{
+					"name": "50",
+					"size": "2rem",
+					"slug": "50"
+				},
+				{
+					"name": "100",
 					"size": "3.125rem",
-					"slug": "100",
-					"name": "100"
+					"slug": "100"
 				},
 				{
+					"name": "110",
 					"size": "3.75rem",
-					"slug": "110",
-					"name": "110"
+					"slug": "110"
+				},
+				{
+					"name": "200",
+					"size": "7rem",
+					"slug": "200"
 				}
 			],
 			"units": [
@@ -93,6 +86,7 @@
 			]
 		},
 		"typography": {
+			"defaultFontSizes": false,
 			"fluid": true,
 			"fontFamilies": [
 				{
@@ -179,11 +173,6 @@
 			"core/navigation": {
 				"elements": {
 					"link": {
-						":hover": {
-							"typography": {
-								"textDecoration": "underline"
-							}
-						},
 						":active": {
 							"color": {
 								"text": "var(--wp--preset--color--brown)"
@@ -196,6 +185,11 @@
 							"typography": {
 								"textDecoration": "underline dotted"
 							}
+						},
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
 						}
 					}
 				},
@@ -231,10 +225,7 @@
 			"core/post-title": {
 				"elements": {
 					"link": {
-						"typography": {
-							"textDecoration": "none"
-						},
-						":hover": {
+						":active": {
 							"color": {
 								"text": {
 									"ref": "styles.color.text"
@@ -244,7 +235,7 @@
 								"textDecoration": "underline"
 							}
 						},
-						":active": {
+						":hover": {
 							"color": {
 								"text": {
 									"ref": "styles.color.text"
@@ -253,6 +244,9 @@
 							"typography": {
 								"textDecoration": "underline"
 							}
+						},
+						"typography": {
+							"textDecoration": "none"
 						}
 					}
 				},
@@ -261,6 +255,22 @@
 					"textTransform": "uppercase"
 				}
 			},
+			"core/pullquote": {
+				"spacing": {
+					"padding": {
+						"bottom": "var(--wp--preset--spacing--100)",
+						"left": "var(--wp--preset--spacing--100)",
+						"right": "var(--wp--preset--spacing--100)",
+						"top": "var(--wp--preset--spacing--100)"
+					}
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontStyle": "normal",
+					"fontWeight": "400",
+					"lineHeight": "1.4"
+				}
+			},
 			"core/query-pagination": {
 				"typography": {
 					"fontWeight": "700",
@@ -269,41 +279,46 @@
 			},
 			"core/quote": {
 				"border": {
-					"color": "var(--wp--preset--color--orange)",
+					"color": "var(--wp--preset--color--black)",
 					"style": "solid",
-					"width": "0 0 0 2px"
+					"width": "0 0 0 1px"
 				},
 				"elements": {
 					"cite": {
 						"typography": {
-							"fontWeight": 400,
 							"fontSize": "var(--wp--preset--font-size--small)",
-							"fontStyle": "normal"
+							"fontStyle": "normal",
+							"fontWeight": 400
 						}
 					}
 				},
 				"spacing": {
+					"margin": {
+						"bottom": "var(--wp--preset--spacing--50)",
+						"left": "0",
+						"right": "0",
+						"top": "var(--wp--preset--spacing--50)"
+					},
 					"padding": {
-						"left": "var(--wp--preset--spacing--60)"
+						"left": "var(--wp--preset--spacing--50)",
+						"right": "var(--wp--preset--spacing--50)"
 					}
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--large)",
-					"fontWeight": "bold",
-					"lineHeight": "1.3",
+					"fontStyle": "normal",
+					"fontWeight": "700",
+					"lineHeight": "1.1",
 					"textTransform": "uppercase"
 				}
 			},
 			"core/search": {
 				"elements": {
 					"button": {
-						"spacing": {
-							"margin": {
-								"left": "0px"
-							},
-							"padding": {
-								"bottom": "var(--wp--preset--spacing--10)",
-								"top": "var(--wp--preset--spacing--10)"
+						":focus": {
+							"color": {
+								"background": "var(--wp--preset--color--black)",
+								"text": "var(--wp--preset--color--orange)"
 							}
 						},
 						":hover": {
@@ -315,10 +330,13 @@
 								"text": "var(--wp--preset--color--orange)"
 							}
 						},
-						":focus": {
-							"color": {
-								"background": "var(--wp--preset--color--black)",
-								"text": "var(--wp--preset--color--orange)"
+						"spacing": {
+							"margin": {
+								"left": "0px"
+							},
+							"padding": {
+								"bottom": "var(--wp--preset--spacing--10)",
+								"top": "var(--wp--preset--spacing--10)"
 							}
 						}
 					}
@@ -326,6 +344,7 @@
 			},
 			"core/separator": {
 				"border": {
+					"color": "var(--wp--preset--color--black)",
 					"width": "0 0 1px 0"
 				}
 			},
@@ -350,8 +369,18 @@
 			"background": "var(--wp--preset--color--white)",
 			"text": "var(--wp--preset--color--black)"
 		},
+		"css": "",
 		"elements": {
 			"button": {
+				":hover": {
+					"border": {
+						"color": "var(--wp--preset--color--orange)"
+					},
+					"color": {
+						"background": "var(--wp--preset--color--orange)",
+						"text": "var(--wp--preset--color--black)"
+					}
+				},
 				"border": {
 					"color": "var(--wp--preset--color--black)",
 					"radius": "0",
@@ -379,15 +408,6 @@
 					"lineHeight": "1.2",
 					"textDecoration": "none",
 					"textTransform": "uppercase"
-				},
-				":hover": {
-					"border": {
-						"color": "var(--wp--preset--color--orange)"
-					},
-					"color": {
-						"background": "var(--wp--preset--color--orange)",
-						"text": "var(--wp--preset--color--black)"
-					}
 				}
 			},
 			"h1": {
@@ -467,17 +487,17 @@
 			}
 		},
 		"spacing": {
-			"blockGap": "var(--wp--preset--spacing--90)",
+			"blockGap": "20px",
 			"padding": {
-				"top": "0px",
-				"right": "var(--wp--preset--spacing--90)",
 				"bottom": "0px",
-				"left": "var(--wp--preset--spacing--90)"
+				"left": "0px",
+				"right": "0px",
+				"top": "0px"
 			}
 		},
 		"typography": {
 			"fontFamily": "var(--wp--preset--font-family--helvetica-neue)",
-			"lineHeight": "1.6"
+			"lineHeight": "1.8"
 		}
 	},
 	"templateParts": [
@@ -490,5 +510,6 @@
 			"name": "Footer"
 		}
 	],
-	"version": 2
-}
+	"version": 3,
+	"$schema": "https://schemas.wp.org/trunk/theme.json"
+}
\ No newline at end of file