diff --git a/404.php b/404.php
index ad156273..8f83ed40 100644
--- a/404.php
+++ b/404.php
@@ -18,10 +18,15 @@ $custom_404 = intval( get_option( 'fictioneer_404_page', -1 ) ?: -1 );
 <?php get_header(); ?>
 
 <main id="main" class="main singular the-404">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article class="singular__article padding-left padding-right padding-top padding-bottom">
@@ -35,7 +40,9 @@ $custom_404 = intval( get_option( 'fictioneer_404_page', -1 ) ?: -1 );
         <?php endif; ?>
       </section>
     </article>
+
   </div>
+
 </main>
 
 <?php
diff --git a/author.php b/author.php
index 5ac91d71..7022a461 100644
--- a/author.php
+++ b/author.php
@@ -94,10 +94,15 @@ $tabs[ $current_tab ]['classes'][] = '_current';
 <?php get_header(); ?>
 
 <main id="main" class="main author-page singular">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article class="singular__article author-page__article padding-left padding-right padding-top padding-bottom">
@@ -214,7 +219,9 @@ $tabs[ $current_tab ]['classes'][] = '_current';
       </section>
 
     </article>
+
   </div>
+
 </main>
 
 <?php
diff --git a/category.php b/category.php
index 028bb8f1..2405e2dc 100644
--- a/category.php
+++ b/category.php
@@ -12,10 +12,15 @@
 <?php get_header(); ?>
 
 <main id="main" class="main archive category-archive">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article class="archive__article padding-left padding-right padding-top padding-bottom">
@@ -66,8 +71,11 @@
       </header>
 
       <?php get_template_part( 'partials/_archive-loop' ); ?>
+
     </article>
+
   </div>
+
 </main>
 
 <?php
diff --git a/chapters.php b/chapters.php
index a38f05da..473118e1 100644
--- a/chapters.php
+++ b/chapters.php
@@ -95,10 +95,15 @@ if ( function_exists( 'update_post_author_caches' ) ) {
 <?php get_header(); ?>
 
 <main id="main" class="main singular chapters">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -141,7 +146,9 @@ if ( function_exists( 'update_post_author_caches' ) ) {
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/collections.php b/collections.php
index 0ee5827a..06a746d9 100644
--- a/collections.php
+++ b/collections.php
@@ -55,10 +55,15 @@ if ( function_exists( 'update_post_author_caches' ) ) {
 <?php get_header(); ?>
 
 <main id="main" class="main singular collections">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -101,7 +106,9 @@ if ( function_exists( 'update_post_author_caches' ) ) {
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/index.php b/index.php
index 4307ed83..4367857d 100644
--- a/index.php
+++ b/index.php
@@ -15,15 +15,18 @@
 <?php get_header(); ?>
 
 <main id="main" class="main index">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
-  <div class="main__wrapper">
-    <?php
-      do_action( 'fictioneer_main_wrapper' );
-      get_template_part( 'partials/_loop' );
-    ?>
-  </div>
+
+  <div class="main__wrapper"><?php
+    do_action( 'fictioneer_main_wrapper' );
+    get_template_part( 'partials/_loop' );
+  ?></div>
+
 </main>
 
 <?php
diff --git a/recommendations.php b/recommendations.php
index 10fb191c..a446f047 100644
--- a/recommendations.php
+++ b/recommendations.php
@@ -55,10 +55,15 @@ if ( function_exists( 'update_post_author_caches' ) ) {
 <?php get_header(); ?>
 
 <main id="main" class="main singular recommendations">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -101,7 +106,9 @@ if ( function_exists( 'update_post_author_caches' ) ) {
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/single-fcn_chapter.php b/single-fcn_chapter.php
index 2d78fdd4..bacc696e 100644
--- a/single-fcn_chapter.php
+++ b/single-fcn_chapter.php
@@ -31,10 +31,15 @@ get_header( null, $header_args );
 </div>
 
 <main id="main" class="main chapter">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background chapter__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
@@ -213,7 +218,9 @@ get_header( null, $header_args );
       <?php endif; ?>
 
     <?php endwhile; endif; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/single-fcn_collection.php b/single-fcn_collection.php
index 7aa8579a..116e05aa 100644
--- a/single-fcn_collection.php
+++ b/single-fcn_collection.php
@@ -23,10 +23,15 @@ get_header( null, array( 'type' => 'fcn_collection' ) );
 ?>
 
 <main id="main" class="main collection">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -123,7 +128,9 @@ get_header( null, array( 'type' => 'fcn_collection' ) );
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/single-fcn_recommendation.php b/single-fcn_recommendation.php
index d4ff841d..39d0f273 100644
--- a/single-fcn_recommendation.php
+++ b/single-fcn_recommendation.php
@@ -19,10 +19,15 @@ get_header( null, array( 'type' => 'fcn_recommendation' ) );
 ?>
 
 <main id="main" class="main recommendation">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -70,7 +75,9 @@ get_header( null, array( 'type' => 'fcn_recommendation' ) );
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/single-fcn_story.php b/single-fcn_story.php
index 0b61dae5..a8441de9 100644
--- a/single-fcn_story.php
+++ b/single-fcn_story.php
@@ -29,10 +29,15 @@ get_header( null, $header_args );
 ?>
 
 <main id="main" class="main story <?php if ( ! $can_checkmarks ) echo '_no-checkmarks'; ?>">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper _no-padding">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -101,7 +106,9 @@ get_header( null, $header_args );
       <?php do_action( 'fictioneer_story_after_article', $hook_args ); ?>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/single-post.php b/single-post.php
index 4f25bff3..56e17f7e 100644
--- a/single-post.php
+++ b/single-post.php
@@ -16,10 +16,15 @@ get_header();
 ?>
 
 <main id="main" class="main post">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -63,7 +68,9 @@ get_header();
       <?php endif; ?>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/singular-bookmarks.php b/singular-bookmarks.php
index 92bcbd7f..242c2278 100644
--- a/singular-bookmarks.php
+++ b/singular-bookmarks.php
@@ -26,10 +26,15 @@ if ( ! get_option( 'fictioneer_enable_bookmarks' ) ) {
 <?php get_header(); ?>
 
 <main id="main" class="main singular bookmarks-page">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -72,7 +77,9 @@ if ( ! get_option( 'fictioneer_enable_bookmarks' ) ) {
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/singular-bookshelf-ajax.php b/singular-bookshelf-ajax.php
index 4b37ab4e..49caf1a9 100644
--- a/singular-bookshelf-ajax.php
+++ b/singular-bookshelf-ajax.php
@@ -71,10 +71,15 @@ $tabs[ $current_tab ]['classes'][] = '_current';
 <?php get_header(); ?>
 
 <main id="main" class="main singular bookshelf">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -154,7 +159,9 @@ $tabs[ $current_tab ]['classes'][] = '_current';
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/singular-bookshelf.php b/singular-bookshelf.php
index 675f2119..e1238e4e 100644
--- a/singular-bookshelf.php
+++ b/singular-bookshelf.php
@@ -87,10 +87,15 @@ $tabs[ $current_tab ]['classes'][] = '_current';
 <?php get_header(); ?>
 
 <main id="main" class="main singular bookshelf">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -194,7 +199,9 @@ $tabs[ $current_tab ]['classes'][] = '_current';
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/singular-taxonomies.php b/singular-taxonomies.php
index e9de13d4..7916ccc2 100644
--- a/singular-taxonomies.php
+++ b/singular-taxonomies.php
@@ -59,10 +59,15 @@ $terms = array(
 <?php get_header(); ?>
 
 <main id="main" class="main singular">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -120,8 +125,11 @@ $terms = array(
         <?php endforeach; ?>
 
       </article>
+
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/singular-titleless.php b/singular-titleless.php
index f27ffd70..0bacd2c8 100644
--- a/singular-titleless.php
+++ b/singular-titleless.php
@@ -20,10 +20,15 @@ get_header();
 ?>
 
 <main id="main" class="main singular">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -51,7 +56,9 @@ get_header();
       <?php endif; ?>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/singular.php b/singular.php
index 267e98f7..46172daa 100644
--- a/singular.php
+++ b/singular.php
@@ -20,10 +20,15 @@ get_header();
 ?>
 
 <main id="main" class="main singular">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -55,7 +60,9 @@ get_header();
       <?php endif; ?>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/stories.php b/stories.php
index a15f550a..7cdedceb 100644
--- a/stories.php
+++ b/stories.php
@@ -102,10 +102,15 @@ if ( function_exists( 'update_post_author_caches' ) ) {
 <?php get_header(); ?>
 
 <main id="main" class="main singular stories">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <?php while ( have_posts() ) : the_post(); ?>
@@ -151,7 +156,9 @@ if ( function_exists( 'update_post_author_caches' ) ) {
       </article>
 
     <?php endwhile; ?>
+
   </div>
+
 </main>
 
 <?php
diff --git a/tag.php b/tag.php
index 1d15cdfd..e316c589 100644
--- a/tag.php
+++ b/tag.php
@@ -13,10 +13,15 @@
 <?php get_header(); ?>
 
 <main id="main" class="main archive tag-archive">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article class="archive__article padding-left padding-right padding-top padding-bottom">
@@ -74,8 +79,11 @@
       </header>
 
       <?php get_template_part( 'partials/_archive-loop' ); ?>
+
     </article>
+
   </div>
+
 </main>
 
 <?php
diff --git a/taxonomy-fcn_character.php b/taxonomy-fcn_character.php
index 9a240b8f..86b7ff85 100644
--- a/taxonomy-fcn_character.php
+++ b/taxonomy-fcn_character.php
@@ -12,10 +12,15 @@
 <?php get_header(); ?>
 
 <main id="main" class="main archive character-archive">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article class="archive__article padding-left padding-right padding-top padding-bottom">
@@ -75,8 +80,11 @@
       </header>
 
       <?php get_template_part( 'partials/_archive-loop' ); ?>
+
     </article>
+
   </div>
+
 </main>
 
 <?php
diff --git a/taxonomy-fcn_content_warning.php b/taxonomy-fcn_content_warning.php
index 4156d7a3..4e3c464f 100644
--- a/taxonomy-fcn_content_warning.php
+++ b/taxonomy-fcn_content_warning.php
@@ -12,10 +12,15 @@
 <?php get_header(); ?>
 
 <main id="main" class="main archive content-warning-archive">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article class="archive__article padding-left padding-right padding-top padding-bottom">
@@ -75,8 +80,11 @@
       </header>
 
       <?php get_template_part( 'partials/_archive-loop' ); ?>
+
     </article>
+
   </div>
+
 </main>
 
 <?php
diff --git a/taxonomy-fcn_fandom.php b/taxonomy-fcn_fandom.php
index 60fe8483..d019b9c6 100644
--- a/taxonomy-fcn_fandom.php
+++ b/taxonomy-fcn_fandom.php
@@ -12,10 +12,15 @@
 <?php get_header(); ?>
 
 <main id="main" class="main archive fandom-archive">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article class="archive__article padding-left padding-right padding-top padding-bottom">
@@ -75,8 +80,11 @@
       </header>
 
       <?php get_template_part( 'partials/_archive-loop' ); ?>
+
     </article>
+
   </div>
+
 </main>
 
 <?php
diff --git a/taxonomy-fcn_genre.php b/taxonomy-fcn_genre.php
index 25287da1..9feca19c 100644
--- a/taxonomy-fcn_genre.php
+++ b/taxonomy-fcn_genre.php
@@ -12,10 +12,15 @@
 <?php get_header(); ?>
 
 <main id="main" class="main archive genre-archive">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article class="archive__article padding-left padding-right padding-top padding-bottom">
@@ -75,8 +80,11 @@
       </header>
 
       <?php get_template_part( 'partials/_archive-loop' ); ?>
+
     </article>
+
   </div>
+
 </main>
 
 <?php
diff --git a/user-profile.php b/user-profile.php
index ee89451f..95294982 100644
--- a/user-profile.php
+++ b/user-profile.php
@@ -62,10 +62,15 @@ $hook_args = array(
 <?php get_header( null, array( 'type' => 'user-profile' ) ); ?>
 
 <main id="main" class="main singular profile">
+
   <div class="observer main-observer"></div>
+
   <?php do_action( 'fictioneer_main' ); ?>
+
   <div class="main__background polygon polygon--main background-texture"></div>
+
   <div class="main__wrapper">
+
     <?php do_action( 'fictioneer_main_wrapper' ); ?>
 
     <article id="singular-<?php echo $post_id; ?>" class="singular__article padding-left padding-right padding-top padding-bottom">
@@ -75,7 +80,9 @@ $hook_args = array(
       </section>
 
     </article>
+
   </div>
+
 </main>
 
 <?php