diff --git a/client-mu-plugins/goodbids/assets/images/goodbids-logo.png b/client-mu-plugins/goodbids/assets/images/goodbids-logo.png
new file mode 100644
index 000000000..4a3b65bc5
Binary files /dev/null and b/client-mu-plugins/goodbids/assets/images/goodbids-logo.png differ
diff --git a/client-mu-plugins/goodbids/src/classes/Network/Sites.php b/client-mu-plugins/goodbids/src/classes/Network/Sites.php
index bff589d35..4b102e480 100644
--- a/client-mu-plugins/goodbids/src/classes/Network/Sites.php
+++ b/client-mu-plugins/goodbids/src/classes/Network/Sites.php
@@ -48,6 +48,7 @@ public function __construct() {
 
 		// New Site Actions
 		$this->activate_child_theme_on_new_site();
+		$this->default_child_theme_logo();
 	}
 
 	/**
@@ -393,4 +394,30 @@ private function init_site_defaults( int $site_id ): void {
 
 		restore_current_blog();
 	}
+
+	/**
+	 * Set the GoodBids logo on the child theme.
+	 *
+	 * @since 1.0.0
+	 *
+	 * @return void
+	 */
+	private function default_child_theme_logo(): void {
+		add_filter(
+			'get_custom_logo',
+			function ( string $html, int $blog_id ) {
+				if ( $html ) {
+					return $html;
+				}
+
+				return sprintf(
+					'<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url"><img src="%2$s" class="custom-logo" itemprop="logo" alt="GoodBids"></a>',
+					esc_url( home_url( '/' ) ),
+					esc_attr( GOODBIDS_PLUGIN_URL . 'assets/images/goodbids-logo.png' ),
+				);
+			},
+			10,
+			2
+		);
+	}
 }
diff --git a/themes/goodbids-nonprofit/assets/css/theme.css b/themes/goodbids-nonprofit/assets/css/theme.css
index 004be504d..54f4650af 100644
--- a/themes/goodbids-nonprofit/assets/css/theme.css
+++ b/themes/goodbids-nonprofit/assets/css/theme.css
@@ -8,3 +8,35 @@
 	background-color: var(--wp--preset--color--contrast);
 	color: var(--wp--preset--color--contrast-4);
 }
+
+/*TODO move this all to Tailwind once we set that up*/
+.wp-button-custom > a {
+	background-color: var(--wp--preset--color--contrast);
+	color: var(--wp--preset--color--base-2);
+	font-size: var(--wp--preset--font-size--x-small);
+	font-weight: 500;
+	text-decoration: none;
+    border-color: var(--wp--preset--color--contrast);
+    border-radius: 100px;
+    border-width: 0;
+	padding-top: 0.8rem;
+    padding-right: 1.5rem;
+	padding-left: 1.5rem;
+	padding-bottom: 0.8rem;
+
+	&:hover {
+		background-color: var(--wp--preset--color--contrast-4);
+		border-color: var(--wp--preset--color--contrast);
+		color: var(--wp--preset--color--contrast);
+	}
+
+	&:focus {
+		background-color: var(--wp--preset--color--contrast-4);
+		border-color: var(--wp--preset--color--contrast);
+		color: var(--wp--preset--color--contrast);
+		outline-color: var(--wp--preset--color--contrast);
+		outline-offset: 2px;
+		outline-style: dotted;
+		outline-width: 1px;
+	}
+}
diff --git a/themes/goodbids-nonprofit/inc/patterns.php b/themes/goodbids-nonprofit/inc/patterns.php
index 40d62eda6..4c963ca38 100644
--- a/themes/goodbids-nonprofit/inc/patterns.php
+++ b/themes/goodbids-nonprofit/inc/patterns.php
@@ -33,13 +33,21 @@ function () {
 	'init',
 	function () {
 		$patterns = [
+			[
+				'name'       => 'header-nonprofit',
+				'file'       => 'patterns/header-nonprofit.php',
+				'title'      => __( 'GoodBids Header', 'goodbids-nonprofit' ),
+				'categories' => [ 'header', 'goodbids-np' ],
+				'keywords'   => [ 'header', 'non-profit', 'template' ],
+				'blockTypes' => [ 'core/template-part/header' ],
+				'source'     => 'theme',
+			],
 			[
 				'name'       => 'footer-nonprofit',
 				'file'       => 'patterns/footer-nonprofit.php',
 				'title'      => __( 'GoodBids Footer', 'goodbids-nonprofit' ),
 				'categories' => [ 'footer', 'goodbids-np' ],
 				'blockTypes' => [ 'core/template-part/footer' ],
-				'source'     => 'theme',
 			],
 			[
 				'name'          => 'template-home-nonprofit',
diff --git a/themes/goodbids-nonprofit/parts/header.html b/themes/goodbids-nonprofit/parts/header.html
index fae3420f2..ddac33372 100644
--- a/themes/goodbids-nonprofit/parts/header.html
+++ b/themes/goodbids-nonprofit/parts/header.html
@@ -1,23 +1 @@
-<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"20px","bottom":"20px"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignwide has-background"
-	style="padding-top:20px;padding-bottom:20px">
-	<!-- wp:group {"align":"wide","layout":{"type":"flex","justifyContent":"space-between","flexWrap":"wrap"}} -->
-	<div class="wp-block-group alignwide">
-		<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex"}} -->
-		<div class="wp-block-group">
-			<!-- wp:site-logo {"width":60 } /-->
-
-			<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}}} -->
-			<div class="wp-block-group">
-				<!-- wp:site-title {"level":0} /-->
-			</div>
-			<!-- /wp:group -->
-		</div>
-		<!-- /wp:group -->
-
-		<!-- wp:navigation {"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}}} /-->
-
-		<!-- wp:loginout /--></div>
-	<!-- /wp:group -->
-</div>
-<!-- /wp:group -->
+<!-- wp:pattern {"slug":"goodbids-np/header-nonprofit"} /-->
diff --git a/themes/goodbids-nonprofit/patterns/header-nonprofit.php b/themes/goodbids-nonprofit/patterns/header-nonprofit.php
new file mode 100644
index 000000000..885a513a3
--- /dev/null
+++ b/themes/goodbids-nonprofit/patterns/header-nonprofit.php
@@ -0,0 +1,37 @@
+<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"20px","bottom":"20px"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignwide has-background"
+	style="padding-top:20px;padding-bottom:20px">
+	<!-- wp:group {"align":"wide","layout":{"type":"flex","justifyContent":"space-between","flexWrap":"wrap"}} -->
+	<div class="wp-block-group alignwide">
+		<!-- wp:group {"style":{"spacing":{"blockGap":"0.2rem"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex"}} -->
+		<div class="wp-block-group">
+
+			<!-- wp:site-logo {"width":160,"shouldSyncIcon":true,"style":{"spacing":{"margin":{"top":"0","bottom":"0","left":"0","right":"0.5rem"}}}} /-->
+
+			<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}}} -->
+			<div class="wp-block-group">
+				<!-- wp:paragraph {"style":{"layout":{"selfStretch":"fixed","flexSize":"25px"}},"fontSize":"x-small"} -->
+					<p class="has-x-small-font-size"><?php esc_html_e( 'for', 'goodbids-nonprofit' ); ?></p>
+				<!-- /wp:paragraph -->
+			</div>
+			<!-- /wp:group -->
+
+			<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}}} -->
+			<div class="wp-block-group">
+				<!-- wp:site-title {"level":0,"fontSize":"x-small"} /-->
+			</div>
+			<!-- /wp:group -->
+		</div>
+		<!-- /wp:group -->
+
+		<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","flexWrap":"wrap"}} -->
+		<div class="wp-block-group">
+			<!-- wp:navigation {"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"x-small"} /-->
+			<!-- wp:loginout {"className":"wp-button-custom","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"textColor":"base-2","fontSize":"x-small"} /-->
+		</div>
+		<!-- /wp:group -->
+	</div>
+
+	<!-- /wp:group -->
+</div>
+<!-- /wp:group -->
diff --git a/themes/goodbids-nonprofit/style.css b/themes/goodbids-nonprofit/style.css
index 6cd2ef4f3..b8d82c5a9 100644
--- a/themes/goodbids-nonprofit/style.css
+++ b/themes/goodbids-nonprofit/style.css
@@ -4,7 +4,7 @@ Theme URI: https://goodbids.org
 Author: Viget
 Author URI: https://viget.com
 Description: Twenty Twenty-Four child theme for GoodBids Nonprofit sites.
-Version: 1.0
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: goodbids-nonprofit
diff --git a/themes/goodbids-nonprofit/templates/front-page.html b/themes/goodbids-nonprofit/templates/front-page.html
index 224527cf1..f222d8287 100644
--- a/themes/goodbids-nonprofit/templates/front-page.html
+++ b/themes/goodbids-nonprofit/templates/front-page.html
@@ -1,3 +1,3 @@
 <!-- wp:template-part {"slug":"header","area":"header","tagName":"header"} /-->
-	<!-- wp:pattern {"slug":"goodbids-nonprofit/template-home-nonprofit"} /-->
+	<!-- wp:pattern {"slug":"goodbids-np/template-home-nonprofit"} /-->
 <!-- wp:template-part {"slug":"footer","area":"footer","tagName":"footer"} /-->
diff --git a/themes/goodbids-nonprofit/theme.json b/themes/goodbids-nonprofit/theme.json
index 7a1e1df3a..1f4556b6e 100644
--- a/themes/goodbids-nonprofit/theme.json
+++ b/themes/goodbids-nonprofit/theme.json
@@ -51,6 +51,12 @@
 		"typography": {
 			"lineHeight": false,
 			"fontSizes": [
+				{
+					"fluid": false,
+					"name": "X Small",
+					"size": "0.9rem",
+					"slug": "x-small"
+				},
 				{
 					"fluid": false,
 					"name": "Small",