diff --git a/examples/inkform-docs/app/theme.css b/examples/inkform-docs/app/theme.css
index 163f887..d3a11cf 100644
--- a/examples/inkform-docs/app/theme.css
+++ b/examples/inkform-docs/app/theme.css
@@ -117,12 +117,16 @@ html.dark {
 .fw-shell-header {
   height: auto;
   min-height: var(--fw-header-h);
+  border-bottom: none;
 }
 
 .fw-shell-header-inner {
   flex-wrap: wrap;
   row-gap: 0.625rem;
   align-items: center;
+  align-content: flex-start;
+  height: 100%;
+  min-height: var(--fw-header-h);
   padding-top: 0.875rem;
   padding-bottom: 0;
 }
@@ -144,6 +148,8 @@ html.dark {
   order: 3;
   flex-basis: 100%;
   justify-content: flex-start;
+  margin-top: auto;
+  border-bottom: 1px solid var(--fw-border);
 }
 
 /* Search trigger: centered within the row-1 space between the logo and Ask
@@ -199,7 +205,7 @@ html.dark {
 }
 
 .fw-topnav-tab {
-  padding: 0.5rem 0.0625rem 0.75rem;
+  padding: 0.625rem 0.0625rem 0.625rem;
   margin-bottom: -1px;
   border: none;
   border-bottom: 2px solid transparent;
@@ -214,8 +220,11 @@ html.dark {
 
 .fw-topnav-tab--active {
   background: none;
+  margin-bottom: -2px;
   border-bottom-color: var(--fw-primary);
   color: var(--fw-fg);
+  position: relative;
+  z-index: 1;
 }
 
 /* ── Sidebar: collapse chrome + Palm's plain (non-uppercase) group labels ── */
diff --git a/examples/markdown-docs/app/theme.css b/examples/markdown-docs/app/theme.css
index 697b2b8..0aecbc7 100644
--- a/examples/markdown-docs/app/theme.css
+++ b/examples/markdown-docs/app/theme.css
@@ -110,12 +110,16 @@ html.dark {
 .fw-shell-header {
   height: auto;
   min-height: var(--fw-header-h);
+  border-bottom: none;
 }
 
 .fw-shell-header-inner {
   flex-wrap: wrap;
   row-gap: 0.625rem;
   align-items: center;
+  align-content: flex-start;
+  height: 100%;
+  min-height: var(--fw-header-h);
   padding-top: 0.875rem;
   padding-bottom: 0;
 }
@@ -137,6 +141,8 @@ html.dark {
   order: 3;
   flex-basis: 100%;
   justify-content: flex-start;
+  margin-top: auto;
+  border-bottom: 1px solid var(--fw-border);
 }
 
 /* Search trigger: centered within the row-1 space between the logo and Ask
@@ -192,7 +198,7 @@ html.dark {
 }
 
 .fw-topnav-tab {
-  padding: 0.5rem 0.0625rem 0.75rem;
+  padding: 0.625rem 0.0625rem 0.625rem;
   margin-bottom: -1px;
   border: none;
   border-bottom: 2px solid transparent;
@@ -207,8 +213,11 @@ html.dark {
 
 .fw-topnav-tab--active {
   background: none;
+  margin-bottom: -2px;
   border-bottom-color: var(--fw-primary);
   color: var(--fw-fg);
+  position: relative;
+  z-index: 1;
 }
 
 /* ── Sidebar: collapse chrome + Palm's plain (non-uppercase) group labels ── */
diff --git a/examples/pokeapi-docs/app/theme.css b/examples/pokeapi-docs/app/theme.css
index af24cce..8ae44ba 100644
--- a/examples/pokeapi-docs/app/theme.css
+++ b/examples/pokeapi-docs/app/theme.css
@@ -89,12 +89,16 @@ html.dark {
 .fw-shell-header {
   height: auto;
   min-height: var(--fw-header-h);
+  border-bottom: none;
 }
 
 .fw-shell-header-inner {
   flex-wrap: wrap;
   row-gap: 0.625rem;
   align-items: center;
+  align-content: flex-start;
+  height: 100%;
+  min-height: var(--fw-header-h);
   padding-top: 0.875rem;
   padding-bottom: 0;
 }
@@ -116,6 +120,8 @@ html.dark {
   order: 3;
   flex-basis: 100%;
   justify-content: flex-start;
+  margin-top: auto;
+  border-bottom: 1px solid var(--fw-border);
 }
 
 /* Search trigger: centered within the row-1 space between the logo and Ask
@@ -171,7 +177,7 @@ html.dark {
 }
 
 .fw-topnav-tab {
-  padding: 0.5rem 0.0625rem 0.75rem;
+  padding: 0.625rem 0.0625rem 0.625rem;
   margin-bottom: -1px;
   border: none;
   border-bottom: 2px solid transparent;
@@ -186,8 +192,11 @@ html.dark {
 
 .fw-topnav-tab--active {
   background: none;
+  margin-bottom: -2px;
   border-bottom-color: var(--fw-primary);
   color: var(--fw-fg);
+  position: relative;
+  z-index: 1;
 }
 
 /* ── Sidebar: collapse chrome + Palm's plain (non-uppercase) group labels ── */
diff --git a/templates/canopy/app/theme.css b/templates/canopy/app/theme.css
index 19970b1..6ebfc88 100644
--- a/templates/canopy/app/theme.css
+++ b/templates/canopy/app/theme.css
@@ -87,12 +87,16 @@ html.dark {
 .fw-shell-header {
   height: auto;
   min-height: var(--fw-header-h);
+  border-bottom: none;
 }
 
 .fw-shell-header-inner {
   flex-wrap: wrap;
   row-gap: 0.625rem;
   align-items: center;
+  align-content: flex-start;
+  height: 100%;
+  min-height: var(--fw-header-h);
   padding-top: 0.875rem;
   padding-bottom: 0;
 }
@@ -114,6 +118,8 @@ html.dark {
   order: 3;
   flex-basis: 100%;
   justify-content: flex-start;
+  margin-top: auto;
+  border-bottom: 1px solid var(--fw-border);
 }
 
 /* Search trigger: centered within the row-1 space between the logo and Ask
@@ -169,7 +175,7 @@ html.dark {
 }
 
 .fw-topnav-tab {
-  padding: 0.5rem 0.0625rem 0.75rem;
+  padding: 0.625rem 0.0625rem 0.625rem;
   margin-bottom: -1px;
   border: none;
   border-bottom: 2px solid transparent;
@@ -184,8 +190,11 @@ html.dark {
 
 .fw-topnav-tab--active {
   background: none;
+  margin-bottom: -2px;
   border-bottom-color: var(--fw-primary);
   color: var(--fw-fg);
+  position: relative;
+  z-index: 1;
 }
 
 /* ── Sidebar: collapse chrome + Palm's plain (non-uppercase) group labels ── */
diff --git a/templates/galley/app/theme.css b/templates/galley/app/theme.css
index 163f887..d3a11cf 100644
--- a/templates/galley/app/theme.css
+++ b/templates/galley/app/theme.css
@@ -117,12 +117,16 @@ html.dark {
 .fw-shell-header {
   height: auto;
   min-height: var(--fw-header-h);
+  border-bottom: none;
 }
 
 .fw-shell-header-inner {
   flex-wrap: wrap;
   row-gap: 0.625rem;
   align-items: center;
+  align-content: flex-start;
+  height: 100%;
+  min-height: var(--fw-header-h);
   padding-top: 0.875rem;
   padding-bottom: 0;
 }
@@ -144,6 +148,8 @@ html.dark {
   order: 3;
   flex-basis: 100%;
   justify-content: flex-start;
+  margin-top: auto;
+  border-bottom: 1px solid var(--fw-border);
 }
 
 /* Search trigger: centered within the row-1 space between the logo and Ask
@@ -199,7 +205,7 @@ html.dark {
 }
 
 .fw-topnav-tab {
-  padding: 0.5rem 0.0625rem 0.75rem;
+  padding: 0.625rem 0.0625rem 0.625rem;
   margin-bottom: -1px;
   border: none;
   border-bottom: 2px solid transparent;
@@ -214,8 +220,11 @@ html.dark {
 
 .fw-topnav-tab--active {
   background: none;
+  margin-bottom: -2px;
   border-bottom-color: var(--fw-primary);
   color: var(--fw-fg);
+  position: relative;
+  z-index: 1;
 }
 
 /* ── Sidebar: collapse chrome + Palm's plain (non-uppercase) group labels ── */
diff --git a/templates/shadcn/app/theme.css b/templates/shadcn/app/theme.css
index c2fec5f..89615e6 100644
--- a/templates/shadcn/app/theme.css
+++ b/templates/shadcn/app/theme.css
@@ -112,12 +112,16 @@ html.dark {
 .fw-shell-header {
   height: auto;
   min-height: var(--fw-header-h);
+  border-bottom: none;
 }
 
 .fw-shell-header-inner {
   flex-wrap: wrap;
   row-gap: 0.625rem;
   align-items: center;
+  align-content: flex-start;
+  height: 100%;
+  min-height: var(--fw-header-h);
   padding-top: 0.875rem;
   padding-bottom: 0;
 }
@@ -139,6 +143,8 @@ html.dark {
   order: 3;
   flex-basis: 100%;
   justify-content: flex-start;
+  margin-top: auto;
+  border-bottom: 1px solid var(--fw-border);
 }
 
 /* Search trigger: centered within the row-1 space between the logo and Ask
@@ -194,7 +200,7 @@ html.dark {
 }
 
 .fw-topnav-tab {
-  padding: 0.5rem 0.0625rem 0.75rem;
+  padding: 0.625rem 0.0625rem 0.625rem;
   margin-bottom: -1px;
   border: none;
   border-bottom: 2px solid transparent;
@@ -209,8 +215,11 @@ html.dark {
 
 .fw-topnav-tab--active {
   background: none;
+  margin-bottom: -2px;
   border-bottom-color: var(--fw-primary);
   color: var(--fw-fg);
+  position: relative;
+  z-index: 1;
 }
 
 /* ── Sidebar: collapse chrome + Palm's plain (non-uppercase) group labels ── */