diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4740412e..c14b4c88 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -192,7 +192,7 @@
     <PackageVersion Include="ZB.MOM.WW.Secrets.Ui" Version="0.2.3" />
     <PackageVersion Include="ZB.MOM.WW.Secrets.Replicator.AkkaDotNet" Version="0.2.3" />
     <PackageVersion Include="ZB.MOM.WW.Audit" Version="0.1.0" />
-    <PackageVersion Include="ZB.MOM.WW.Theme" Version="0.3.1" />
+    <PackageVersion Include="ZB.MOM.WW.Theme" Version="0.4.0" />
     <PackageVersion Include="ZB.MOM.WW.HistorianGateway.Client" Version="0.3.0" />
     <PackageVersion Include="ZB.MOM.WW.HistorianGateway.Contracts" Version="0.3.0" />
   </ItemGroup>
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Layout/MainLayout.razor b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Layout/MainLayout.razor
index 0827d6be..5f90d348 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Layout/MainLayout.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Layout/MainLayout.razor
@@ -8,7 +8,11 @@
    by the kit's <ThemeScripts/> (emitted in App.razor) — replacing the old interactive
    NavSidebar island + cookie/URL auto-expand. *@
 
-<ThemeShell Product="OtOpcUa" Accent="#2f5fd0">
+@* No Accent parameter: #2f5fd0 is the kit's light default, and ThemeShell emits
+   Accent as an inline --accent on the shell root, which would silently beat any
+   future scheme-level override (the exact defect ScadaBridge hit). A real brand
+   accent belongs in site.css :root, not here. *@
+<ThemeShell Product="OtOpcUa">
     <Nav>
         <NavRailSection Title="Navigation" Key="nav">
             <NavRailItem Href="/" Text="Overview" Match="NavLinkMatch.All" />
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/wwwroot/css/site.css b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/wwwroot/css/site.css
index 8818a31c..3e5c1edb 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/wwwroot/css/site.css
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/wwwroot/css/site.css
@@ -24,27 +24,8 @@
 .chip-alert   { color: var(--bad);      background: var(--bad-bg);  border-color: var(--bad-border); }
 .chip-caution { color: var(--warn-ink); background: var(--warn-bg); border-color: var(--warn-border); }
 
-/* Button sizing — ZB.MOM.WW.Theme 0.3.1 ships no .btn rule at all, so Bootstrap's
-   hard-coded --bs-btn-font-size: 1rem applies against the theme's 0.9rem body and
-   every button reads oversized. Override the VARIABLES, never the box properties:
-   .btn-group relies on Bootstrap's own .btn rules for its seams, negative margins
-   and end-cap radii, and redefining padding/font-size wholesale breaks them.
-   UPSTREAMING CANDIDATE for a future Theme release — when the kit ships these,
-   delete this block rather than leaving a duplicate to drift. (Same gap, same fix,
-   same flag as the ignitionoee router's wwwroot/css/app.css.) */
-.btn {
-    --bs-btn-font-size: .85rem;
-    --bs-btn-padding-y: .35rem;
-    --bs-btn-padding-x: .8rem;
-    --bs-btn-line-height: 1.4;
-}
-
-.btn-group-sm > .btn,
-.btn-sm {
-    --bs-btn-font-size: .78rem;
-    --bs-btn-padding-y: .25rem;
-    --bs-btn-padding-x: .6rem;
-}
+/* Button sizing lives in the kit since ZB.MOM.WW.Theme 0.4.0 (layout.css ships the
+   .btn / .btn-sm CSS-variable overrides this sheet carried locally under 0.3.1). */
 
 /* Red variant of the kit's .notice inline banner (theme.css styles .notice amber,
    off the --warn-* tokens). Error banners across the AdminUI want the red tint, and