diff --git a/themes/wporg-5ftf-2024/templates/front-page.html b/themes/wporg-5ftf-2024/templates/front-page.html
index 9efcfaa..4e81ee9 100644
--- a/themes/wporg-5ftf-2024/templates/front-page.html
+++ b/themes/wporg-5ftf-2024/templates/front-page.html
@@ -3,11 +3,7 @@
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained"},"className":"entry-content","style":{"spacing":{"blockGap":"0px"}}} -->
 <main class="wp-block-group entry-content">
 
-	<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}},"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group alignfull" style="padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
-		<!-- wp:post-content {"layout":{"inherit":true}} /-->
-	</div>
-	<!-- /wp:group -->
+	<!-- wp:post-content {"layout":{"type":"constrained"},"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}}} /-->
 
 </main>
 <!-- /wp:group -->
diff --git a/themes/wporg-5ftf-2024/templates/page.html b/themes/wporg-5ftf-2024/templates/page.html
index 8135007..583924d 100644
--- a/themes/wporg-5ftf-2024/templates/page.html
+++ b/themes/wporg-5ftf-2024/templates/page.html
@@ -4,32 +4,17 @@
 <article class="wp-block-group">
 	<!-- wp:group -->
 	<div class="wp-block-group">
-		<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"top":"0px"}}}} /-->
-	</div>
-	<!-- /wp:group -->
-	
-	<!-- wp:separator {"align":"full","className":"has-text-color has-light-grey-1-color is-style-wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}}}} -->
-	<hr class="wp-block-separator alignfull has-alpha-channel-opacity has-text-color has-light-grey-1-color is-style-wide" style="margin-top:var(--wp--preset--spacing--40);margin-bottom:var(--wp--preset--spacing--40)"/>
-	<!-- /wp:separator -->
-	
-	<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0px"}}}} -->
-	<div class="wp-block-group alignfull" style="margin-top:0px">
-		<!-- wp:post-content {"layout":{"inherit":true}} /-->
+		<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"top":"0px","bottom":"var:preset|spacing|40"}}}} /-->
 	</div>
 	<!-- /wp:group -->
+
+	<!-- wp:post-content {"layout":{"type":"constrained"},"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}}} /-->
+
 </article>
 <!-- /wp:group -->
 	
 <!-- wp:spacer -->
 <div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
-
-<!-- wp:group {"metadata":{"patternName":"wporg-parent-2021/post-navigation","name":"Post Navigation"},"style":{"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"}},"spacing":{"padding":{"top":"var:preset|spacing|20","right":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|20","left":"var:preset|spacing|edge-space"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--light-grey-1);border-top-width:1px;padding-top:var(--wp--preset--spacing--20);padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--20);padding-left:var(--wp--preset--spacing--edge-space)">
-	<!-- wp:post-navigation-link {"type":"previous","label":"Previous","showTitle":true,"linkLabel":true} /-->
-	
-	<!-- wp:post-navigation-link {"label":"Next","showTitle":true,"linkLabel":true} /-->
-</div>
-<!-- /wp:group -->
 	
 <!-- wp:template-part {"slug":"footer"} /-->
diff --git a/themes/wporg-5ftf-2024/templates/single-5ftf_pledge.html b/themes/wporg-5ftf-2024/templates/single-5ftf_pledge.html
new file mode 100644
index 0000000..66dd161
--- /dev/null
+++ b/themes/wporg-5ftf-2024/templates/single-5ftf_pledge.html
@@ -0,0 +1,16 @@
+<!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
+
+<!-- wp:group {"tagName":"article","layout":{"inherit":true,"type":"constrained"}} -->
+<article class="wp-block-group">
+	<!-- wp:group -->
+	<div class="wp-block-group">
+		<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"top":"0px","bottom":"var:preset|spacing|40"}}}} /-->
+	</div>
+	<!-- /wp:group -->
+	
+	<!-- wp:post-content {"layout":{"type":"constrained"},"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}}} /-->
+
+</article>
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer"} /-->
diff --git a/themes/wporg-5ftf-2024/templates/single.html b/themes/wporg-5ftf-2024/templates/single.html
index 8135007..319ade2 100644
--- a/themes/wporg-5ftf-2024/templates/single.html
+++ b/themes/wporg-5ftf-2024/templates/single.html
@@ -4,19 +4,12 @@
 <article class="wp-block-group">
 	<!-- wp:group -->
 	<div class="wp-block-group">
-		<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"top":"0px"}}}} /-->
+		<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"top":"0px","bottom":"var:preset|spacing|40"}}}} /-->
 	</div>
 	<!-- /wp:group -->
 	
-	<!-- wp:separator {"align":"full","className":"has-text-color has-light-grey-1-color is-style-wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}}}} -->
-	<hr class="wp-block-separator alignfull has-alpha-channel-opacity has-text-color has-light-grey-1-color is-style-wide" style="margin-top:var(--wp--preset--spacing--40);margin-bottom:var(--wp--preset--spacing--40)"/>
-	<!-- /wp:separator -->
-	
-	<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0px"}}}} -->
-	<div class="wp-block-group alignfull" style="margin-top:0px">
-		<!-- wp:post-content {"layout":{"inherit":true}} /-->
-	</div>
-	<!-- /wp:group -->
+	<!-- wp:post-content {"layout":{"type":"constrained"},"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}}} /-->
+
 </article>
 <!-- /wp:group -->
 	
diff --git a/themes/wporg-5ftf-2024/theme.json b/themes/wporg-5ftf-2024/theme.json
index ae96918..4ebe313 100644
--- a/themes/wporg-5ftf-2024/theme.json
+++ b/themes/wporg-5ftf-2024/theme.json
@@ -1,6 +1,40 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/theme.json",
 	"version": 2,
-	"settings": {},
-	"styles": {}
+	"settings": {
+		"custom": {
+			"form": {
+				"border": {
+					"color": "var(--wp--preset--color--charcoal-5)",
+					"width": "1px"
+				}
+			}
+		}
+	},
+	"styles": {
+		"blocks": {
+			"core/post-title": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--heading-2)"
+				}
+			}
+		},
+		"elements": {
+			"h1": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--heading-2)"
+				}
+			},
+			"h2": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--heading-3)"
+				}
+			},
+			"h3": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--heading-4)"
+				}
+			}
+		}
+	}
 }