diff --git a/public_html/wp-content/mu-plugins/theme-templates/bootstrap.php b/public_html/wp-content/mu-plugins/theme-templates/bootstrap.php
index 2958826296..acd131d60c 100644
--- a/public_html/wp-content/mu-plugins/theme-templates/bootstrap.php
+++ b/public_html/wp-content/mu-plugins/theme-templates/bootstrap.php
@@ -24,11 +24,7 @@
  */
 function inject_offline_template( $template_path ) {
 	if ( function_exists( 'is_offline' ) && ( \is_offline() || \is_500() ) ) {
-		if ( 'twentytwenty' === get_template() ) {
-			$template_path = __DIR__ . '/templates/offline-2020.php';
-		} else {
-			$template_path = __DIR__ . '/templates/offline.php';
-		}
+		$template_path = __DIR__ . '/templates/offline.php';
 	}
 
 	return $template_path;
diff --git a/public_html/wp-content/mu-plugins/theme-templates/templates/offline-2020.php b/public_html/wp-content/mu-plugins/theme-templates/templates/offline-2020.php
deleted file mode 100644
index b46b5f7b25..0000000000
--- a/public_html/wp-content/mu-plugins/theme-templates/templates/offline-2020.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Template Name: Offline Notice
- *
- * This is the Twenty Twenty-specific offline template, which will be used for offline views of a PWA-enabled site.
- * See `./offline.php` for more information.
- */
-
-namespace WordCamp\Theme_Templates;
-
-get_header();
-
-$offline_page = get_offline_content();
-?>
-
-<main id="site-content" role="main">
-
-	<article <?php post_class(); ?> id="post-<?php the_ID(); ?>">
-
-		<header class="entry-header has-text-align-center">
-
-			<div class="entry-header-inner section-inner medium">
-
-				<h1 class="entry-title"><?php echo wp_kses_post( $offline_page['title'] ); ?></h1>
-
-			</div><!-- .entry-header-inner -->
-
-		</header><!-- .entry-header -->
-
-		<div class="post-inner">
-
-			<div class="entry-content">
-
-				<?php echo wp_kses_post( $offline_page['content'] ); ?>
-
-			</div><!-- .entry-content -->
-
-		</div><!-- .post-inner -->
-
-	</article><!-- .post -->
-
-</main><!-- #site-content -->
-
-<?php get_template_part( 'template-parts/footer-menus-widgets' ); ?>
-
-<?php get_footer(); ?>
diff --git a/public_html/wp-content/mu-plugins/theme-templates/templates/offline.php b/public_html/wp-content/mu-plugins/theme-templates/templates/offline.php
index fb16384225..5299c9fb74 100644
--- a/public_html/wp-content/mu-plugins/theme-templates/templates/offline.php
+++ b/public_html/wp-content/mu-plugins/theme-templates/templates/offline.php
@@ -15,29 +15,68 @@
 
 namespace WordCamp\Theme_Templates;
 
-get_header();
-
 $offline_page = get_offline_content();
-?>
+$site_description = get_bloginfo( 'description' );
+?><!DOCTYPE html>
 
-<?php echo 'twentyseventeen' === get_template() ? '<div class="wrap">' : ''; ?> 
+<html class="no-js" <?php language_attributes(); ?>>
 
-	<main id="main" class="site-main">
-		<section class="error-offline">
-			<header class="page-header">
-				<h1 class="page-title">
-					<?php echo wp_kses_post( $offline_page['title'] ); ?>
-				</h1>
-			</header>
+<head>
 
-			<div class="page-content">
-				<?php echo wp_kses_post( $offline_page['content'] ); ?>
-			</div>
-		</section>
-	</main>
+	<meta charset="<?php bloginfo( 'charset' ); ?>">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" >
 
-<?php echo 'twentyseventeen' === get_template() ? '</div>' : ''; ?> 
+	<link rel="profile" href="https://gmpg.org/xfn/11">
 
-<?php
+	<?php wp_head(); ?>
+	<style>
+		.offline-container {
+			margin: 5vh auto;
+			padding: 2em;
+			max-width: 46em;
+		}
+		.theme-twentyfourteen .offline-container {
+			padding-top: 1px; /* Prevents margin collapse. */
+			background: white;
+		}
+		.theme-twentyfifteen:before { /* Remove the sidebar background– there is no sidebar. */
+			display: none;
+		}
+		.theme-twentyfifteen .offline-container,
+		.theme-twentysixteen .offline-container {
+			background: white;
+		}
+		.theme-twentytwenty section {
+			padding-top: 0;
+		}
+	</style>
+
+</head>
+
+<body <?php body_class( array( 'theme-' . get_template(), 'page-offline' ) ); ?>>
+	<div class="offline-container">
+		<header>
+			<h1>
+				<?php echo esc_html( get_bloginfo( 'name' ) ); ?>
+			</h1>
+			<?php if ( $site_description ) : ?>
+				<p><?php echo esc_html( $site_description ); ?></p>
+			<?php endif; ?>
+		</header>
+		<main>
+			<section>
+				<header>
+					<h2>
+						<?php echo wp_kses_post( $offline_page['title'] ); ?>
+					</h2>
+				</header>
 
-get_footer();
+				<div>
+					<?php echo wp_kses_post( $offline_page['content'] ); ?>
+				</div>
+			</section>
+		</main>
+	</div>
+	<?php wp_footer(); ?>
+</body>
+</html>
