diff --git a/source/wp-content/themes/wporg-news-2021/block-template-parts/content-category-month-in-wordpress.html b/source/wp-content/themes/wporg-news-2021/block-template-parts/content-category-month-in-wordpress.html
new file mode 100644
index 00000000..fb089c6f
--- /dev/null
+++ b/source/wp-content/themes/wporg-news-2021/block-template-parts/content-category-month-in-wordpress.html
@@ -0,0 +1,11 @@
+<!-- wp:group {"tagName":"header","className":"entry-header"} -->
+<header class="wp-block-group entry-header">
+	<h2><!-- wp:post-date {"format":"M","isLink":true} /--></h2>
+
+	<!-- wp:group {"className":"entry-meta"} -->
+	<div class="wp-block-group entry-meta">
+		<!-- wp:post-date {"format":"Y"} /-->
+	</div>
+	<!-- /wp:group -->
+</header>
+<!-- /wp:group -->
diff --git a/source/wp-content/themes/wporg-news-2021/block-templates/category-month-in-wordpress.html b/source/wp-content/themes/wporg-news-2021/block-templates/category-month-in-wordpress.html
new file mode 100644
index 00000000..4ff7a6f6
--- /dev/null
+++ b/source/wp-content/themes/wporg-news-2021/block-templates/category-month-in-wordpress.html
@@ -0,0 +1,16 @@
+<!-- wp:template-part {"slug":"header","align":"full","className":"site-header-container"} /-->
+<!-- This is a hack to ensure content isn't covered by the fixed header -->
+<!-- wp:template-part {"slug":"header","align":"full","className":"site-header-offset"} /-->
+
+<!-- wp:query {"tagName":"main","className":"site-content-container","displayLayout":{"type":"flex","columns":4},"query":{"category":"month-in-wordpress","perPage":"10000","inherit":false}} -->
+<main class="wp-block-query site-content-container">
+	<!-- wp:post-template -->
+		<!-- wp:template-part {"slug":"content-category-month-in-wordpress","tagName":"article","layout":{"inherit":true}} /-->
+	<!-- /wp:post-template -->
+
+</main>
+<!-- /wp:query -->
+
+<!-- wp:template-part {"tagName":"footer","slug":"footer-archive","className":"footer-archive","layout":{"inherit":true}} /-->
+
+<!-- wp:wporg/global-footer /-->
diff --git a/source/wp-content/themes/wporg-news-2021/functions.php b/source/wp-content/themes/wporg-news-2021/functions.php
index 9096ce9d..88979017 100644
--- a/source/wp-content/themes/wporg-news-2021/functions.php
+++ b/source/wp-content/themes/wporg-news-2021/functions.php
@@ -261,10 +261,10 @@ function specify_post_classes( $classes, $extra_classes, $post_id ) {
 		if ( !is_null( $current_post ) ) {
 			if ( $current_post == 0 ) {
 				// First in the query
-				$classes[] = 'first-in-year';
-			} elseif ( $current_post >= $wp_query->post_count - 1 ) {
+				#$classes[] = 'first-in-year first-in-query';
+			} elseif ( $current_post >= count( $wp_query->posts ) - 1 ) {
 				// Last in the query
-				$classes[] = 'last-in-year';
+				#$classes[] = 'last-in-year last-in-query';
 			} else {
 				if ( get_the_date( 'Y' ) !== get_the_date( 'Y', $wp_query->posts[ $current_post - 1 ] ) ) {
 					$classes[] = 'first-in-year';
diff --git a/source/wp-content/themes/wporg-news-2021/sass/components/_categories.scss b/source/wp-content/themes/wporg-news-2021/sass/components/_categories.scss
index ff604f48..8fa00144 100644
--- a/source/wp-content/themes/wporg-news-2021/sass/components/_categories.scss
+++ b/source/wp-content/themes/wporg-news-2021/sass/components/_categories.scss
@@ -40,11 +40,29 @@ body.category-releases {
 body.category-month-in-wordpress {
 
 	@extend %local-header-dark;
+	text-align: center;
 
 	.site-content-container {
 		color: var(--wp--preset--color--off-white-2);
 	}
 
+	.wp-block-post-date a {
+		color: var( --wp--preset--color--off-white-2 );
+		text-transform: uppercase;
+	}
+
+	.last-in-year::after {
+		content: "-";
+		display: inline-block;
+		line-height: 7em;
+		width: 100%;
+		background-image: url("images/brush-stroke-short-blue-4.svg");
+		background-position: center;
+		background-repeat: no-repeat;
+		//background-size: fill;
+		color: var(--wp--preset--color--blue-1);
+
+	}
 	@extend %footer-archive-dark;
 }