From afb28ecb923f0d14b6402daf3d4e7f95f875a5e5 Mon Sep 17 00:00:00 2001
From: Mike James <michael.james6@gmail.com>
Date: Mon, 13 Jul 2026 16:28:47 +0200
Subject: [PATCH] Fixed the dark theme.

---
 samples/ControlCatalog/Assets/Icon.png        | Bin 14349 -> 8988 bytes
 .../Accents/BaseResources.xaml                |   8 +-
 .../Controls/DrawerPage.xaml                  | 228 +++++++++++++-----
 .../Controls/NavigationPage.xaml              |  12 +-
 .../Controls/TabbedPage.xaml                  |  27 ++-
 .../KeyParityTests.cs                         |  53 ++++
 6 files changed, 259 insertions(+), 69 deletions(-)

diff --git a/samples/ControlCatalog/Assets/Icon.png b/samples/ControlCatalog/Assets/Icon.png
index 41a2a618fb02e4cb7f6a15caf572b693bfe1ebb1..4e60afcc59a9538fead0f1da8815ee2f12cd603f 100644
GIT binary patch
literal 8988
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
P|81zOs1C1$nFaqJA3&u&

literal 14349
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
H8T|hMTHCz{

diff --git a/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml b/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
index efdb72dba6..a4e249de82 100644
--- a/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
@@ -99,8 +99,8 @@
                        Color="{StaticResource SystemChromeMediumLowColor}" />
       <SolidColorBrush x:Key="SystemControlDisabledListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
       <SolidColorBrush x:Key="SystemControlDisabledTransparentBrush" Color="Transparent" />
-      <SolidColorBrush x:Key="SystemControlFocusVisualPrimaryBrush" Color="{DynamicResource FocusStrokeColorOuter}" />
-      <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="{DynamicResource FocusStrokeColorInner}" />
+      <SolidColorBrush x:Key="SystemControlFocusVisualPrimaryBrush" Color="{StaticResource FocusStrokeColorOuter}" />
+      <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="{StaticResource FocusStrokeColorInner}" />
       <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{DynamicResource SystemAccentColor}" />
       <SolidColorBrush x:Key="SystemControlForegroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
       <SolidColorBrush x:Key="SystemControlForegroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
@@ -260,8 +260,8 @@
                        Color="{StaticResource SystemChromeMediumLowColor}" />
       <SolidColorBrush x:Key="SystemControlDisabledListMediumBrush" Color="{StaticResource SystemListMediumColor}" />
       <SolidColorBrush x:Key="SystemControlDisabledTransparentBrush" Color="Transparent" />
-      <SolidColorBrush x:Key="SystemControlFocusVisualPrimaryBrush" Color="{DynamicResource FocusStrokeColorOuter}" />
-      <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="{DynamicResource FocusStrokeColorInner}" />
+      <SolidColorBrush x:Key="SystemControlFocusVisualPrimaryBrush" Color="{StaticResource FocusStrokeColorOuter}" />
+      <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="{StaticResource FocusStrokeColorInner}" />
       <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{DynamicResource SystemAccentColor}" />
       <SolidColorBrush x:Key="SystemControlForegroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
       <SolidColorBrush x:Key="SystemControlForegroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
diff --git a/src/Avalonia.Themes.Fluent2/Controls/DrawerPage.xaml b/src/Avalonia.Themes.Fluent2/Controls/DrawerPage.xaml
index 26d991de24..06fe9303b1 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/DrawerPage.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/DrawerPage.xaml
@@ -10,41 +10,140 @@
     </DrawerPage>
   </Design.PreviewWith>
 
+  <!-- WinUI 3 mapping (NavigationView.xaml / NavigationView_themeresources.xaml):
+       DrawerPage plays the role of NavigationView. Display modes map to pane display modes -
+       Inline = Left (expanded), CompactInline/CompactOverlay = LeftCompact, Overlay = LeftMinimal.
+       The three anatomy rules ported from WinUI:
+       1. The hamburger toggle lives at the top of the pane (PaneToggleButtonStyle, 40x36,
+          margin 4,2 inside a 0,4 button-holder row), not in a chrome bar over the content.
+          Only LeftMinimal (Overlay) keeps a transparent toggle strip above the content.
+       2. The content area is a "layer" card: LayerFillColorDefault fill, CardStrokeColorDefault
+          1,1,0,0 stroke, OverlayCornerRadius on the pane-side top corner. Minimal/top-nav modes
+          flatten it to a 0,1,0,0 hairline with no rounding.
+       3. The pane is transparent when it does not overlay content (PaneNotOverlaying state) and
+          uses the in-app acrylic fill (solid fallback here) while overlaying. No smoke dim -
+          light dismiss is a transparent hit-target, as in WinUI. -->
+
+  <!-- Fluent E700 GlobalNavigationButton hamburger, drawn on a 24x24 grid. -->
   <StreamGeometry x:Key="DrawerPaneButtonIcon">M3 17h18a1 1 0 0 1 .117 1.993L21 19H3a1 1 0 0 1-.117-1.993L3 17h18H3Zm0-6 18-.002a1 1 0 0 1 .117 1.993l-.117.007L3 13a1 1 0 0 1-.117-1.993L3 11l18-.002L3 11Zm0-6h18a1 1 0 0 1 .117 1.993L21 7H3a1 1 0 0 1-.117-1.993L3 5h18H3Z</StreamGeometry>
 
+  <!-- Kept from v1 for resource-key parity; the strip is transparent in the WinUI 3 look. -->
   <x:Double x:Key="NavigationControlNavBarHeight">48</x:Double>
-  <SolidColorBrush x:Key="NavigationControlNavBarBackground" Color="{DynamicResource SolidBackgroundFillColorBaseAlt}" />
+  <SolidColorBrush x:Key="NavigationControlNavBarBackground" Color="Transparent" />
+
+  <!-- WinUI 3 NavigationView metrics, verbatim. -->
+  <x:Double x:Key="PaneToggleButtonWidth">40</x:Double>
+  <x:Double x:Key="PaneToggleButtonHeight">36</x:Double>
+  <Thickness x:Key="NavigationViewItemButtonMargin">4,2</Thickness>
+  <Thickness x:Key="NavigationViewButtonHolderGridMargin">0,4</Thickness>
+  <Thickness x:Key="NavigationViewContentGridBorderThickness">1,1,0,0</Thickness>
+  <CornerRadius x:Key="NavigationViewContentGridCornerRadius">8,0,0,0</CornerRadius>
+  <Thickness x:Key="NavigationViewMinimalContentGridBorderThickness">0,1,0,0</Thickness>
+  <CornerRadius x:Key="NavigationViewMinimalContentGridCornerRadius">0</CornerRadius>
+  <Thickness x:Key="TopNavigationViewContentGridBorderThickness">0,1,0,0</Thickness>
+  <CornerRadius x:Key="TopNavigationViewContentGridCornerRadius">0</CornerRadius>
+
+  <!-- WinUI 3 NavigationView brushes. Colors track the palette tokens so ColorPaletteResources
+       and token overrides flow through. -->
+
+  <ResourceDictionary.ThemeDictionaries>
+    <ResourceDictionary x:Key="Default">
+      <StaticResource x:Key="NavigationViewContentBackground" ResourceKey="LayerFillColorDefaultBrush" />
+      <StaticResource x:Key="NavigationViewContentGridBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+      <StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+      <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    </ResourceDictionary>
+    <ResourceDictionary x:Key="Dark">
+      <StaticResource x:Key="NavigationViewContentBackground" ResourceKey="LayerFillColorDefaultBrush" />
+      <StaticResource x:Key="NavigationViewContentGridBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+      <StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+      <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
+
+  <!-- WinUI PaneToggleButtonStyle: 40x36 minimum, transparent rest state, subtle fills on
+       hover/press, ControlCornerRadius, 16px glyph. Checked (= drawer open) renders like rest,
+       matching the stateless WinUI pane toggle Button. -->
+  <ControlTheme x:Key="Fluent2DrawerPaneToggleButton" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource SubtleFillColorTransparentBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="MinWidth" Value="{DynamicResource PaneToggleButtonWidth}" />
+    <Setter Property="MinHeight" Value="{DynamicResource PaneToggleButtonHeight}" />
+    <!-- NavigationViewButtonHolderGridMargin 0,4 + NavigationViewItemButtonMargin 4,2 -->
+    <Setter Property="Margin" Value="4,6" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
+    </Style>
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}" />
+    </Style>
+    <Style Selector="^:pressed">
+      <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
+    </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
+    </Style>
+    <Style Selector="^:disabled">
+      <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
+    </Style>
+  </ControlTheme>
 
   <ControlTheme x:Key="{x:Type DrawerPage}" TargetType="DrawerPage">
-    <Setter Property="Background" Value="{DynamicResource SolidBackgroundFillColorBaseBrush}" />
+    <!-- Content chrome = WinUI ContentGrid: layer fill, card stroke, rounded pane-side corner.
+         Flows onto PART_ContentPresenter through the standard template bindings. -->
+    <Setter Property="Background" Value="{DynamicResource NavigationViewContentBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource NavigationViewContentGridBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource NavigationViewContentGridBorderThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource NavigationViewContentGridCornerRadius}" />
     <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
-    <!-- Smoke layer shown behind the drawer in the overlay display modes. -->
-    <Setter Property="BackdropBrush" Value="{DynamicResource SmokeFillColorDefaultBrush}" />
+    <!-- WinUI overlay panes light-dismiss without dimming; a transparent brush keeps the
+         click-outside-to-close hit target without the smoke. -->
+    <Setter Property="BackdropBrush" Value="Transparent" />
     <Setter Property="Template">
       <ControlTemplate>
         <SplitView Name="PART_SplitView"
                    DisplayMode="{TemplateBinding DisplayMode}"
                    OpenPaneLength="{TemplateBinding DrawerLength}"
                    CompactPaneLength="{TemplateBinding CompactDrawerLength}"
-                   PaneBackground="{Binding DrawerBackground, RelativeSource={RelativeSource TemplatedParent}}"
+                   PaneBackground="{Binding DrawerBackground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource NavigationViewExpandedPaneBackground}}"
                    IsPaneOpen="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
           <SplitView.Pane>
-            <DockPanel Background="{TemplateBinding DrawerBackground}">
-              <!-- Compact-mode toggle: visible only in CompactOverlay/CompactInline. -->
+            <DockPanel>
+              <!-- WinUI TogglePaneButton: anchored at the pane top in every left display mode;
+                   in the compact strip it doubles as the strip toggle. -->
               <ToggleButton Name="PART_CompactPaneToggle"
+                            Theme="{StaticResource Fluent2DrawerPaneToggleButton}"
                             DockPanel.Dock="Top"
                             IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
-                            Background="Transparent"
-                            IsVisible="False"
-                            HorizontalAlignment="Left"
-                            Width="{TemplateBinding CompactDrawerLength}"
-                            Height="{TemplateBinding CompactDrawerLength}"
                             AutomationProperties.Name="Toggle navigation drawer"
                             ToolTip.Tip="Toggle navigation drawer">
                 <Panel>
                   <PathIcon
                     IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNull}}"
                     Data="{DynamicResource DrawerPaneButtonIcon}"
+                    Width="16"
+                    Height="16"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"/>
                   <ContentPresenter
@@ -78,27 +177,17 @@
           <Grid HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
             <DockPanel Name="PART_ContentDock">
+              <!-- LeftMinimal-only toggle strip: transparent, no divider; the layer card's
+                   0,1,0,0 hairline provides the separation, as in WinUI. -->
               <Border
                 Name="PART_TopBar"
-                Padding="5"
                 Height="{DynamicResource NavigationControlNavBarHeight}"
                 Background="{DynamicResource NavigationControlNavBarBackground}"
-                BackgroundSizing="InnerBorderEdge"
-                BorderBrush="{DynamicResource DividerStrokeColorDefaultBrush}"
-                BorderThickness="0,0,0,1"
                 DockPanel.Dock="Top">
                 <DockPanel HorizontalAlignment="Stretch">
-                  <DockPanel.Styles>
-                    <Styles>
-                      <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
-                        <Setter Property="Background"
-                                Value="Transparent" />
-                      </Style>
-                    </Styles>
-                  </DockPanel.Styles>
                   <ToggleButton x:Name="PART_PaneButton"
+                                Theme="{StaticResource Fluent2DrawerPaneToggleButton}"
                                 IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
-                                Background="Transparent"
                                 DockPanel.Dock="Left"
                                 AutomationProperties.Name="Toggle navigation drawer"
                                 ToolTip.Tip="Toggle navigation drawer">
@@ -106,6 +195,8 @@
                       <PathIcon
                         IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNull}}"
                         Data="{DynamicResource DrawerPaneButtonIcon}"
+                        Width="16"
+                        Height="16"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"/>
                       <ContentPresenter
@@ -130,26 +221,14 @@
               </Border>
               <Border
                 Name="PART_BottomBar"
-                Padding="5"
                 Height="{DynamicResource NavigationControlNavBarHeight}"
                 Background="{DynamicResource NavigationControlNavBarBackground}"
-                BackgroundSizing="InnerBorderEdge"
-                BorderBrush="{DynamicResource DividerStrokeColorDefaultBrush}"
-                BorderThickness="0,1,0,0"
                 DockPanel.Dock="Bottom"
                 IsVisible="False">
                 <DockPanel HorizontalAlignment="Stretch">
-                  <DockPanel.Styles>
-                    <Styles>
-                      <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
-                        <Setter Property="Background"
-                                Value="Transparent" />
-                      </Style>
-                    </Styles>
-                  </DockPanel.Styles>
                   <ToggleButton x:Name="PART_BottomPaneButton"
+                                Theme="{StaticResource Fluent2DrawerPaneToggleButton}"
                                 IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
-                                Background="Transparent"
                                 DockPanel.Dock="Left"
                                 AutomationProperties.Name="Toggle navigation drawer"
                                 ToolTip.Tip="Toggle navigation drawer">
@@ -157,6 +236,8 @@
                       <PathIcon
                         IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNull}}"
                         Data="{DynamicResource DrawerPaneButtonIcon}"
+                        Width="16"
+                        Height="16"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"/>
                       <ContentPresenter
@@ -198,6 +279,48 @@
       </ControlTemplate>
     </Setter>
 
+    <!-- Pane surface while overlaying content (WinUI PaneOverlaying state):
+         in-app acrylic fill (solid fallback). The SplitView theme supplies the rounded free
+         edge and flyout stroke. A user-set DrawerBackground wins over both states. -->
+    <Style Selector="^[DisplayMode=Overlay] /template/ SplitView#PART_SplitView:open">
+      <Setter Property="PaneBackground" Value="{DynamicResource NavigationViewDefaultPaneBackground}" />
+    </Style>
+    <Style Selector="^[DisplayMode=CompactOverlay] /template/ SplitView#PART_SplitView:open">
+      <Setter Property="PaneBackground" Value="{DynamicResource NavigationViewDefaultPaneBackground}" />
+    </Style>
+
+    <!-- The toggle strip exists only in the Overlay (LeftMinimal) display mode; every other
+         mode hosts the toggle inside the pane. -->
+    <Style Selector="^[DisplayMode=Inline] /template/ Border#PART_TopBar">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^[DisplayMode=CompactInline] /template/ Border#PART_TopBar">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^[DisplayMode=CompactOverlay] /template/ Border#PART_TopBar">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <!-- Minimal (Overlay) content chrome: flat hairline, no rounding (WinUI Minimal state). -->
+    <Style Selector="^[DisplayMode=Overlay]">
+      <Setter Property="BorderThickness" Value="{DynamicResource NavigationViewMinimalContentGridBorderThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource NavigationViewMinimalContentGridCornerRadius}" />
+    </Style>
+
+    <!-- Placement variants mirror the pane-side corner/stroke of the content card. -->
+    <Style Selector="^:placement-right">
+      <Setter Property="BorderThickness" Value="0,1,1,0" />
+      <Setter Property="CornerRadius" Value="0,8,0,0" />
+    </Style>
+    <Style Selector="^:placement-top">
+      <Setter Property="BorderThickness" Value="{DynamicResource TopNavigationViewContentGridBorderThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource TopNavigationViewContentGridCornerRadius}" />
+    </Style>
+    <Style Selector="^:placement-bottom">
+      <Setter Property="BorderThickness" Value="0,0,0,1" />
+      <Setter Property="CornerRadius" Value="0" />
+    </Style>
+
     <Style Selector="^:placement-right /template/ ToggleButton#PART_PaneButton">
       <Setter Property="DockPanel.Dock" Value="Right" />
     </Style>
@@ -210,7 +333,10 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
-    <!-- Bottom placement + compact modes: pane compact strip provides toggle, hide bottom bar -->
+    <!-- Bottom placement + non-minimal modes: the pane hosts the toggle, hide the bottom bar -->
+    <Style Selector="^:placement-bottom[DisplayMode=Inline] /template/ Border#PART_BottomBar">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
     <Style Selector="^:placement-bottom[DisplayMode=CompactOverlay] /template/ Border#PART_BottomBar">
       <Setter Property="IsVisible" Value="False" />
     </Style>
@@ -218,7 +344,7 @@
       <Setter Property="IsVisible" Value="False" />
     </Style>
 
-    <!-- Horizontal pane (Bottom/Top): compact toggle must dock Left so drawer content can fill the rest -->
+    <!-- Horizontal pane (Bottom/Top): pane toggle must dock Left so drawer content can fill the rest -->
     <Style Selector="^:placement-bottom /template/ ToggleButton#PART_CompactPaneToggle">
       <Setter Property="DockPanel.Dock" Value="Left" />
     </Style>
@@ -226,39 +352,29 @@
       <Setter Property="DockPanel.Dock" Value="Left" />
     </Style>
 
+    <!-- No toggle when the drawer cannot be toggled. -->
     <Style Selector="^[DrawerBehavior=Locked] /template/ Border#PART_TopBar">
       <Setter Property="IsVisible" Value="False" />
     </Style>
-
-    <Style Selector="^[DrawerBehavior=Disabled] /template/ Border#PART_TopBar">
+    <Style Selector="^[DrawerBehavior=Locked] /template/ ToggleButton#PART_CompactPaneToggle">
       <Setter Property="IsVisible" Value="False" />
     </Style>
-
-    <Style Selector="^:detail-is-navpage /template/ Border#PART_TopBar">
+    <Style Selector="^[DrawerBehavior=Disabled] /template/ Border#PART_TopBar">
       <Setter Property="IsVisible" Value="False" />
     </Style>
-
-    <Style Selector="^[DisplayMode=CompactOverlay] /template/ Border#PART_TopBar">
+    <Style Selector="^[DrawerBehavior=Disabled] /template/ ToggleButton#PART_CompactPaneToggle">
       <Setter Property="IsVisible" Value="False" />
     </Style>
 
-    <Style Selector="^[DisplayMode=CompactOverlay] /template/ ToggleButton#PART_CompactPaneToggle">
-      <Setter Property="IsVisible" Value="True" />
-    </Style>
-
-    <Style Selector="^[DisplayMode=CompactInline] /template/ Border#PART_TopBar">
+    <Style Selector="^:detail-is-navpage /template/ Border#PART_TopBar">
       <Setter Property="IsVisible" Value="False" />
     </Style>
 
-    <Style Selector="^[DisplayMode=CompactInline] /template/ ToggleButton#PART_CompactPaneToggle">
-      <Setter Property="IsVisible" Value="True" />
-    </Style>
-
     <Style Selector="^[IsInNavigationPage=True] /template/ Border#PART_TopBar">
       <Setter Property="IsVisible" Value="False" />
     </Style>
 
-    <!-- NavigationPage already hosts a hamburger toggle — suppress the compact pane toggle. -->
+    <!-- NavigationPage already hosts a hamburger toggle — suppress the pane toggle. -->
     <Style Selector="^:detail-is-navpage /template/ ToggleButton#PART_CompactPaneToggle">
       <Setter Property="IsVisible" Value="False" />
     </Style>
diff --git a/src/Avalonia.Themes.Fluent2/Controls/NavigationPage.xaml b/src/Avalonia.Themes.Fluent2/Controls/NavigationPage.xaml
index 2eb606d4da..2e0072aea5 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/NavigationPage.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/NavigationPage.xaml
@@ -1,5 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.ThemeDictionaries>
+    <ResourceDictionary x:Key="Default">
+      <StaticResource x:Key="NavigationBarBackground" ResourceKey="SolidBackgroundFillColorBaseAltBrush" />
+      <StaticResource x:Key="NavigationBarForeground" ResourceKey="TextFillColorPrimaryBrush" />
+    </ResourceDictionary>
+    <ResourceDictionary x:Key="Dark">
+      <StaticResource x:Key="NavigationBarBackground" ResourceKey="SolidBackgroundFillColorBaseAltBrush" />
+      <StaticResource x:Key="NavigationBarForeground" ResourceKey="TextFillColorPrimaryBrush" />
+    </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
   <Design.PreviewWith>
     <Border Width="400" Height="600">
       <NavigationPage />
@@ -10,8 +20,6 @@
 
   <StreamGeometry x:Key="NavigationPageBackIcon">M12.7347,4.20949 C13.0332,3.92233 13.508,3.93153 13.7952,4.23005 C14.0823,4.52857 14.0731,5.00335 13.7746,5.29051 L5.50039,13.25 L24.2532,13.25 C24.6674,13.25 25.0032,13.5858 25.0032,13.9999982 C25.0032,14.4142 24.6674,14.75 24.2532,14.75 L5.50137,14.75 L13.7746,22.7085 C14.0731,22.9957 14.0823,23.4705 13.7952,23.769 C13.508,24.0675 13.0332,24.0767 12.7347,23.7896 L3.30673,14.7202 C2.89776,14.3268 2.89776,13.6723 3.30673,13.2788 L12.7347,4.20949 Z</StreamGeometry>
 
-  <SolidColorBrush x:Key="NavigationBarBackground" Color="{DynamicResource SolidBackgroundFillColorBaseAlt}" />
-  <SolidColorBrush x:Key="NavigationBarForeground" Color="{DynamicResource TextFillColorPrimary}" />
 
   <ControlTheme x:Key="{x:Type NavigationPage}" TargetType="NavigationPage">
     <!-- Transparent keeps the hit-test surface active for the back-swipe gesture edge area. -->
diff --git a/src/Avalonia.Themes.Fluent2/Controls/TabbedPage.xaml b/src/Avalonia.Themes.Fluent2/Controls/TabbedPage.xaml
index 23e46f4c06..b92731dd3b 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/TabbedPage.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TabbedPage.xaml
@@ -1,5 +1,25 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.ThemeDictionaries>
+    <ResourceDictionary x:Key="Default">
+      <StaticResource x:Key="TabbedPageTabItemHeaderBackgroundUnselectedPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+      <StaticResource x:Key="TabbedPageTabItemHeaderBackgroundUnselectedPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+      <StaticResource x:Key="TabbedPageTabItemHeaderForegroundUnselected" ResourceKey="TextFillColorSecondaryBrush" />
+      <StaticResource x:Key="TabbedPageTabItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
+      <StaticResource x:Key="TabbedPageTabItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+      <StaticResource x:Key="TabbedPageTabStripBackground" ResourceKey="SolidBackgroundFillColorBaseAltBrush" />
+      <StaticResource x:Key="TabbedPageTabStripBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+    </ResourceDictionary>
+    <ResourceDictionary x:Key="Dark">
+      <StaticResource x:Key="TabbedPageTabItemHeaderBackgroundUnselectedPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+      <StaticResource x:Key="TabbedPageTabItemHeaderBackgroundUnselectedPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+      <StaticResource x:Key="TabbedPageTabItemHeaderForegroundUnselected" ResourceKey="TextFillColorSecondaryBrush" />
+      <StaticResource x:Key="TabbedPageTabItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
+      <StaticResource x:Key="TabbedPageTabItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+      <StaticResource x:Key="TabbedPageTabStripBackground" ResourceKey="SolidBackgroundFillColorBaseAltBrush" />
+      <StaticResource x:Key="TabbedPageTabStripBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+    </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
   <Design.PreviewWith>
     <Border Width="400" Height="400">
       <TabbedPage>
@@ -19,16 +39,11 @@
   <!-- Backgrounds -->
   <SolidColorBrush x:Key="TabbedPageTabItemHeaderBackgroundUnselected" Color="Transparent" />
   <SolidColorBrush x:Key="TabbedPageTabItemHeaderBackgroundSelected" Color="Transparent" />
-  <SolidColorBrush x:Key="TabbedPageTabItemHeaderBackgroundUnselectedPointerOver" Color="{DynamicResource SubtleFillColorSecondary}" />
   <SolidColorBrush x:Key="TabbedPageTabItemHeaderBackgroundSelectedPointerOver" Color="Transparent" />
-  <SolidColorBrush x:Key="TabbedPageTabItemHeaderBackgroundUnselectedPressed" Color="{DynamicResource SubtleFillColorTertiary}" />
   <SolidColorBrush x:Key="TabbedPageTabItemHeaderBackgroundSelectedPressed" Color="Transparent" />
   <SolidColorBrush x:Key="TabbedPageTabItemHeaderBackgroundDisabled" Color="Transparent" />
 
   <!-- Foregrounds (override via TabbedPageTabItemHeaderForegroundSelected / TabbedPageTabItemHeaderForegroundUnselected resources) -->
-  <SolidColorBrush x:Key="TabbedPageTabItemHeaderForegroundUnselected" Color="{DynamicResource TextFillColorSecondary}" />
-  <SolidColorBrush x:Key="TabbedPageTabItemHeaderForegroundSelected" Color="{DynamicResource TextFillColorPrimary}" />
-  <SolidColorBrush x:Key="TabbedPageTabItemHeaderForegroundDisabled" Color="{DynamicResource TextFillColorDisabled}" />
   <x:Double x:Key="TabbedPageTabItemHeaderPipeThickness">3</x:Double>
   <x:Double x:Key="TabbedPageTabItemHeaderVerticalPipeHeight">18</x:Double>
 
@@ -48,10 +63,8 @@
 
   <!-- Tab strip (bar) styling. Divider edge defaults to the top (Bottom placement);
        the other placements are corrected via TabStripPlacement styles below. -->
-  <SolidColorBrush x:Key="TabbedPageTabStripBackground" Color="{DynamicResource SolidBackgroundFillColorBaseAlt}" />
   <CornerRadius x:Key="TabbedPageTabStripCornerRadius">0</CornerRadius>
   <Thickness x:Key="TabbedPageTabStripBorderThickness">0,1,0,0</Thickness>
-  <SolidColorBrush x:Key="TabbedPageTabStripBorderBrush" Color="{DynamicResource DividerStrokeColorDefault}" />
   <Thickness x:Key="TabbedPageTabStripMargin">0</Thickness>
   <Thickness x:Key="TabbedPageTabStripPadding">0</Thickness>
 
diff --git a/tests/Avalonia.Themes.Fluent2.UnitTests/KeyParityTests.cs b/tests/Avalonia.Themes.Fluent2.UnitTests/KeyParityTests.cs
index 4b3576d121..55ee6d8c5f 100644
--- a/tests/Avalonia.Themes.Fluent2.UnitTests/KeyParityTests.cs
+++ b/tests/Avalonia.Themes.Fluent2.UnitTests/KeyParityTests.cs
@@ -112,6 +112,59 @@ public class KeyParityTests
             "Compact density keys missing in Fluent2: " + string.Join(", ", missing));
     }
 
+    [AvaloniaFact]
+    public void Window_scoped_dark_variant_resolves_same_values_as_theme_dark()
+    {
+        // Regression guard: brushes defined outside ThemeDictionaries that wrap
+        // variant-scoped colors anchor to the app variant instead of the consumer's
+        // scope. Every key must resolve identically whether dark is requested at
+        // theme level or via a window-scoped RequestedThemeVariant override.
+        var theme = new Fluent2Theme();
+        var app = Application.Current!;
+        app.Styles.Add(theme);
+        var window = new Window
+        {
+            RequestedThemeVariant = ThemeVariant.Dark,
+            Content = new ContentControl(),
+        };
+        window.Show();
+        try
+        {
+            var control = (ContentControl)window.Content!;
+            var problems = new List<string>();
+            foreach (var key in ThemeResourceWalker.CollectKeys(theme))
+            {
+                if (!((IResourceNode)theme).TryGetResource(key, ThemeVariant.Dark, out var expected))
+                    continue;
+                if (expected is not (IBrush or Color))
+                    continue;
+                control.TryFindResource(key, control.ActualThemeVariant, out var actual);
+                var expectedText = Describe(expected);
+                var actualText = Describe(actual);
+                if (expectedText != actualText)
+                    problems.Add($"{key}: theme-dark={expectedText} window-dark={actualText}");
+            }
+
+            Assert.True(problems.Count == 0,
+                $"{problems.Count} keys resolve differently under window-scoped dark:\n" +
+                string.Join("\n", problems.Take(30)));
+        }
+        finally
+        {
+            window.Close();
+            app.Styles.Remove(theme);
+        }
+    }
+
+    private static string Describe(object? value) => value switch
+    {
+        ISolidColorBrush b => $"solid:{b.Color}",
+        Color c => $"color:{c}",
+        IBrush b => $"{b.GetType().Name}:{b.GetHashCode()}",
+        null => "null",
+        _ => value.GetType().Name,
+    };
+
     private static ResourceDictionary GetCompactStyles(object theme)
     {
         // Both themes stash the keyed CompactStyles dictionary in a private field;