diff --git a/parts/comments.html b/parts/comments.html
index 22a23cca..65d5484b 100644
--- a/parts/comments.html
+++ b/parts/comments.html
@@ -2,7 +2,7 @@
 <div class="wp-block-group">
 	<!-- wp:comments-query-loop {"className":"site-comments"} -->
 	<div class="wp-block-comments-query-loop site-comments">
-		<!-- wp:comments-title /-->
+		<!-- wp:comments-title {"level":3} /-->
 		<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"60px"}}}} -->
 		<div class="wp-block-group" style="margin-bottom:60px">
 			<!-- wp:comment-template -->
diff --git a/style.css b/style.css
index ab2b69b6..1ecfc5a2 100644
--- a/style.css
+++ b/style.css
@@ -67,6 +67,13 @@ pre {
 	white-space: pre-wrap;
 }
 
+mark {
+	background: linear-gradient(90deg, var(--wp--preset--color--primary) 0%, var(--wp--preset--color--primary) 100%);
+	background-position: 0 85%;
+	background-repeat: repeat-x;
+	background-size: 100% 15%;
+}
+
 /* Blocks
 ---------------------------------------------------------------------------- */
 
@@ -419,6 +426,14 @@ textarea {
 /* Media Queries
 ---------------------------------------------------------------------------- */
 
+@media only screen and (min-width: 600px) {
+
+	.is-style-min-width {
+		min-width: 200px;
+	}
+
+}
+
 @media only screen and (min-width: 800px) {
 
 	/* Navigation Link
diff --git a/templates/blank.html b/templates/blank.html
index fe210308..eca2e196 100644
--- a/templates/blank.html
+++ b/templates/blank.html
@@ -1,5 +1,5 @@
-<!-- wp:group {"tagName":"main","className":"site-content","style":{"spacing":{"margin":{"top":"0"}}}} -->
-<main class="wp-block-group site-content" style="margin-top:0">
+<!-- wp:group {"tagName":"main","className":"site-content"} -->
+<main class="wp-block-group site-content">
 	<!-- wp:post-content {"layout":{"type":"constrained"}} /-->
 </main>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/theme.json b/theme.json
index a2d6f5d0..92774852 100644
--- a/theme.json
+++ b/theme.json
@@ -50,11 +50,28 @@
 			"defaultDuotone": false,
 			"defaultGradients": false,
 			"defaultPalette": false,
+			"duotone": [
+				{
+					"name": "Black and White",
+					"slug": "black-and-white",
+					"colors": [ "#000000", "#ffffff" ]
+				},
+				{
+					"name": "Primary and White",
+					"slug": "primary-and-white",
+					"colors": [ "#0000ff", "#ffffff" ]
+				},
+				{
+					"name": "Secondary and White",
+					"slug": "secondary-and-white",
+					"colors": [ "#000099", "#ffffff" ]
+				}
+			],
 			"gradients": [
 				{
-					"gradient": "linear-gradient(0deg, var(--wp--preset--color--primary) 0%, var(--wp--preset--color--tertiary) 100%)",
-					"name": "Primary to Tertiary",
-					"slug": "primary-tertiary"
+					"gradient": "linear-gradient(0deg, var(--wp--preset--color--primary) 0%, var(--wp--preset--color--contrast) 100%)",
+					"name": "Primary to Contrast",
+					"slug": "primary-contrast"
 				}
 			],
 			"palette": [
@@ -78,11 +95,6 @@
 					"name": "Secondary",
 					"slug": "secondary"
 				},
-				{
-					"color": "#000033",
-					"name": "Tertiary",
-					"slug": "tertiary"
-				},
 				{
 					"color": "#eeeeee",
 					"name": "Neutral",
@@ -114,7 +126,7 @@
 		},
 		"layout": {
 			"contentSize": "640px",
-			"wideSize": "1200px"
+			"wideSize": "1280px"
 		},
 		"spacing": {
 			"spacingSizes": [
@@ -181,8 +193,14 @@
 			"fontSizes": [
 				{
 					"fluid": false,
-					"name": "Small",
+					"name": "xSmall",
 					"size": "16px",
+					"slug": "x-small"
+				},
+				{
+					"fluid": false,
+					"name": "Small",
+					"size": "18px",
 					"slug": "small"
 				},
 				{
@@ -303,9 +321,12 @@
 			"core/comments-title": {
 				"spacing": {
 					"margin": {
-						"bottom": "30px",
-						"top": "60px"
+						"top": "var(--wp--preset--spacing--medium)",
+						"bottom": "30px"
 					}
+				},
+				"typography": {
+					"fontWeight": "var(--wp--custom--font-weight--regular)"
 				}
 			},
 			"core/cover": {
@@ -319,9 +340,6 @@
 				}
 			},
 			"core/heading": {
-				"spacing": {
-					"margin": "0"
-				},
 				"typography": {
 					"fontWeight": "var(--wp--custom--font-weight--regular)",
 					"lineHeight": "var(--wp--custom--line-height--heading)"
@@ -333,7 +351,7 @@
 						"bottom": "30px",
 						"left": "0",
 						"right": "0",
-						"top": "0"
+						"top": "30px"
 					}
 				}
 			},
@@ -386,8 +404,7 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)",
-					"lineHeight": "var(--wp--custom--line-height--medium)"
+					"fontSize": "var(--wp--preset--font-size--medium)"
 				}
 			},
 			"core/quote": {
@@ -406,9 +423,6 @@
 						"right": "40px",
 						"top": "30px"
 					}
-				},
-				"typography": {
-					"lineHeight": "var(--wp--custom--line-height--medium)"
 				}
 			},
 			"core/site-title": {