diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index f3f794ffd8..dfe10e2120 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -72,3 +72,9 @@ jobs:
         with:
             name: DemoApp
             path: "src/MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
+
+      - name: Upload Demo3 App
+        uses: actions/upload-artifact@v4
+        with:
+            name: Demo3App
+            path: "src/MaterialDesign3.Demo.Wpf/bin/${{ env.buildConfiguration }}"
diff --git a/.github/workflows/pr_verification.yml b/.github/workflows/pr_verification.yml
index 9b4731b22a..ce6ef63a06 100644
--- a/.github/workflows/pr_verification.yml
+++ b/.github/workflows/pr_verification.yml
@@ -29,4 +29,4 @@ jobs:
       contents: write
 
     steps:
-      - uses: fastify/github-action-merge-dependabot@v3.11.2
+      - uses: fastify/github-action-merge-dependabot@v3.12.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8aa2cc6a30..88f6b7b479 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -135,9 +135,18 @@ jobs:
           name: DemoApp
           path: demo-app
 
+      - name: Download Demo3 App Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: Demo3App
+          path: demo3-app
+
       - name: Zip Demo App
         run: zip -r DemoApp.zip demo-app/*
 
+      - name: Zip Demo3 App
+        run: zip -r Demo3App.zip demo3-app/*
+
       - name: Download Release Notes
         uses: actions/download-artifact@v8
         with:
@@ -145,8 +154,8 @@ jobs:
 
       - name: Create Release
         run: |
-          # We can't use glob pattern because of this bug https://github.com/cli/cli/issues/5099
-          gh release create v${{ inputs.milestone }} --repo '${{ github.repository }}' --draft --latest --title "${{ inputs.milestone }}" --notes-file ReleaseNotes.md (Get-Item '${{ github.workspace }}/nugets/*.nupkg') '${{ github.workspace }}/DemoApp.zip'
+            # We can't use glob pattern because of this bug https://github.com/cli/cli/issues/5099
+            gh release create v${{ inputs.milestone }} --repo '${{ github.repository }}' --draft --latest --title "${{ inputs.milestone }}" --notes-file ReleaseNotes.md (Get-Item '${{ github.workspace }}/nugets/*.nupkg') '${{ github.workspace }}/DemoApp.zip' '${{ github.workspace }}/Demo3App.zip'
 
   update_wiki:
     needs: [create_release]
diff --git a/README.md b/README.md
index 414be45741..183c544cf3 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,25 @@ Install-Package MaterialDesignThemes
   [...] >
 ```
 
+### XML Namespaces
+
+The toolkit exposes two XML namespaces for use in XAML:
+
+| Prefix | URI | Description |
+|--------|-----|-------------|
+| `materialDesign` | `http://materialdesigninxaml.net/winfx/xaml/themes` | Primary namespace for all public Material Design types, controls, and converters. |
+| `materialDesignInternal` | `http://materialdesigninxaml.net/winfx/xaml/themes-internal` | Namespace for types in internal sub-namespaces (`MaterialDesignThemes.Wpf.Internal`, `MaterialDesignThemes.Wpf.Converters.Internal`, `MaterialDesignThemes.Wpf.Behaviors.Internal`). |
+
+> [!WARNING]
+> Types exposed via the `materialDesignInternal` namespace are considered **internal implementation details** and are **not guaranteed to maintain backwards-compatibility between versions**. Use them at your own risk.
+
+To use the internal namespace in XAML:
+
+```xml
+<Window ...
+  xmlns:materialDesignInternal="http://materialdesigninxaml.net/winfx/xaml/themes-internal">
+```
+
 
 ## Building the source
 
diff --git a/src/MahMaterialDragablzMashUp/MahViewModel.cs b/src/MahMaterialDragablzMashUp/MahViewModel.cs
index 383829bd9c..b213e93da3 100644
--- a/src/MahMaterialDragablzMashUp/MahViewModel.cs
+++ b/src/MahMaterialDragablzMashUp/MahViewModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Windows.Data;
 
 namespace MahAppsDragablzDemo;
 
diff --git a/src/MainDemo.Wpf/MenusAndToolBars.xaml b/src/MainDemo.Wpf/MenusAndToolBars.xaml
index acd222f9e0..e07c19e356 100644
--- a/src/MainDemo.Wpf/MenusAndToolBars.xaml
+++ b/src/MainDemo.Wpf/MenusAndToolBars.xaml
@@ -378,6 +378,22 @@
       </ToolBarTray>
     </smtx:XamlDisplay>
 
+    <smtx:XamlDisplay Margin="0,16,0,16" UniqueKey="menus_toolbar_custom_bg">
+      <ToolBarTray>
+        <ToolBar Background="{DynamicResource MaterialDesign.Brush.Primary}"
+                 ClipToBounds="False"
+                 Style="{StaticResource MaterialDesignToolBar}">
+          <Button Content="{materialDesign:PackIcon Kind=ContentSave}" ToolTip="Save" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentCut}" ToolTip="Cut" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentCopy}" ToolTip="Copy" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentPaste}" ToolTip="Paste" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatBold}" ToolBar.OverflowMode="Always" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatItalic}" ToolBar.OverflowMode="Always" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatUnderline}" ToolBar.OverflowMode="Always" />
+        </ToolBar>
+      </ToolBarTray>
+    </smtx:XamlDisplay>
+
     <Rectangle Style="{StaticResource PageSectionSeparator}" />
     <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="Context Menus" />
 
diff --git a/src/MainDemo.Wpf/Tabs.xaml b/src/MainDemo.Wpf/Tabs.xaml
index b575c717ae..c09a30d49b 100644
--- a/src/MainDemo.Wpf/Tabs.xaml
+++ b/src/MainDemo.Wpf/Tabs.xaml
@@ -756,8 +756,9 @@
     </smtx:XamlDisplay>
 
     <Border Width="720"
-        BorderBrush="{DynamicResource MaterialDesign.Brush.Primary}"
-        BorderThickness="1">
+            Margin="0,0,0,16"
+            BorderBrush="{DynamicResource MaterialDesign.Brush.Primary}"
+            BorderThickness="1">
       <Grid>
         <Grid.RowDefinitions>
           <RowDefinition Height="auto" />
@@ -837,5 +838,266 @@
       </Grid>
     </Border>
 
+    <Border Width="720"
+            Margin="0,0,0,16"
+            BorderBrush="{DynamicResource MaterialDesign.Brush.Primary}"
+            BorderThickness="1">      
+      <Grid>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="*" MinWidth="50" />
+          <ColumnDefinition Width="2" />
+          <ColumnDefinition Width="*" MinWidth="50" />
+        </Grid.ColumnDefinitions>
+
+        <materialDesign:ColorZone Grid.ColumnSpan="2"
+                                  Padding="8"
+                                  Mode="PrimaryMid">
+          <TextBlock Text="materialDesign:TabAssist.UseNavigationPanel=&quot;True&quot;" />
+        </materialDesign:ColorZone>
+
+        <materialDesign:ColorZone Grid.Column="2"
+                                  Padding="8"
+                                  Mode="PrimaryMid">
+          <TextBlock Text="materialDesign:TabAssist.HeaderPanelCustomContent=&quot;...&quot;" />
+        </materialDesign:ColorZone>
+
+        <smtx:XamlDisplay Grid.Row="1"
+                          Grid.Column="0"
+                          Margin="16"
+                          UniqueKey="tabs_tabAssist_3">
+          <TabControl materialDesign:TabAssist.HeaderBehavior="Scrolling"
+                      materialDesign:TabAssist.UseNavigationPanel="True"
+                      ItemsSource="{Binding LongList}"
+                      Style="{StaticResource MaterialDesignTabControl}">
+            <TabControl.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="{Binding ., StringFormat=Header {0}}" />
+                </StackPanel>
+              </DataTemplate>
+            </TabControl.ItemTemplate>
+            <TabControl.ContentTemplate>
+              <DataTemplate>
+                <TextBlock Margin="10"
+                           FontSize="18"
+                           Text="{Binding ., StringFormat=Content {0}}" />
+              </DataTemplate>
+            </TabControl.ContentTemplate>
+          </TabControl>
+        </smtx:XamlDisplay>
+
+        <GridSplitter Grid.RowSpan="2"
+                      Grid.Column="1"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch" />
+
+        <smtx:XamlDisplay Grid.Row="1"
+                          Grid.Column="2"
+                          Margin="16"
+                          UniqueKey="tabs_tabAssist_4">
+          <TabControl materialDesign:TabAssist.HeaderBehavior="Scrolling"
+                      ItemsSource="{Binding LongList}"
+                      Style="{StaticResource MaterialDesignTabControl}">
+            <materialDesign:TabAssist.HeaderPanelCustomContent>
+              <Button Content="{materialDesign:PackIcon Kind=Plus}" Margin="8,0,0,0" />
+            </materialDesign:TabAssist.HeaderPanelCustomContent>
+            <TabControl.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="{Binding ., StringFormat=Header {0}}" />
+                </StackPanel>
+              </DataTemplate>
+            </TabControl.ItemTemplate>
+            <TabControl.ContentTemplate>
+              <DataTemplate>
+                <TextBlock Margin="10"
+                           FontSize="18"
+                           Text="{Binding ., StringFormat=Content {0}}" />
+              </DataTemplate>
+            </TabControl.ContentTemplate>
+          </TabControl>
+        </smtx:XamlDisplay>
+
+      </Grid>
+    </Border>
+
+    <Border Width="720"
+            Margin="0,0,0,16"
+            BorderBrush="{DynamicResource MaterialDesign.Brush.Primary}"
+            BorderThickness="1">
+      <Grid>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="*" MinWidth="50" />
+          <ColumnDefinition Width="2" />
+          <ColumnDefinition Width="*" MinWidth="50" />
+        </Grid.ColumnDefinitions>
+
+        <materialDesign:ColorZone Grid.ColumnSpan="2"
+                                  Padding="8"
+                                  Mode="PrimaryMid">
+          <TextBlock Text="materialDesign:TabAssist.NavigationPanelPlacement=&quot;Left&quot;" />
+        </materialDesign:ColorZone>
+
+        <materialDesign:ColorZone Grid.Column="2"
+                                  Padding="8"
+                                  Mode="PrimaryMid">
+          <TextBlock Text="materialDesign:TabAssist.NavigationPanelPlacement=&quot;Right&quot;" />
+        </materialDesign:ColorZone>
+
+        <smtx:XamlDisplay Grid.Row="1"
+                          Grid.Column="0"
+                          Margin="16"
+                          UniqueKey="tabs_tabAssist_5">
+          <TabControl materialDesign:TabAssist.HeaderBehavior="Scrolling"
+                      materialDesign:TabAssist.UseNavigationPanel="True"
+                      materialDesign:TabAssist.NavigationPanelPlacement="Left"
+                      ItemsSource="{Binding LongList}"
+                      Style="{StaticResource MaterialDesignTabControl}">
+            <TabControl.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="{Binding ., StringFormat=Header {0}}" />
+                </StackPanel>
+              </DataTemplate>
+            </TabControl.ItemTemplate>
+            <TabControl.ContentTemplate>
+              <DataTemplate>
+                <TextBlock Margin="10"
+                           FontSize="18"
+                           Text="{Binding ., StringFormat=Content {0}}" />
+              </DataTemplate>
+            </TabControl.ContentTemplate>
+          </TabControl>
+        </smtx:XamlDisplay>
+
+        <GridSplitter Grid.RowSpan="2"
+                      Grid.Column="1"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch" />
+
+        <smtx:XamlDisplay Grid.Row="1"
+                      Grid.Column="2"
+                      Margin="16"
+                      UniqueKey="tabs_tabAssist_6">
+          <TabControl materialDesign:TabAssist.HeaderBehavior="Scrolling"
+                      materialDesign:TabAssist.UseNavigationPanel="True"
+                      materialDesign:TabAssist.NavigationPanelPlacement="Right"
+                      ItemsSource="{Binding LongList}"
+                      Style="{StaticResource MaterialDesignTabControl}">
+            <TabControl.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="{Binding ., StringFormat=Header {0}}" />
+                </StackPanel>
+              </DataTemplate>
+            </TabControl.ItemTemplate>
+            <TabControl.ContentTemplate>
+              <DataTemplate>
+                <TextBlock Margin="10"
+                           FontSize="18"
+                           Text="{Binding ., StringFormat=Content {0}}" />
+              </DataTemplate>
+            </TabControl.ContentTemplate>
+          </TabControl>
+        </smtx:XamlDisplay>
+
+      </Grid>
+    </Border>
+
+
+    <Border Width="720"
+            Margin="0,0,0,16"
+            BorderBrush="{DynamicResource MaterialDesign.Brush.Primary}"
+            BorderThickness="1">
+      <Grid>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="*" MinWidth="50" />
+          <ColumnDefinition Width="2" />
+          <ColumnDefinition Width="*" MinWidth="50" />
+        </Grid.ColumnDefinitions>
+
+        <materialDesign:ColorZone Grid.ColumnSpan="2"
+                                  Padding="8"
+                                  Mode="PrimaryMid">
+          <TextBlock Text="materialDesign:TabAssist.NavigationPanelBehavior=&quot;Scroll&quot;" />
+        </materialDesign:ColorZone>
+
+        <materialDesign:ColorZone Grid.Column="2"
+                                  Padding="8"
+                                  Mode="PrimaryMid">
+          <TextBlock Text="materialDesign:TabAssist.NavigationPanelBehavior=&quot;Select&quot;" />
+        </materialDesign:ColorZone>
+
+        <smtx:XamlDisplay Grid.Row="1"
+                          Grid.Column="0"
+                          Margin="16"
+                          UniqueKey="tabs_tabAssist_7">
+          <TabControl materialDesign:TabAssist.HeaderBehavior="Scrolling"
+                      materialDesign:TabAssist.UseNavigationPanel="True"
+                      materialDesign:TabAssist.NavigationPanelBehavior="Scroll"
+                      ItemsSource="{Binding LongList}"
+                      Style="{StaticResource MaterialDesignTabControl}">
+            <TabControl.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="{Binding ., StringFormat=Header {0}}" />
+                </StackPanel>
+              </DataTemplate>
+            </TabControl.ItemTemplate>
+            <TabControl.ContentTemplate>
+              <DataTemplate>
+                <TextBlock Margin="10"
+                           FontSize="18"
+                           Text="{Binding ., StringFormat=Content {0}}" />
+              </DataTemplate>
+            </TabControl.ContentTemplate>
+          </TabControl>
+        </smtx:XamlDisplay>
+
+        <GridSplitter Grid.RowSpan="2"
+                      Grid.Column="1"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch" />
+
+        <smtx:XamlDisplay Grid.Row="1"
+                      Grid.Column="2"
+                      Margin="16"
+                      UniqueKey="tabs_tabAssist_8">
+          <TabControl materialDesign:TabAssist.HeaderBehavior="Scrolling"
+                      materialDesign:TabAssist.UseNavigationPanel="True"
+                      materialDesign:TabAssist.NavigationPanelBehavior="Select"
+                      ItemsSource="{Binding LongList}"
+                      Style="{StaticResource MaterialDesignTabControl}">
+            <TabControl.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="{Binding ., StringFormat=Header {0}}" />
+                </StackPanel>
+              </DataTemplate>
+            </TabControl.ItemTemplate>
+            <TabControl.ContentTemplate>
+              <DataTemplate>
+                <TextBlock Margin="10"
+                           FontSize="18"
+                           Text="{Binding ., StringFormat=Content {0}}" />
+              </DataTemplate>
+            </TabControl.ContentTemplate>
+          </TabControl>
+        </smtx:XamlDisplay>
+
+      </Grid>
+    </Border>    
   </StackPanel>
 </UserControl>
diff --git a/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorGridTile.cs b/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorGridTile.cs
new file mode 100644
index 0000000000..f6df0a7ef8
--- /dev/null
+++ b/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorGridTile.cs
@@ -0,0 +1,28 @@
+using System.Windows.Media;
+
+namespace MaterialDesign3Demo.Domain;
+
+public sealed class DynamicColorGridTile
+{
+    public DynamicColorGridTile(string label, string colorHex, Brush backgroundBrush, Brush foregroundBrush, int column, int columnSpan)
+    {
+        Label = label;
+        ColorHex = colorHex;
+        BackgroundBrush = backgroundBrush;
+        ForegroundBrush = foregroundBrush;
+        Column = column;
+        ColumnSpan = columnSpan;
+    }
+
+    public string Label { get; }
+
+    public string ColorHex { get; }
+
+    public Brush BackgroundBrush { get; }
+
+    public Brush ForegroundBrush { get; }
+
+    public int Column { get; }
+
+    public int ColumnSpan { get; }
+}
diff --git a/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorSourceMode.cs b/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorSourceMode.cs
new file mode 100644
index 0000000000..e7c64080a5
--- /dev/null
+++ b/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorSourceMode.cs
@@ -0,0 +1,7 @@
+namespace MaterialDesign3Demo.Domain;
+
+public enum DynamicColorSourceMode
+{
+    Auto,
+    Custom
+}
diff --git a/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorThemeMode.cs b/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorThemeMode.cs
new file mode 100644
index 0000000000..b8105de5da
--- /dev/null
+++ b/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorThemeMode.cs
@@ -0,0 +1,8 @@
+namespace MaterialDesign3Demo.Domain;
+
+public enum DynamicColorThemeMode
+{
+    System,
+    Light,
+    Dark
+}
diff --git a/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorToolViewModel.cs b/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorToolViewModel.cs
new file mode 100644
index 0000000000..fc00289e7a
--- /dev/null
+++ b/src/MaterialDesign3.Demo.Wpf/Domain/DynamicColorToolViewModel.cs
@@ -0,0 +1,681 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+using MaterialColorUtilities;
+using MaterialDesignDemo.Shared.Domain;
+using MaterialDesignThemes.Wpf;
+
+namespace MaterialDesign3Demo.Domain;
+
+public class DynamicColorToolViewModel : ViewModelBase
+{
+    private readonly MaterialDynamicColors _materialDynamicColors = new();
+    private readonly PaletteHelper _paletteHelper = new();
+
+    public DynamicColorToolViewModel()
+    {
+        CopyColorCommand = new AnotherCommandImplementation(CopyColorToClipboard, CanCopyColorToClipboard);
+
+        if (_paletteHelper.GetThemeManager() is { } themeManager)
+        {
+            themeManager.ThemeChanged += (_, _) =>
+            {
+                if (SelectedThemeMode == DynamicColorThemeMode.System)
+                {
+                    UpdateComputedState();
+                }
+            };
+        }
+
+        UpdateComputedState();
+    }
+
+    public ICommand CopyColorCommand { get; }
+
+    public IReadOnlyList<EnumOption<DynamicColorSourceMode>> SourceModes { get; } =
+    [
+        new(DynamicColorSourceMode.Auto, "Auto"),
+        new(DynamicColorSourceMode.Custom, "Custom")
+    ];
+
+    public IReadOnlyList<EnumOption<DynamicColorThemeMode>> ThemeModeOptions { get; } =
+    [
+        new(DynamicColorThemeMode.System, "System Theme"),
+        new(DynamicColorThemeMode.Light, "Light"),
+        new(DynamicColorThemeMode.Dark, "Dark")
+    ];
+
+    public IReadOnlyList<EnumOption<Variant>> VariantOptions { get; } =
+    [
+        new(Variant.Monochrome, "Monochrome"),
+        new(Variant.Neutral, "Neutral"),
+        new(Variant.TonalSpot, "Tonal Spot"),
+        new(Variant.Vibrant, "Vibrant"),
+        new(Variant.Expressive, "Expressive"),
+        new(Variant.Fidelity, "Fidelity"),
+        new(Variant.Content, "Content"),
+        new(Variant.Rainbow, "Rainbow"),
+        new(Variant.FruitSalad, "Fruit Salad")
+    ];
+
+    public IReadOnlyList<EnumOption<SpecVersion>> SpecVersionOptions { get; } =
+    [
+        new(SpecVersion.Spec2021, "Spec 2021"),
+        new(SpecVersion.Spec2025, "Spec 2025")
+    ];
+
+    public IReadOnlyList<EnumOption<Platform>> PlatformOptions { get; } =
+    [
+        new(Platform.Phone, "Phone"),
+        new(Platform.Watch, "Watch")
+    ];
+
+    public Color PrimaryColor
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                OnPropertyChanged(nameof(PrimaryBrush));
+                OnPropertyChanged(nameof(PrimaryForegroundBrush));
+                OnPropertyChanged(nameof(PrimaryColorHex));
+                OnPropertyChanged(nameof(PrimaryOverrideColor));
+                UpdateComputedState();
+            }
+        }
+    } = Color.FromRgb(0x67, 0x50, 0xA4);
+
+    public DynamicColorSourceMode PrimarySourceMode
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                OnPropertyChanged(nameof(IsPrimaryCustomColorEnabled));
+                OnPropertyChanged(nameof(PrimaryOverrideColor));
+                OnPropertyChanged(nameof(PrimarySourceDescription));
+                UpdateComputedState();
+            }
+        }
+    }
+
+    public Color SecondaryColor
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                OnPropertyChanged(nameof(SecondaryBrush));
+                OnPropertyChanged(nameof(SecondaryForegroundBrush));
+                OnPropertyChanged(nameof(SecondaryColorHex));
+                OnPropertyChanged(nameof(SecondaryOverrideColor));
+                UpdateComputedState();
+            }
+        }
+    } = Color.FromRgb(0x62, 0x5B, 0x71);
+
+    public DynamicColorSourceMode SecondarySourceMode
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                OnPropertyChanged(nameof(IsSecondaryCustomColorEnabled));
+                OnPropertyChanged(nameof(SecondaryOverrideColor));
+                OnPropertyChanged(nameof(SecondarySourceDescription));
+                UpdateComputedState();
+            }
+        }
+    }
+
+    public Color TertiaryColor
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                OnPropertyChanged(nameof(TertiaryBrush));
+                OnPropertyChanged(nameof(TertiaryForegroundBrush));
+                OnPropertyChanged(nameof(TertiaryColorHex));
+                OnPropertyChanged(nameof(TertiaryOverrideColor));
+                UpdateComputedState();
+            }
+        }
+    } = Color.FromRgb(0x7D, 0x52, 0x60);
+
+    public DynamicColorSourceMode TertiarySourceMode
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                OnPropertyChanged(nameof(IsTertiaryCustomColorEnabled));
+                OnPropertyChanged(nameof(TertiaryOverrideColor));
+                OnPropertyChanged(nameof(TertiarySourceDescription));
+                UpdateComputedState();
+            }
+        }
+    }
+
+    public DynamicColorThemeMode SelectedThemeMode
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                UpdateComputedState();
+            }
+        }
+    } = DynamicColorThemeMode.System;
+
+    public Variant SelectedVariant
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                UpdateComputedState();
+            }
+        }
+    } = Variant.Neutral;
+
+    public SpecVersion SelectedSpecVersion
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                UpdateComputedState();
+            }
+        }
+    } = SpecVersion.Spec2025;
+
+    public Platform SelectedPlatform
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                UpdateComputedState();
+            }
+        }
+    } = Platform.Phone;
+
+    public double ContrastLevel
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, ClampContrastLevel(value)))
+            {
+                OnPropertyChanged(nameof(ContrastLevelText));
+                UpdateComputedState();
+            }
+        }
+    } = 0.5;
+
+    public string ContrastLevelText => $"{ContrastLevel:P0} ({ContrastLevel:0.00})";
+
+    public Color CustomPaletteColor
+    {
+        get;
+        set
+        {
+            if (SetProperty(ref field, value))
+            {
+                OnPropertyChanged(nameof(CustomPaletteBrush));
+                OnPropertyChanged(nameof(CustomPaletteForegroundBrush));
+                OnPropertyChanged(nameof(CustomPaletteColorHex));
+                UpdateComputedState();
+            }
+        }
+    } = Color.FromRgb(0xA3, 0x17, 0x1A);
+
+    public DynamicColorGridTile? Primary { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Secondary { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Tertiary { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Error { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnPrimary { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnSecondary { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnTertiary { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnError { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? PrimaryContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SecondaryContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? TertiaryContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? ErrorContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnPrimaryContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnSecondaryContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnTertiaryContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnErrorContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? PrimaryFixed { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? PrimaryFixedDim { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SecondaryFixed { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SecondaryFixedDim { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? TertiaryFixed { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? TertiaryFixedDim { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? InverseSurface { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnPrimaryFixed { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnSecondaryFixed { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnTertiaryFixed { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? InverseOnSurface { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnPrimaryFixedVariant { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnSecondaryFixedVariant { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnTertiaryFixedVariant { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? InversePrimary { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SurfaceDim { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Surface { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SurfaceBright { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SurfaceContainerLowest { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SurfaceContainerLow { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SurfaceContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SurfaceContainerHigh { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SurfaceContainerHighest { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnSurface { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnSurfaceVariant { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Outline { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OutlineVariant { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Scrim { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Shadow { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? WarningHigh { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? WarningLow { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Information { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? Safe { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnWarningHigh { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnWarningLow { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnInformation { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnSafe { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? WarningHighContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? WarningLowContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? InformationContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? SafeContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnWarningHighContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnWarningLowContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnInformationContainer { get; private set => SetProperty(ref field, value); }
+
+    public DynamicColorGridTile? OnSafeContainer { get; private set => SetProperty(ref field, value); }
+
+    public IReadOnlyList<DynamicColorGridTile> CustomTonalPaletteTiles
+    {
+        get;
+        private set => SetProperty(ref field, value);
+    } = [];
+
+    public IReadOnlyList<DynamicColorGridTile> CustomSemanticColorTiles
+    {
+        get;
+        private set => SetProperty(ref field, value);
+    } = [];
+
+    public Brush PrimaryBrush => CreateBrush(PrimaryColor);
+
+    public Brush PrimaryForegroundBrush => CreateBrush(GetContrastingColor(PrimaryColor));
+
+    public string PrimaryColorHex => PrimaryColor.ToString();
+
+    public bool IsPrimaryCustomColorEnabled => PrimarySourceMode == DynamicColorSourceMode.Custom;
+
+    public Color? PrimaryOverrideColor => IsPrimaryCustomColorEnabled ? PrimaryColor : null;
+
+    public string PrimarySourceDescription => IsPrimaryCustomColorEnabled
+        ? "This color is used as the seed and as an explicit primary override."
+        : "This color is used as the seed while primary stays scheme-generated.";
+
+    public Brush SecondaryBrush => CreateBrush(SecondaryColor);
+
+    public Brush SecondaryForegroundBrush => CreateBrush(GetContrastingColor(SecondaryColor));
+
+    public string SecondaryColorHex => SecondaryColor.ToString();
+
+    public bool IsSecondaryCustomColorEnabled => SecondarySourceMode == DynamicColorSourceMode.Custom;
+
+    public Color? SecondaryOverrideColor => IsSecondaryCustomColorEnabled ? SecondaryColor : null;
+
+    public string SecondarySourceDescription => IsSecondaryCustomColorEnabled
+        ? "Custom color override is enabled for the secondary palette."
+        : "Secondary stays scheme-generated until you switch this card to Custom.";
+
+    public Brush TertiaryBrush => CreateBrush(TertiaryColor);
+
+    public Brush TertiaryForegroundBrush => CreateBrush(GetContrastingColor(TertiaryColor));
+
+    public string TertiaryColorHex => TertiaryColor.ToString();
+
+    public bool IsTertiaryCustomColorEnabled => TertiarySourceMode == DynamicColorSourceMode.Custom;
+
+    public Color? TertiaryOverrideColor => IsTertiaryCustomColorEnabled ? TertiaryColor : null;
+
+    public string TertiarySourceDescription => IsTertiaryCustomColorEnabled
+        ? "Custom color override is enabled for the tertiary palette."
+        : "Tertiary stays scheme-generated until you switch this card to Custom.";
+
+    public Brush CustomPaletteBrush => CreateBrush(CustomPaletteColor);
+
+    public Brush CustomPaletteForegroundBrush => CreateBrush(GetContrastingColor(CustomPaletteColor));
+
+    public string CustomPaletteColorHex => CustomPaletteColor.ToString();
+
+    private void UpdateComputedState()
+    {
+        DynamicScheme scheme = CreateDynamicScheme();
+        UpdateGeneratedColorTiles(scheme);
+        UpdateCustomColorState(scheme);
+    }
+
+    private void UpdateGeneratedColorTiles(DynamicScheme scheme)
+    {
+        Primary = CreateTile("Primary", _materialDynamicColors.Primary, _materialDynamicColors.OnPrimary, scheme, 0, 2);
+        Secondary = CreateTile("Secondary", _materialDynamicColors.Secondary, _materialDynamicColors.OnSecondary, scheme, 2, 2);
+        Tertiary = CreateTile("Tertiary", _materialDynamicColors.Tertiary, _materialDynamicColors.OnTertiary, scheme, 4, 2);
+        Error = CreateTile("Error", _materialDynamicColors.Error, _materialDynamicColors.OnError, scheme, 6, 2);
+
+        OnPrimary = CreateTile("On Primary", _materialDynamicColors.OnPrimary, _materialDynamicColors.Primary, scheme, 0, 2);
+        OnSecondary = CreateTile("On Secondary", _materialDynamicColors.OnSecondary, _materialDynamicColors.Secondary, scheme, 2, 2);
+        OnTertiary = CreateTile("On Tertiary", _materialDynamicColors.OnTertiary, _materialDynamicColors.Tertiary, scheme, 4, 2);
+        OnError = CreateTile("On Error", _materialDynamicColors.OnError, _materialDynamicColors.Error, scheme, 6, 2);
+
+        PrimaryContainer = CreateTile("Primary Container", _materialDynamicColors.PrimaryContainer, _materialDynamicColors.OnPrimaryContainer, scheme, 0, 2);
+        SecondaryContainer = CreateTile("Secondary Container", _materialDynamicColors.SecondaryContainer, _materialDynamicColors.OnSecondaryContainer, scheme, 2, 2);
+        TertiaryContainer = CreateTile("Tertiary Container", _materialDynamicColors.TertiaryContainer, _materialDynamicColors.OnTertiaryContainer, scheme, 4, 2);
+        ErrorContainer = CreateTile("Error Container", _materialDynamicColors.ErrorContainer, _materialDynamicColors.OnErrorContainer, scheme, 6, 2);
+
+        OnPrimaryContainer = CreateTile("On Primary Container", _materialDynamicColors.OnPrimaryContainer, _materialDynamicColors.PrimaryContainer, scheme, 0, 2);
+        OnSecondaryContainer = CreateTile("On Secondary Container", _materialDynamicColors.OnSecondaryContainer, _materialDynamicColors.SecondaryContainer, scheme, 2, 2);
+        OnTertiaryContainer = CreateTile("On Tertiary Container", _materialDynamicColors.OnTertiaryContainer, _materialDynamicColors.TertiaryContainer, scheme, 4, 2);
+        OnErrorContainer = CreateTile("On Error Container", _materialDynamicColors.OnErrorContainer, _materialDynamicColors.ErrorContainer, scheme, 6, 2);
+
+        PrimaryFixed = CreateTile("Primary Fixed", _materialDynamicColors.PrimaryFixed, _materialDynamicColors.OnPrimaryFixed, scheme, 0, 1);
+        PrimaryFixedDim = CreateTile("Primary Fixed Dim", _materialDynamicColors.PrimaryFixedDim, _materialDynamicColors.OnPrimaryFixed, scheme, 1, 1);
+        SecondaryFixed = CreateTile("Secondary Fixed", _materialDynamicColors.SecondaryFixed, _materialDynamicColors.OnSecondaryFixed, scheme, 2, 1);
+        SecondaryFixedDim = CreateTile("Secondary Fixed Dim", _materialDynamicColors.SecondaryFixedDim, _materialDynamicColors.OnSecondaryFixed, scheme, 3, 1);
+        TertiaryFixed = CreateTile("Tertiary Fixed", _materialDynamicColors.TertiaryFixed, _materialDynamicColors.OnTertiaryFixed, scheme, 4, 1);
+        TertiaryFixedDim = CreateTile("Tertiary Fixed Dim", _materialDynamicColors.TertiaryFixedDim, _materialDynamicColors.OnTertiaryFixed, scheme, 5, 1);
+        InverseSurface = CreateTile("Inverse Surface", _materialDynamicColors.InverseSurface, _materialDynamicColors.InverseOnSurface, scheme, 6, 2);
+
+        OnPrimaryFixed = CreateTile("On Primary Fixed", _materialDynamicColors.OnPrimaryFixed, _materialDynamicColors.PrimaryFixed, scheme, 0, 2);
+        OnSecondaryFixed = CreateTile("On Secondary Fixed", _materialDynamicColors.OnSecondaryFixed, _materialDynamicColors.SecondaryFixed, scheme, 2, 2);
+        OnTertiaryFixed = CreateTile("On Tertiary Fixed", _materialDynamicColors.OnTertiaryFixed, _materialDynamicColors.TertiaryFixed, scheme, 4, 2);
+        InverseOnSurface = CreateTile("Inverse On Surface", _materialDynamicColors.InverseOnSurface, _materialDynamicColors.InverseSurface, scheme, 6, 2);
+
+        OnPrimaryFixedVariant = CreateTile("On Primary Fixed Variant", _materialDynamicColors.OnPrimaryFixedVariant, _materialDynamicColors.PrimaryFixed, scheme, 0, 2);
+        OnSecondaryFixedVariant = CreateTile("On Secondary Fixed Variant", _materialDynamicColors.OnSecondaryFixedVariant, _materialDynamicColors.SecondaryFixed, scheme, 2, 2);
+        OnTertiaryFixedVariant = CreateTile("On Tertiary Fixed Variant", _materialDynamicColors.OnTertiaryFixedVariant, _materialDynamicColors.TertiaryFixed, scheme, 4, 2);
+        InversePrimary = CreateTile("Inverse Primary", _materialDynamicColors.InversePrimary, _materialDynamicColors.InverseSurface, scheme, 6, 2);
+
+        SurfaceDim = CreateTile("Surface Dim", _materialDynamicColors.SurfaceDim, _materialDynamicColors.OnSurface, scheme, 0, 2);
+        Surface = CreateTile("Surface", _materialDynamicColors.Surface, _materialDynamicColors.OnSurface, scheme, 2, 2);
+        SurfaceBright = CreateTile("Surface Bright", _materialDynamicColors.SurfaceBright, _materialDynamicColors.OnSurface, scheme, 4, 2);
+
+        SurfaceContainerLowest = CreateTile("Surface Container Lowest", _materialDynamicColors.SurfaceContainerLowest, _materialDynamicColors.OnSurface, scheme, 0, 1);
+        SurfaceContainerLow = CreateTile("Surface Container Low", _materialDynamicColors.SurfaceContainerLow, _materialDynamicColors.OnSurface, scheme, 1, 1);
+        SurfaceContainer = CreateTile("Surface Container", _materialDynamicColors.SurfaceContainer, _materialDynamicColors.OnSurface, scheme, 2, 1);
+        SurfaceContainerHigh = CreateTile("Surface Container High", _materialDynamicColors.SurfaceContainerHigh, _materialDynamicColors.OnSurface, scheme, 3, 1);
+        SurfaceContainerHighest = CreateTile("Surface Container Highest", _materialDynamicColors.SurfaceContainerHighest, _materialDynamicColors.OnSurface, scheme, 4, 1);
+
+        OnSurface = CreateTile("On Surface", _materialDynamicColors.OnSurface, _materialDynamicColors.Surface, scheme, 0, 1);
+        OnSurfaceVariant = CreateTile("On Surface Variant", _materialDynamicColors.OnSurfaceVariant, _materialDynamicColors.SurfaceVariant, scheme, 1, 1);
+        Outline = CreateTile("Outline", _materialDynamicColors.Outline, _materialDynamicColors.Surface, scheme, 2, 1);
+        OutlineVariant = CreateTile("Outline Variant", _materialDynamicColors.OutlineVariant, _materialDynamicColors.Surface, scheme, 3, 1);
+        Scrim = CreateTile("Scrim", _materialDynamicColors.Scrim, _materialDynamicColors.Surface, scheme, 4, 1);
+        Shadow = CreateTile("Shadow", _materialDynamicColors.Shadow, _materialDynamicColors.Surface, scheme, 5, 1);
+
+        WarningHigh = CreateTile("Warning High", _materialDynamicColors.WarningHigh, _materialDynamicColors.OnWarningHigh, scheme, 0, 2);
+        WarningLow = CreateTile("Warning Low", _materialDynamicColors.WarningLow, _materialDynamicColors.OnWarningLow, scheme, 2, 2);
+        Information = CreateTile("Information", _materialDynamicColors.Information, _materialDynamicColors.OnInformation, scheme, 4, 2);
+        Safe = CreateTile("Safe", _materialDynamicColors.Safe, _materialDynamicColors.OnSafe, scheme, 6, 2);
+
+        OnWarningHigh = CreateTile("On Warning High", _materialDynamicColors.OnWarningHigh, _materialDynamicColors.WarningHigh, scheme, 0, 2);
+        OnWarningLow = CreateTile("On Warning Low", _materialDynamicColors.OnWarningLow, _materialDynamicColors.WarningLow, scheme, 2, 2);
+        OnInformation = CreateTile("On Information", _materialDynamicColors.OnInformation, _materialDynamicColors.Information, scheme, 4, 2);
+        OnSafe = CreateTile("On Safe", _materialDynamicColors.OnSafe, _materialDynamicColors.Safe, scheme, 6, 2);
+
+        WarningHighContainer = CreateTile("Warning High Container", _materialDynamicColors.WarningHighContainer, _materialDynamicColors.OnWarningHighContainer, scheme, 0, 2);
+        WarningLowContainer = CreateTile("Warning Low Container", _materialDynamicColors.WarningLowContainer, _materialDynamicColors.OnWarningLowContainer, scheme, 2, 2);
+        InformationContainer = CreateTile("Information Container", _materialDynamicColors.InformationContainer, _materialDynamicColors.OnInformationContainer, scheme, 4, 2);
+        SafeContainer = CreateTile("Safe Container", _materialDynamicColors.SafeContainer, _materialDynamicColors.OnSafeContainer, scheme, 6, 2);
+
+        OnWarningHighContainer = CreateTile("On Warning High Container", _materialDynamicColors.OnWarningHighContainer, _materialDynamicColors.WarningHighContainer, scheme, 0, 2);
+        OnWarningLowContainer = CreateTile("On Warning Low Container", _materialDynamicColors.OnWarningLowContainer, _materialDynamicColors.WarningLowContainer, scheme, 2, 2);
+        OnInformationContainer = CreateTile("On Information Container", _materialDynamicColors.OnInformationContainer, _materialDynamicColors.InformationContainer, scheme, 4, 2);
+        OnSafeContainer = CreateTile("On Safe Container", _materialDynamicColors.OnSafeContainer, _materialDynamicColors.SafeContainer, scheme, 6, 2);
+    }
+
+    private DynamicScheme CreateDynamicScheme()
+    {
+        return DynamicSchemeFactory.Create(
+            PrimaryColor,
+            SelectedVariant,
+            ResolveIsDarkMode(),
+            ContrastLevel,
+            SelectedPlatform,
+            SelectedSpecVersion,
+            PrimaryOverrideColor,
+            SecondaryOverrideColor,
+            TertiaryOverrideColor,
+            null,
+            null,
+            null);
+    }
+
+    private bool ResolveIsDarkMode()
+    {
+        return SelectedThemeMode switch
+        {
+            DynamicColorThemeMode.Light => false,
+            DynamicColorThemeMode.Dark => true,
+            _ => _paletteHelper.GetTheme().GetBaseTheme() == BaseTheme.Dark
+        };
+    }
+
+    private DynamicColorGridTile CreateTile(
+        string label,
+        DynamicColor backgroundColor,
+        DynamicColor foregroundColor,
+        DynamicScheme scheme,
+        int column,
+        int columnSpan)
+    {
+        Color background = backgroundColor.GetColor(scheme);
+        Color foreground = foregroundColor.GetColor(scheme);
+
+        return new DynamicColorGridTile(
+            label,
+            background.ToString(),
+            CreateBrush(background),
+            CreateBrush(foreground),
+            column,
+            columnSpan);
+    }
+
+    private DynamicColorGridTile CreateTile(
+        string label,
+        Color background,
+        Color foreground,
+        int column,
+        int columnSpan)
+    {
+        return new DynamicColorGridTile(
+            label,
+            background.ToString(),
+            CreateBrush(background),
+            CreateBrush(foreground),
+            column,
+            columnSpan);
+    }
+
+    private static Brush CreateBrush(Color color)
+    {
+        var brush = new SolidColorBrush(color);
+        brush.Freeze();
+
+        return brush;
+    }
+
+    private static double ClampContrastLevel(double value)
+    {
+        if (value < 0)
+        {
+            return 0;
+        }
+
+        if (value > 1)
+        {
+            return 1;
+        }
+
+        return value;
+    }
+
+    private static Color GetContrastingColor(Color color)
+    {
+        double normalizedRed = color.R / 255d;
+        double normalizedGreen = color.G / 255d;
+        double normalizedBlue = color.B / 255d;
+
+        double luminance = (0.2126d * normalizedRed) + (0.7152d * normalizedGreen) + (0.0722d * normalizedBlue);
+
+        return luminance >= 0.5d ? Colors.Black : Colors.White;
+    }
+
+    private void UpdateCustomColorState(DynamicScheme baseScheme)
+    {
+        TonalPalette tonalPalette = TonalPalette.FromInt(ColorUtils.ArgbFromColor(CustomPaletteColor));
+
+        List<DynamicColorGridTile> tonalTiles = [];
+        for (int tone = 0; tone <= 100; tone += 5)
+        {
+            tonalTiles.Add(CreateToneTile(tonalPalette, tone));
+        }
+
+        CustomTonalPaletteTiles = tonalTiles;
+
+        DynamicScheme customSemanticScheme = CreateCustomSemanticScheme(baseScheme, tonalPalette);
+
+        Color paletteKey = _materialDynamicColors.ErrorPaletteKeyColor.GetColor(customSemanticScheme);
+        Color role = _materialDynamicColors.Error.GetColor(customSemanticScheme);
+        Color onRole = _materialDynamicColors.OnError.GetColor(customSemanticScheme);
+        Color container = _materialDynamicColors.ErrorContainer.GetColor(customSemanticScheme);
+        Color onContainer = _materialDynamicColors.OnErrorContainer.GetColor(customSemanticScheme);
+
+        CustomSemanticColorTiles =
+        [
+            CreateTile("Palette Key", paletteKey, GetContrastingColor(paletteKey), 0, 1),
+            CreateTile("Role", role, onRole, 0, 1),
+            CreateTile("On Role", onRole, role, 0, 1),
+            CreateTile("Container", container, onContainer, 0, 1),
+            CreateTile("On Container", onContainer, container, 0, 1)
+        ];
+    }
+
+    private DynamicColorGridTile CreateToneTile(TonalPalette tonalPalette, int tone)
+    {
+        Color background = ColorUtils.ColorFromArgb(tonalPalette.Tone(tone));
+        Color foreground = tone <= 40
+            ? ColorUtils.ColorFromArgb(tonalPalette.Tone(100))
+            : ColorUtils.ColorFromArgb(tonalPalette.Tone(0));
+
+        return CreateTile($"Tone {tone}", background, foreground, 0, 1);
+    }
+
+    private DynamicScheme CreateCustomSemanticScheme(DynamicScheme baseScheme, TonalPalette customPalette)
+    {
+        return new DynamicScheme(
+            baseScheme.SourceColorHct,
+            baseScheme.Variant,
+            baseScheme.IsDark,
+            baseScheme.ContrastLevel,
+            baseScheme.PlatformType,
+            baseScheme.SpecVersion,
+            baseScheme.PrimaryPalette,
+            baseScheme.SecondaryPalette,
+            baseScheme.TertiaryPalette,
+            baseScheme.NeutralPalette,
+            baseScheme.NeutralVariantPalette,
+            customPalette);
+    }
+
+    private static bool CanCopyColorToClipboard(object? parameter)
+    {
+        return parameter is string colorHex && !string.IsNullOrWhiteSpace(colorHex);
+    }
+
+    private static void CopyColorToClipboard(object? parameter)
+    {
+        if (parameter is not string colorHex || string.IsNullOrWhiteSpace(colorHex))
+        {
+            return;
+        }
+
+        Clipboard.SetDataObject(colorHex);
+    }
+}
diff --git a/src/MaterialDesign3.Demo.Wpf/Domain/EnumOption.cs b/src/MaterialDesign3.Demo.Wpf/Domain/EnumOption.cs
new file mode 100644
index 0000000000..fde869d7fd
--- /dev/null
+++ b/src/MaterialDesign3.Demo.Wpf/Domain/EnumOption.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace MaterialDesign3Demo.Domain;
+
+public sealed class EnumOption<TEnum>
+    where TEnum : struct, Enum
+{
+    public EnumOption(TEnum value, string displayName)
+    {
+        Value = value;
+        DisplayName = displayName;
+    }
+
+    public TEnum Value { get; }
+
+    public string DisplayName { get; }
+}
diff --git a/src/MaterialDesign3.Demo.Wpf/Domain/MainWindowViewModel.cs b/src/MaterialDesign3.Demo.Wpf/Domain/MainWindowViewModel.cs
index 1956cfec91..89a9fae832 100644
--- a/src/MaterialDesign3.Demo.Wpf/Domain/MainWindowViewModel.cs
+++ b/src/MaterialDesign3.Demo.Wpf/Domain/MainWindowViewModel.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Configuration;
 using System.Windows.Data;
+using MaterialColorUtilities;
 using MaterialDesignDemo.Shared.Domain;
 using MaterialDesignThemes.Wpf;
 using MaterialDesignThemes.Wpf.Transitions;
@@ -156,6 +157,17 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
             selectedIcon: PackIconKind.Eyedropper,
             unselectedIcon: PackIconKind.EyedropperVariant);
 
+        yield return new DemoItem(
+            "Dynamic Color Tool",
+            typeof(DynamicColorTool),
+            [
+                DocumentationLink.DemoPageLink<DynamicColorTool>("Demo View"),
+                DocumentationLink.DemoPageLink<DynamicColorToolViewModel>("Demo View Model", "Domain"),
+                DocumentationLink.ApiLink<MaterialDynamicColors>()
+            ],
+            selectedIcon: PackIconKind.PaletteSwatch,
+            unselectedIcon: PackIconKind.PaletteSwatchOutline);
+
         yield return new DemoItem(
             "Buttons",
             typeof(Buttons),
diff --git a/src/MaterialDesign3.Demo.Wpf/DynamicColorTool.xaml b/src/MaterialDesign3.Demo.Wpf/DynamicColorTool.xaml
new file mode 100644
index 0000000000..9eba724e84
--- /dev/null
+++ b/src/MaterialDesign3.Demo.Wpf/DynamicColorTool.xaml
@@ -0,0 +1,762 @@
+<UserControl x:Class="MaterialDesign3Demo.DynamicColorTool"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
+             xmlns:local="clr-namespace:MaterialDesign3Demo"
+             xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             d:DataContext="{d:DesignInstance Type=domain:DynamicColorToolViewModel}"
+             d:DesignHeight="2000"
+             d:DesignWidth="1200"
+             mc:Ignorable="d">
+  <UserControl.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Card.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+
+      <Style x:Key="SectionTitleTextBlock"
+             TargetType="TextBlock"
+             BasedOn="{StaticResource MaterialDesignHeadline6TextBlock}">
+        <Setter Property="Margin" Value="0,0,0,8" />
+      </Style>
+
+      <Style x:Key="CardCaptionTextBlock"
+             TargetType="TextBlock"
+             BasedOn="{StaticResource MaterialDesignBody2TextBlock}">
+        <Setter Property="TextWrapping" Value="Wrap" />
+      </Style>
+
+      <Style x:Key="SourceModeListBox"
+             TargetType="ListBox"
+             BasedOn="{StaticResource MaterialDesignToolToggleFlatListBox}">
+        <Setter Property="Margin" Value="0,16,0,0" />
+      </Style>
+
+      <DataTemplate x:Key="ColorTileTemplate"
+                    DataType="{x:Type domain:DynamicColorGridTile}">
+        <Border Grid.Column="{Binding Column}"
+                Grid.ColumnSpan="{Binding ColumnSpan}"
+                MinHeight="96"
+                Margin="4"
+                Padding="12"
+                Background="{Binding BackgroundBrush}"
+                CornerRadius="8">
+          <Grid>
+            <StackPanel VerticalAlignment="Center">
+              <TextBlock Foreground="{Binding ForegroundBrush}"
+                         Style="{StaticResource MaterialDesignSubtitle2TextBlock}"
+                         Text="{Binding Label}"
+                         TextWrapping="Wrap" />
+
+              <TextBlock Margin="0,8,0,0"
+                         Foreground="{Binding ForegroundBrush}"
+                         Opacity="0.8"
+                         Style="{StaticResource MaterialDesignCaptionTextBlock}"
+                         Text="{Binding ColorHex}" />
+            </StackPanel>
+            <Button HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Command="{Binding DataContext.CopyColorCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                    CommandParameter="{Binding ColorHex}"
+                    Foreground="{Binding ForegroundBrush}"
+                    Style="{StaticResource MaterialDesignIconButton}"
+                    ToolTip="Copy Color">
+              <materialDesign:PackIcon Foreground="{Binding ForegroundBrush}"
+                                       Kind="ContentCopy" IsHitTestVisible="False" />
+            </Button>
+
+          </Grid>
+        </Border>
+      </DataTemplate>
+    </ResourceDictionary>
+  </UserControl.Resources>
+
+  <DockPanel>
+    <Grid Margin="16">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                   Text="Dynamic Color Tool" />
+
+      <TextBlock Grid.Row="1"
+                   Margin="0,8,0,24"
+                   Style="{StaticResource MaterialDesignBody1TextBlock}"
+                   Text="Configure primary, secondary, and tertiary source colors here. The scheme configuration, generated role grid, and custom semantic palette preview update live below."
+                   TextWrapping="Wrap" />
+
+      <WrapPanel Grid.Row="2"
+                   Margin="0,0,0,24">
+        <materialDesign:Card Width="360"
+                               Margin="0,0,16,16">
+          <StackPanel Margin="16">
+            <TextBlock Style="{StaticResource SectionTitleTextBlock}"
+                         Text="Primary" />
+
+            <TextBlock Style="{StaticResource CardCaptionTextBlock}"
+                         Text="Choose whether the primary palette is generated automatically or overridden with a custom color." />
+
+            <Border Height="56"
+                      Margin="0,16,0,0"
+                      CornerRadius="8"
+                      Background="{Binding PrimaryBrush}">
+              <TextBlock Margin="16,0"
+                           VerticalAlignment="Center"
+                           Foreground="{Binding PrimaryForegroundBrush}"
+                           Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                           Text="{Binding PrimaryColorHex}" />
+            </Border>
+
+            <ListBox ItemsSource="{Binding SourceModes}"
+                       DisplayMemberPath="DisplayName"
+                       SelectedValue="{Binding PrimarySourceMode}"
+                       SelectedValuePath="Value"
+                       Style="{StaticResource SourceModeListBox}"
+                       Visibility="Hidden" IsEnabled="False">
+              <ListBox.Resources>
+                <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MaterialDesignToolToggleListBoxItem}">
+                  <Setter Property="Padding" Value="12,6" />
+                </Style>
+              </ListBox.Resources>
+            </ListBox>
+
+            <TextBlock Margin="0,12,0,0"
+                         Style="{StaticResource CardCaptionTextBlock}"
+                         Text="{Binding PrimarySourceDescription}" />
+
+            <materialDesign:ColorPicker Margin="0,16,0,0"
+                                          Color="{Binding PrimaryColor}"
+                                          MinHeight="180" />
+          </StackPanel>
+        </materialDesign:Card>
+
+        <materialDesign:Card Width="360"
+                               Margin="0,0,16,16">
+          <StackPanel Margin="16">
+            <TextBlock Style="{StaticResource SectionTitleTextBlock}"
+                         Text="Secondary" />
+
+            <TextBlock Style="{StaticResource CardCaptionTextBlock}"
+                         Text="Choose whether the secondary palette is generated automatically or overridden with a custom color." />
+
+            <Border Height="56"
+                      Margin="0,16,0,0"
+                      CornerRadius="8"
+                      Background="{Binding SecondaryBrush}">
+              <TextBlock Margin="16,0"
+                           VerticalAlignment="Center"
+                           Foreground="{Binding SecondaryForegroundBrush}"
+                           Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                           Text="{Binding SecondaryColorHex}" />
+            </Border>
+
+            <ListBox ItemsSource="{Binding SourceModes}"
+                       DisplayMemberPath="DisplayName"
+                       SelectedValue="{Binding SecondarySourceMode}"
+                       SelectedValuePath="Value"
+                       Style="{StaticResource SourceModeListBox}">
+              <ListBox.Resources>
+                <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MaterialDesignToolToggleListBoxItem}">
+                  <Setter Property="Padding" Value="12,6" />
+                </Style>
+              </ListBox.Resources>
+            </ListBox>
+
+            <TextBlock Margin="0,12,0,0"
+                         Style="{StaticResource CardCaptionTextBlock}"
+                         Text="{Binding SecondarySourceDescription}" />
+
+            <materialDesign:ColorPicker Margin="0,16,0,0"
+                                          Color="{Binding SecondaryColor}"
+                                          IsEnabled="{Binding IsSecondaryCustomColorEnabled}"
+                                          Visibility="{Binding IsSecondaryCustomColorEnabled, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
+                                          MinHeight="180" />
+          </StackPanel>
+        </materialDesign:Card>
+
+        <materialDesign:Card Width="360"
+                               Margin="0,0,0,16">
+          <StackPanel Margin="16">
+            <TextBlock Style="{StaticResource SectionTitleTextBlock}"
+                         Text="Tertiary" />
+
+            <TextBlock Style="{StaticResource CardCaptionTextBlock}"
+                         Text="Choose whether the tertiary palette is generated automatically or overridden with a custom color." />
+
+            <Border Height="56"
+                      Margin="0,16,0,0"
+                      CornerRadius="8"
+                      Background="{Binding TertiaryBrush}">
+              <TextBlock Margin="16,0"
+                           VerticalAlignment="Center"
+                           Foreground="{Binding TertiaryForegroundBrush}"
+                           Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                           Text="{Binding TertiaryColorHex}" />
+            </Border>
+
+            <ListBox ItemsSource="{Binding SourceModes}"
+                       DisplayMemberPath="DisplayName"
+                       SelectedValue="{Binding TertiarySourceMode}"
+                       SelectedValuePath="Value"
+                       Style="{StaticResource SourceModeListBox}">
+              <ListBox.Resources>
+                <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MaterialDesignToolToggleListBoxItem}">
+                  <Setter Property="Padding" Value="12,6" />
+                </Style>
+              </ListBox.Resources>
+            </ListBox>
+
+            <TextBlock Margin="0,12,0,0"
+                         Style="{StaticResource CardCaptionTextBlock}"
+                         Text="{Binding TertiarySourceDescription}" />
+
+            <materialDesign:ColorPicker Margin="0,16,0,0"
+                                          Color="{Binding TertiaryColor}"
+                                          IsEnabled="{Binding IsTertiaryCustomColorEnabled}"
+                                          Visibility="{Binding IsTertiaryCustomColorEnabled, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
+                                          MinHeight="180" />
+          </StackPanel>
+        </materialDesign:Card>
+      </WrapPanel>
+
+      <materialDesign:Card Grid.Row="3"
+                             Width="736"
+                             Margin="0,0,0,24"
+                             HorizontalAlignment="Left">
+        <Grid Margin="16">
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+
+          <TextBlock Grid.Row="0"
+                       Style="{StaticResource SectionTitleTextBlock}"
+                       Text="Scheme Configuration" />
+
+          <TextBlock Grid.Row="1"
+                       Margin="0,16,0,0"
+                       Style="{StaticResource CardCaptionTextBlock}"
+                       Text="These controls define the active theme mode, dynamic scheme variant, contrast level, spec version, and platform for the generated scheme." />
+
+          <Grid Grid.Row="2"
+                  Margin="0,16,0,0">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="*" />
+              <ColumnDefinition Width="16" />
+              <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <ComboBox Grid.Row="0"
+                        Grid.Column="0"
+                        materialDesign:HintAssist.Hint="Theme Mode"
+                        DisplayMemberPath="DisplayName"
+                        ItemsSource="{Binding ThemeModeOptions}"
+                        SelectedValue="{Binding SelectedThemeMode}"
+                        SelectedValuePath="Value"
+                        Style="{StaticResource MaterialDesignFilledComboBox}" />
+
+            <ComboBox Grid.Row="0"
+                        Grid.Column="2"
+                        materialDesign:HintAssist.Hint="Scheme"
+                        DisplayMemberPath="DisplayName"
+                        ItemsSource="{Binding VariantOptions}"
+                        SelectedValue="{Binding SelectedVariant}"
+                        SelectedValuePath="Value"
+                        Style="{StaticResource MaterialDesignFilledComboBox}" />
+
+            <StackPanel Grid.Row="1"
+                          Grid.Column="0"
+                          Grid.ColumnSpan="3"
+                          Margin="0,16,0,0">
+              <TextBlock Style="{StaticResource MaterialDesignCaptionTextBlock}"
+                           Text="Contrast Level" />
+              <Grid Margin="0,8,0,0">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <Slider Grid.Column="0"
+                          IsMoveToPointEnabled="True"
+                          Maximum="1"
+                          Minimum="0"
+                          TickFrequency="0.05"
+                          Value="{Binding ContrastLevel}" />
+
+                <TextBlock Grid.Column="1"
+                             Margin="16,0,0,0"
+                             VerticalAlignment="Center"
+                             Style="{StaticResource MaterialDesignBody1TextBlock}"
+                             Text="{Binding ContrastLevelText}" />
+              </Grid>
+            </StackPanel>
+
+            <ComboBox Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="0,16,0,0"
+                        materialDesign:HintAssist.Hint="Spec Version"
+                        DisplayMemberPath="DisplayName"
+                        ItemsSource="{Binding SpecVersionOptions}"
+                        SelectedValue="{Binding SelectedSpecVersion}"
+                        SelectedValuePath="Value"
+                        Style="{StaticResource MaterialDesignFilledComboBox}" />
+
+            <ComboBox Grid.Row="2"
+                        Grid.Column="2"
+                        Margin="0,16,0,0"
+                        materialDesign:HintAssist.Hint="Platform"
+                        DisplayMemberPath="DisplayName"
+                        ItemsSource="{Binding PlatformOptions}"
+                        SelectedValue="{Binding SelectedPlatform}"
+                        SelectedValuePath="Value"
+                        Style="{StaticResource MaterialDesignFilledComboBox}" />
+          </Grid>
+        </Grid>
+      </materialDesign:Card>
+
+      <materialDesign:Card Grid.Row="4"
+                             Margin="0,0,0,16">
+        <Grid Margin="16">
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
+
+          <TextBlock Style="{StaticResource SectionTitleTextBlock}"
+                       Grid.ColumnSpan="8"
+                       Text="Generated Colors" />
+
+          <ContentControl Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding Primary}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="1"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding Secondary}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="1"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding Tertiary}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="1"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding Error}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="2"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnPrimary}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="2"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnSecondary}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="2"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnTertiary}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="2"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnError}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="3"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding PrimaryContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="3"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding SecondaryContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="3"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding TertiaryContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="3"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding ErrorContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="4"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnPrimaryContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="4"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnSecondaryContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="4"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnTertiaryContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="4"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnErrorContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="5"
+                            Grid.Column="0"
+                            Content="{Binding PrimaryFixed}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="5"
+                            Grid.Column="1"
+                            Content="{Binding PrimaryFixedDim}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="5"
+                            Grid.Column="2"
+                            Content="{Binding SecondaryFixed}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="5"
+                            Grid.Column="3"
+                            Content="{Binding SecondaryFixedDim}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="5"
+                            Grid.Column="4"
+                            Content="{Binding TertiaryFixed}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="5"
+                            Grid.Column="5"
+                            Content="{Binding TertiaryFixedDim}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="5"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding InverseSurface}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="6"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnPrimaryFixed}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="6"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnSecondaryFixed}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="6"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnTertiaryFixed}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="6"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding InverseOnSurface}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="7"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnPrimaryFixedVariant}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="7"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnSecondaryFixedVariant}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="7"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnTertiaryFixedVariant}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="7"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding InversePrimary}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="8"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding SurfaceDim}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="8"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding Surface}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="8"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding SurfaceBright}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="9"
+                            Grid.Column="0"
+                            Content="{Binding SurfaceContainerLowest}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="9"
+                            Grid.Column="1"
+                            Content="{Binding SurfaceContainerLow}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="9"
+                            Grid.Column="2"
+                            Content="{Binding SurfaceContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="9"
+                            Grid.Column="3"
+                            Content="{Binding SurfaceContainerHigh}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="9"
+                            Grid.Column="4"
+                            Content="{Binding SurfaceContainerHighest}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="10"
+                            Grid.Column="0"
+                            Content="{Binding OnSurface}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="10"
+                            Grid.Column="1"
+                            Content="{Binding OnSurfaceVariant}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="10"
+                            Grid.Column="2"
+                            Content="{Binding Outline}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="10"
+                            Grid.Column="3"
+                            Content="{Binding OutlineVariant}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="10"
+                            Grid.Column="4"
+                            Content="{Binding Scrim}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="10"
+                            Grid.Column="5"
+                            Content="{Binding Shadow}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="11"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding WarningHigh}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="11"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding WarningLow}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="11"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding Information}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="11"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding Safe}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="12"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnWarningHigh}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="12"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnWarningLow}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="12"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnInformation}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="12"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnSafe}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="13"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding WarningHighContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="13"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding WarningLowContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="13"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding InformationContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="13"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding SafeContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+
+          <ContentControl Grid.Row="14"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnWarningHighContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="14"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnWarningLowContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="14"
+                            Grid.Column="4"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnInformationContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+          <ContentControl Grid.Row="14"
+                            Grid.Column="6"
+                            Grid.ColumnSpan="2"
+                            Content="{Binding OnSafeContainer}"
+                            ContentTemplate="{StaticResource ColorTileTemplate}" />
+        </Grid>
+      </materialDesign:Card>
+
+      <materialDesign:Card Grid.Row="5"
+                             Margin="0,0,0,16">
+        <Grid Margin="16">
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+
+          <TextBlock Style="{StaticResource SectionTitleTextBlock}"
+                       Text="Custom Colors" />
+
+          <TextBlock Grid.Row="1"
+                       Margin="0,0,0,16"
+                       Style="{StaticResource CardCaptionTextBlock}"
+                       Text="Inspect a custom semantic swatch as a tonal palette and as a custom error palette injected into the active dynamic scheme."
+                       TextWrapping="Wrap" />
+
+          <Border Grid.Row="2"
+                    Height="56"
+                    CornerRadius="8"
+                    Background="{Binding CustomPaletteBrush}">
+            <TextBlock Margin="16,0"
+                         VerticalAlignment="Center"
+                         Foreground="{Binding CustomPaletteForegroundBrush}"
+                         Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                         Text="{Binding CustomPaletteColorHex}" />
+          </Border>
+
+          <materialDesign:ColorPicker Grid.Row="3"
+                                        Margin="0,16,0,0"
+                                        Color="{Binding CustomPaletteColor}"
+                                        MinHeight="180" />
+
+          <TextBlock Grid.Row="4"
+                       Margin="0,24,0,8"
+                       Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                       Text="Tonal Palette" />
+
+          <ItemsControl Grid.Row="5"
+                          Margin="0,0,0,24"
+                          ItemsSource="{Binding CustomTonalPaletteTiles}"
+                          ItemTemplate="{StaticResource ColorTileTemplate}">
+            <ItemsControl.ItemsPanel>
+              <ItemsPanelTemplate>
+                <WrapPanel ItemWidth="140" />
+              </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+          </ItemsControl>
+
+          <TextBlock Grid.Row="6"
+                       Margin="0,0,0,8"
+                       Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                       Text="Semantic Colors" />
+
+          <Grid Grid.Row="7">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <ContentControl Grid.Row="0"
+                              Content="{Binding CustomSemanticColorTiles[0]}"
+                              ContentTemplate="{StaticResource ColorTileTemplate}" />
+            <ContentControl Grid.Row="1"
+                              Content="{Binding CustomSemanticColorTiles[1]}"
+                              ContentTemplate="{StaticResource ColorTileTemplate}" />
+            <ContentControl Grid.Row="2"
+                              Content="{Binding CustomSemanticColorTiles[2]}"
+                              ContentTemplate="{StaticResource ColorTileTemplate}" />
+            <ContentControl Grid.Row="3"
+                              Content="{Binding CustomSemanticColorTiles[3]}"
+                              ContentTemplate="{StaticResource ColorTileTemplate}" />
+            <ContentControl Grid.Row="4"
+                              Content="{Binding CustomSemanticColorTiles[4]}"
+                              ContentTemplate="{StaticResource ColorTileTemplate}" />
+          </Grid>
+        </Grid>
+      </materialDesign:Card>
+    </Grid>
+  </DockPanel>
+</UserControl>
diff --git a/src/MaterialDesign3.Demo.Wpf/DynamicColorTool.xaml.cs b/src/MaterialDesign3.Demo.Wpf/DynamicColorTool.xaml.cs
new file mode 100644
index 0000000000..685dc48086
--- /dev/null
+++ b/src/MaterialDesign3.Demo.Wpf/DynamicColorTool.xaml.cs
@@ -0,0 +1,12 @@
+using MaterialDesign3Demo.Domain;
+
+namespace MaterialDesign3Demo;
+
+public partial class DynamicColorTool
+{
+    public DynamicColorTool()
+    {
+        DataContext = new DynamicColorToolViewModel();
+        InitializeComponent();
+    }
+}
diff --git a/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj b/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj
index 319b1a9bb7..30ed91490b 100644
--- a/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj
+++ b/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
+    <ProjectReference Include="..\MaterialDesign3.MaterialColorUtilities\MaterialColorUtilities.csproj" />
     <ProjectReference Include="..\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj" />
     <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
   </ItemGroup>
@@ -62,4 +63,4 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/MaterialDesign3.Demo.Wpf/MenusAndToolBars.xaml b/src/MaterialDesign3.Demo.Wpf/MenusAndToolBars.xaml
index f83183239c..4007081920 100644
--- a/src/MaterialDesign3.Demo.Wpf/MenusAndToolBars.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/MenusAndToolBars.xaml
@@ -346,6 +346,24 @@
       </ToolBarTray>
     </smtx:XamlDisplay>
 
+    <smtx:XamlDisplay Margin="5,16,0,16"
+                      DockPanel.Dock="Top"
+                      UniqueKey="menus_toolbar_custom_bg">
+      <ToolBarTray>
+        <ToolBar Background="{DynamicResource MaterialDesign.Brush.Primary.Dark}"
+                 ClipToBounds="False"
+                 Style="{StaticResource MaterialDesignToolBar}">
+          <Button Content="{materialDesign:PackIcon Kind=ContentSave}" ToolTip="Save" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentCut}" ToolTip="Cut" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentCopy}" ToolTip="Copy" />
+          <Button Content="{materialDesign:PackIcon Kind=ContentPaste}" ToolTip="Paste" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatBold}" ToolBar.OverflowMode="Always" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatItalic}" ToolBar.OverflowMode="Always" />
+          <Button Content="{materialDesign:PackIcon Kind=FormatUnderline}" ToolBar.OverflowMode="Always" />
+        </ToolBar>
+      </ToolBarTray>
+    </smtx:XamlDisplay>
+
     <Rectangle Style="{StaticResource PageSectionSeparator}" />
     <TextBlock Style="{StaticResource PageSectionTitleTextBlock}" Text="Context Menus" />
 
diff --git a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec.cs b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec.cs
index 0c9e5b8f15..8959992a10 100644
--- a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec.cs
+++ b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec.cs
@@ -9,6 +9,10 @@ public interface ColorSpec
     DynamicColor NeutralPaletteKeyColor { get; }
     DynamicColor NeutralVariantPaletteKeyColor { get; }
     DynamicColor ErrorPaletteKeyColor { get; }
+    DynamicColor WarningHighPaletteKeyColor { get; }
+    DynamicColor WarningLowPaletteKeyColor { get; }
+    DynamicColor InformationPaletteKeyColor { get; }
+    DynamicColor SafePaletteKeyColor { get; }
 
     // Surfaces [S]
     DynamicColor Background { get; }
@@ -61,6 +65,34 @@ public interface ColorSpec
     DynamicColor ErrorContainer { get; }
     DynamicColor OnErrorContainer { get; }
 
+    // Warning High [WH]
+    DynamicColor WarningHigh { get; }
+    DynamicColor? WarningHighDim { get; }
+    DynamicColor OnWarningHigh { get; }
+    DynamicColor WarningHighContainer { get; }
+    DynamicColor OnWarningHighContainer { get; }
+
+    // Warning Low [WL]
+    DynamicColor WarningLow { get; }
+    DynamicColor? WarningLowDim { get; }
+    DynamicColor OnWarningLow { get; }
+    DynamicColor WarningLowContainer { get; }
+    DynamicColor OnWarningLowContainer { get; }
+
+    // Information [I]
+    DynamicColor Information { get; }
+    DynamicColor? InformationDim { get; }
+    DynamicColor OnInformation { get; }
+    DynamicColor InformationContainer { get; }
+    DynamicColor OnInformationContainer { get; }
+
+    // Safe [SF]
+    DynamicColor Safe { get; }
+    DynamicColor? SafeDim { get; }
+    DynamicColor OnSafe { get; }
+    DynamicColor SafeContainer { get; }
+    DynamicColor OnSafeContainer { get; }
+
     // Primary Fixed Colors [PF]
     DynamicColor PrimaryFixed { get; }
     DynamicColor PrimaryFixedDim { get; }
@@ -103,4 +135,4 @@ public interface ColorSpec
     TonalPalette GetNeutralPalette(Variant variant, Hct sourceColorHct, bool isDark, Platform platform, double contrastLevel);
     TonalPalette GetNeutralVariantPalette(Variant variant, Hct sourceColorHct, bool isDark, Platform platform, double contrastLevel);
     TonalPalette? GetErrorPalette(Variant variant, Hct sourceColorHct, bool isDark, Platform platform, double contrastLevel);
-}
\ No newline at end of file
+}
diff --git a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec2021.cs b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec2021.cs
index 5f32d7ed35..b155045946 100644
--- a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec2021.cs
+++ b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec2021.cs
@@ -39,6 +39,30 @@ public class ColorSpec2021 : ColorSpec
         .SetTone(s => s.ErrorPalette.GetKeyColor().Tone)
         .Build();
 
+    public DynamicColor WarningHighPaletteKeyColor => new DynamicColor.Builder()
+        .SetName("warning_high_palette_key_color")
+        .SetPalette(s => s.WarningHighPalette)
+        .SetTone(s => s.WarningHighPalette.GetKeyColor().Tone)
+        .Build();
+
+    public DynamicColor WarningLowPaletteKeyColor => new DynamicColor.Builder()
+        .SetName("warning_low_palette_key_color")
+        .SetPalette(s => s.WarningLowPalette)
+        .SetTone(s => s.WarningLowPalette.GetKeyColor().Tone)
+        .Build();
+
+    public DynamicColor InformationPaletteKeyColor => new DynamicColor.Builder()
+        .SetName("information_palette_key_color")
+        .SetPalette(s => s.InformationPalette)
+        .SetTone(s => s.InformationPalette.GetKeyColor().Tone)
+        .Build();
+
+    public DynamicColor SafePaletteKeyColor => new DynamicColor.Builder()
+        .SetName("safe_palette_key_color")
+        .SetPalette(s => s.SafePalette)
+        .SetTone(s => s.SafePalette.GetKeyColor().Tone)
+        .Build();
+
     // Surfaces [S]
     public DynamicColor Background => new DynamicColor.Builder()
         .SetName("background")
@@ -380,6 +404,162 @@ public class ColorSpec2021 : ColorSpec
         .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 11.0))
         .Build();
 
+    // Warning High [WH]
+    public DynamicColor WarningHigh => new DynamicColor.Builder()
+        .SetName("warning_high")
+        .SetPalette(s => s.WarningHighPalette)
+        .SetTone(s => s.IsDark ? 80.0 : 40.0)
+        .SetIsBackground(true)
+        .SetBackground(HighestSurface)
+        .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 7.0))
+        .SetToneDeltaPair(_ => new ToneDeltaPair(WarningHighContainer, WarningHigh, 10.0, TonePolarity.Nearer, false))
+        .Build();
+
+    public DynamicColor? WarningHighDim => null;
+
+    public DynamicColor OnWarningHigh => new DynamicColor.Builder()
+        .SetName("on_warning_high")
+        .SetPalette(s => s.WarningHighPalette)
+        .SetTone(s => s.IsDark ? 20.0 : 100.0)
+        .SetBackground(_ => WarningHigh)
+        .SetContrastCurve(_ => new ContrastCurve(4.5, 7.0, 11.0, 21.0))
+        .Build();
+
+    public DynamicColor WarningHighContainer => new DynamicColor.Builder()
+        .SetName("warning_high_container")
+        .SetPalette(s => s.WarningHighPalette)
+        .SetTone(s => s.IsDark ? 30.0 : 90.0)
+        .SetIsBackground(true)
+        .SetBackground(HighestSurface)
+        .SetContrastCurve(_ => new ContrastCurve(1.0, 1.0, 3.0, 4.5))
+        .SetToneDeltaPair(_ => new ToneDeltaPair(WarningHighContainer, WarningHigh, 10.0, TonePolarity.Nearer, false))
+        .Build();
+
+    public DynamicColor OnWarningHighContainer => new DynamicColor.Builder()
+        .SetName("on_warning_high_container")
+        .SetPalette(s => s.WarningHighPalette)
+        .SetTone(s => IsMonochrome(s) ? (s.IsDark ? 90.0 : 10.0) : (s.IsDark ? 90.0 : 30.0))
+        .SetBackground(_ => WarningHighContainer)
+        .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 11.0))
+        .Build();
+
+    // Warning Low [WL]
+    public DynamicColor WarningLow => new DynamicColor.Builder()
+        .SetName("warning_low")
+        .SetPalette(s => s.WarningLowPalette)
+        .SetTone(s => s.IsDark ? 80.0 : 40.0)
+        .SetIsBackground(true)
+        .SetBackground(HighestSurface)
+        .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 7.0))
+        .SetToneDeltaPair(_ => new ToneDeltaPair(WarningLowContainer, WarningLow, 10.0, TonePolarity.Nearer, false))
+        .Build();
+
+    public DynamicColor? WarningLowDim => null;
+
+    public DynamicColor OnWarningLow => new DynamicColor.Builder()
+        .SetName("on_warning_low")
+        .SetPalette(s => s.WarningLowPalette)
+        .SetTone(s => s.IsDark ? 20.0 : 100.0)
+        .SetBackground(_ => WarningLow)
+        .SetContrastCurve(_ => new ContrastCurve(4.5, 7.0, 11.0, 21.0))
+        .Build();
+
+    public DynamicColor WarningLowContainer => new DynamicColor.Builder()
+        .SetName("warning_low_container")
+        .SetPalette(s => s.WarningLowPalette)
+        .SetTone(s => s.IsDark ? 30.0 : 90.0)
+        .SetIsBackground(true)
+        .SetBackground(HighestSurface)
+        .SetContrastCurve(_ => new ContrastCurve(1.0, 1.0, 3.0, 4.5))
+        .SetToneDeltaPair(_ => new ToneDeltaPair(WarningLowContainer, WarningLow, 10.0, TonePolarity.Nearer, false))
+        .Build();
+
+    public DynamicColor OnWarningLowContainer => new DynamicColor.Builder()
+        .SetName("on_warning_low_container")
+        .SetPalette(s => s.WarningLowPalette)
+        .SetTone(s => IsMonochrome(s) ? (s.IsDark ? 90.0 : 10.0) : (s.IsDark ? 90.0 : 30.0))
+        .SetBackground(_ => WarningLowContainer)
+        .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 11.0))
+        .Build();
+
+    // Information [I]
+    public DynamicColor Information => new DynamicColor.Builder()
+        .SetName("information")
+        .SetPalette(s => s.InformationPalette)
+        .SetTone(s => s.IsDark ? 80.0 : 40.0)
+        .SetIsBackground(true)
+        .SetBackground(HighestSurface)
+        .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 7.0))
+        .SetToneDeltaPair(_ => new ToneDeltaPair(InformationContainer, Information, 10.0, TonePolarity.Nearer, false))
+        .Build();
+
+    public DynamicColor? InformationDim => null;
+
+    public DynamicColor OnInformation => new DynamicColor.Builder()
+        .SetName("on_information")
+        .SetPalette(s => s.InformationPalette)
+        .SetTone(s => s.IsDark ? 20.0 : 100.0)
+        .SetBackground(_ => Information)
+        .SetContrastCurve(_ => new ContrastCurve(4.5, 7.0, 11.0, 21.0))
+        .Build();
+
+    public DynamicColor InformationContainer => new DynamicColor.Builder()
+        .SetName("information_container")
+        .SetPalette(s => s.InformationPalette)
+        .SetTone(s => s.IsDark ? 30.0 : 90.0)
+        .SetIsBackground(true)
+        .SetBackground(HighestSurface)
+        .SetContrastCurve(_ => new ContrastCurve(1.0, 1.0, 3.0, 4.5))
+        .SetToneDeltaPair(_ => new ToneDeltaPair(InformationContainer, Information, 10.0, TonePolarity.Nearer, false))
+        .Build();
+
+    public DynamicColor OnInformationContainer => new DynamicColor.Builder()
+        .SetName("on_information_container")
+        .SetPalette(s => s.InformationPalette)
+        .SetTone(s => IsMonochrome(s) ? (s.IsDark ? 90.0 : 10.0) : (s.IsDark ? 90.0 : 30.0))
+        .SetBackground(_ => InformationContainer)
+        .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 11.0))
+        .Build();
+
+    // Safe [SF]
+    public DynamicColor Safe => new DynamicColor.Builder()
+        .SetName("safe")
+        .SetPalette(s => s.SafePalette)
+        .SetTone(s => s.IsDark ? 80.0 : 40.0)
+        .SetIsBackground(true)
+        .SetBackground(HighestSurface)
+        .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 7.0))
+        .SetToneDeltaPair(_ => new ToneDeltaPair(SafeContainer, Safe, 10.0, TonePolarity.Nearer, false))
+        .Build();
+
+    public DynamicColor? SafeDim => null;
+
+    public DynamicColor OnSafe => new DynamicColor.Builder()
+        .SetName("on_safe")
+        .SetPalette(s => s.SafePalette)
+        .SetTone(s => s.IsDark ? 20.0 : 100.0)
+        .SetBackground(_ => Safe)
+        .SetContrastCurve(_ => new ContrastCurve(4.5, 7.0, 11.0, 21.0))
+        .Build();
+
+    public DynamicColor SafeContainer => new DynamicColor.Builder()
+        .SetName("safe_container")
+        .SetPalette(s => s.SafePalette)
+        .SetTone(s => s.IsDark ? 30.0 : 90.0)
+        .SetIsBackground(true)
+        .SetBackground(HighestSurface)
+        .SetContrastCurve(_ => new ContrastCurve(1.0, 1.0, 3.0, 4.5))
+        .SetToneDeltaPair(_ => new ToneDeltaPair(SafeContainer, Safe, 10.0, TonePolarity.Nearer, false))
+        .Build();
+
+    public DynamicColor OnSafeContainer => new DynamicColor.Builder()
+        .SetName("on_safe_container")
+        .SetPalette(s => s.SafePalette)
+        .SetTone(s => IsMonochrome(s) ? (s.IsDark ? 90.0 : 10.0) : (s.IsDark ? 90.0 : 30.0))
+        .SetBackground(_ => SafeContainer)
+        .SetContrastCurve(_ => new ContrastCurve(3.0, 4.5, 7.0, 11.0))
+        .Build();
+
     // Primary Fixed Colors [PF]
     public DynamicColor PrimaryFixed => new DynamicColor.Builder()
         .SetName("primary_fixed")
@@ -849,4 +1029,4 @@ public TonalPalette GetNeutralVariantPalette(Variant variant, Hct sourceColorHct
     }
 
     public TonalPalette? GetErrorPalette(Variant variant, Hct sourceColorHct, bool isDark, Platform platform, double contrastLevel) => null;
-}
\ No newline at end of file
+}
diff --git a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec2025.cs b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec2025.cs
index 379c27a370..72074dc584 100644
--- a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec2025.cs
+++ b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/ColorSpec2025.cs
@@ -939,6 +939,354 @@ public class ColorSpec2025 : ColorSpec2021
         }
     }
 
+    // Warning High [WH]
+    public new DynamicColor WarningHigh
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("warning_high")
+                .SetPalette(s => s.WarningHighPalette)
+                .SetTone(s =>
+                {
+                    if (s.PlatformType == Platform.Phone) return s.IsDark ? TMinC(s.WarningHighPalette, 0, 98) : TMaxC(s.WarningHighPalette);
+                    return TMinC(s.WarningHighPalette);
+                })
+                .SetIsBackground(true)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? (s.IsDark ? SurfaceBright : SurfaceDim) : SurfaceContainerHigh)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(4.5) : GetContrastCurve(7))
+                .SetToneDeltaPair(s => s.PlatformType == Platform.Phone ? new ToneDeltaPair(WarningHighContainer, WarningHigh, 5.0, TonePolarity.RelativeLighter, DeltaConstraint.Farther) : null!)
+                .Build();
+            return base.WarningHigh.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor? WarningHighDim
+    {
+        get
+        {
+            return new DynamicColor.Builder()
+                .SetName("warning_high_dim")
+                .SetPalette(s => s.WarningHighPalette)
+                .SetTone(s => TMinC(s.WarningHighPalette))
+                .SetIsBackground(true)
+                .SetBackground(s => SurfaceContainerHigh)
+                .SetContrastCurve(s => GetContrastCurve(4.5))
+                .SetToneDeltaPair(s => new ToneDeltaPair(WarningHighDim!, WarningHigh, 5.0, TonePolarity.Darker, DeltaConstraint.Farther))
+                .Build();
+        }
+    }
+
+    public new DynamicColor OnWarningHigh
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("on_warning_high")
+                .SetPalette(s => s.WarningHighPalette)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? WarningHigh : WarningHighDim!)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(6) : GetContrastCurve(7))
+                .Build();
+            return base.OnWarningHigh.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor WarningHighContainer
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("warning_high_container")
+                .SetPalette(s => s.WarningHighPalette)
+                .SetTone(s =>
+                {
+                    if (s.PlatformType == Platform.Watch) return 30.0;
+                    return s.IsDark ? TMinC(s.WarningHighPalette, 30, 93) : TMaxC(s.WarningHighPalette, 0, 90);
+                })
+                .SetIsBackground(true)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? (s.IsDark ? SurfaceBright : SurfaceDim) : null!)
+                .SetToneDeltaPair(s => s.PlatformType == Platform.Watch ? new ToneDeltaPair(WarningHighContainer, WarningHighDim!, 10.0, TonePolarity.Darker, DeltaConstraint.Farther) : null!)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone && s.ContrastLevel > 0 ? GetContrastCurve(1.5) : null!)
+                .Build();
+            return base.WarningHighContainer.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor OnWarningHighContainer
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("on_warning_high_container")
+                .SetPalette(s => s.WarningHighPalette)
+                .SetBackground(s => WarningHighContainer)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(4.5) : GetContrastCurve(7))
+                .Build();
+            return base.OnWarningHighContainer.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    // Warning Low [WL]
+    public new DynamicColor WarningLow
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("warning_low")
+                .SetPalette(s => s.WarningLowPalette)
+                .SetTone(s =>
+                {
+                    if (s.PlatformType == Platform.Phone) return s.IsDark ? TMinC(s.WarningLowPalette, 0, 98) : TMaxC(s.WarningLowPalette);
+                    return TMinC(s.WarningLowPalette);
+                })
+                .SetIsBackground(true)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? (s.IsDark ? SurfaceBright : SurfaceDim) : SurfaceContainerHigh)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(4.5) : GetContrastCurve(7))
+                .SetToneDeltaPair(s => s.PlatformType == Platform.Phone ? new ToneDeltaPair(WarningLowContainer, WarningLow, 5.0, TonePolarity.RelativeLighter, DeltaConstraint.Farther) : null!)
+                .Build();
+            return base.WarningLow.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor? WarningLowDim
+    {
+        get
+        {
+            return new DynamicColor.Builder()
+                .SetName("warning_low_dim")
+                .SetPalette(s => s.WarningLowPalette)
+                .SetTone(s => TMinC(s.WarningLowPalette))
+                .SetIsBackground(true)
+                .SetBackground(s => SurfaceContainerHigh)
+                .SetContrastCurve(s => GetContrastCurve(4.5))
+                .SetToneDeltaPair(s => new ToneDeltaPair(WarningLowDim!, WarningLow, 5.0, TonePolarity.Darker, DeltaConstraint.Farther))
+                .Build();
+        }
+    }
+
+    public new DynamicColor OnWarningLow
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("on_warning_low")
+                .SetPalette(s => s.WarningLowPalette)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? WarningLow : WarningLowDim!)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(6) : GetContrastCurve(7))
+                .Build();
+            return base.OnWarningLow.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor WarningLowContainer
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("warning_low_container")
+                .SetPalette(s => s.WarningLowPalette)
+                .SetTone(s =>
+                {
+                    if (s.PlatformType == Platform.Watch) return 30.0;
+                    return s.IsDark ? TMinC(s.WarningLowPalette, 30, 93) : TMaxC(s.WarningLowPalette, 0, 90);
+                })
+                .SetIsBackground(true)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? (s.IsDark ? SurfaceBright : SurfaceDim) : null!)
+                .SetToneDeltaPair(s => s.PlatformType == Platform.Watch ? new ToneDeltaPair(WarningLowContainer, WarningLowDim!, 10.0, TonePolarity.Darker, DeltaConstraint.Farther) : null!)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone && s.ContrastLevel > 0 ? GetContrastCurve(1.5) : null!)
+                .Build();
+            return base.WarningLowContainer.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor OnWarningLowContainer
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("on_warning_low_container")
+                .SetPalette(s => s.WarningLowPalette)
+                .SetBackground(s => WarningLowContainer)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(4.5) : GetContrastCurve(7))
+                .Build();
+            return base.OnWarningLowContainer.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    // Information [I]
+    public new DynamicColor Information
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("information")
+                .SetPalette(s => s.InformationPalette)
+                .SetTone(s =>
+                {
+                    if (s.PlatformType == Platform.Phone) return s.IsDark ? TMinC(s.InformationPalette, 0, 98) : TMaxC(s.InformationPalette);
+                    return TMinC(s.InformationPalette);
+                })
+                .SetIsBackground(true)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? (s.IsDark ? SurfaceBright : SurfaceDim) : SurfaceContainerHigh)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(4.5) : GetContrastCurve(7))
+                .SetToneDeltaPair(s => s.PlatformType == Platform.Phone ? new ToneDeltaPair(InformationContainer, Information, 5.0, TonePolarity.RelativeLighter, DeltaConstraint.Farther) : null!)
+                .Build();
+            return base.Information.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor? InformationDim
+    {
+        get
+        {
+            return new DynamicColor.Builder()
+                .SetName("information_dim")
+                .SetPalette(s => s.InformationPalette)
+                .SetTone(s => TMinC(s.InformationPalette))
+                .SetIsBackground(true)
+                .SetBackground(s => SurfaceContainerHigh)
+                .SetContrastCurve(s => GetContrastCurve(4.5))
+                .SetToneDeltaPair(s => new ToneDeltaPair(InformationDim!, Information, 5.0, TonePolarity.Darker, DeltaConstraint.Farther))
+                .Build();
+        }
+    }
+
+    public new DynamicColor OnInformation
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("on_information")
+                .SetPalette(s => s.InformationPalette)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? Information : InformationDim!)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(6) : GetContrastCurve(7))
+                .Build();
+            return base.OnInformation.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor InformationContainer
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("information_container")
+                .SetPalette(s => s.InformationPalette)
+                .SetTone(s =>
+                {
+                    if (s.PlatformType == Platform.Watch) return 30.0;
+                    return s.IsDark ? TMinC(s.InformationPalette, 30, 93) : TMaxC(s.InformationPalette, 0, 90);
+                })
+                .SetIsBackground(true)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? (s.IsDark ? SurfaceBright : SurfaceDim) : null!)
+                .SetToneDeltaPair(s => s.PlatformType == Platform.Watch ? new ToneDeltaPair(InformationContainer, InformationDim!, 10.0, TonePolarity.Darker, DeltaConstraint.Farther) : null!)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone && s.ContrastLevel > 0 ? GetContrastCurve(1.5) : null!)
+                .Build();
+            return base.InformationContainer.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor OnInformationContainer
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("on_information_container")
+                .SetPalette(s => s.InformationPalette)
+                .SetBackground(s => InformationContainer)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(4.5) : GetContrastCurve(7))
+                .Build();
+            return base.OnInformationContainer.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    // Safe [SF]
+    public new DynamicColor Safe
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("safe")
+                .SetPalette(s => s.SafePalette)
+                .SetTone(s =>
+                {
+                    if (s.PlatformType == Platform.Phone) return s.IsDark ? TMinC(s.SafePalette, 0, 98) : TMaxC(s.SafePalette);
+                    return TMinC(s.SafePalette);
+                })
+                .SetIsBackground(true)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? (s.IsDark ? SurfaceBright : SurfaceDim) : SurfaceContainerHigh)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(4.5) : GetContrastCurve(7))
+                .SetToneDeltaPair(s => s.PlatformType == Platform.Phone ? new ToneDeltaPair(SafeContainer, Safe, 5.0, TonePolarity.RelativeLighter, DeltaConstraint.Farther) : null!)
+                .Build();
+            return base.Safe.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor? SafeDim
+    {
+        get
+        {
+            return new DynamicColor.Builder()
+                .SetName("safe_dim")
+                .SetPalette(s => s.SafePalette)
+                .SetTone(s => TMinC(s.SafePalette))
+                .SetIsBackground(true)
+                .SetBackground(s => SurfaceContainerHigh)
+                .SetContrastCurve(s => GetContrastCurve(4.5))
+                .SetToneDeltaPair(s => new ToneDeltaPair(SafeDim!, Safe, 5.0, TonePolarity.Darker, DeltaConstraint.Farther))
+                .Build();
+        }
+    }
+
+    public new DynamicColor OnSafe
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("on_safe")
+                .SetPalette(s => s.SafePalette)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? Safe : SafeDim!)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(6) : GetContrastCurve(7))
+                .Build();
+            return base.OnSafe.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor SafeContainer
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("safe_container")
+                .SetPalette(s => s.SafePalette)
+                .SetTone(s =>
+                {
+                    if (s.PlatformType == Platform.Watch) return 30.0;
+                    return s.IsDark ? TMinC(s.SafePalette, 30, 93) : TMaxC(s.SafePalette, 0, 90);
+                })
+                .SetIsBackground(true)
+                .SetBackground(s => s.PlatformType == Platform.Phone ? (s.IsDark ? SurfaceBright : SurfaceDim) : null!)
+                .SetToneDeltaPair(s => s.PlatformType == Platform.Watch ? new ToneDeltaPair(SafeContainer, SafeDim!, 10.0, TonePolarity.Darker, DeltaConstraint.Farther) : null!)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone && s.ContrastLevel > 0 ? GetContrastCurve(1.5) : null!)
+                .Build();
+            return base.SafeContainer.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
+    public new DynamicColor OnSafeContainer
+    {
+        get
+        {
+            var color2025 = new DynamicColor.Builder()
+                .SetName("on_safe_container")
+                .SetPalette(s => s.SafePalette)
+                .SetBackground(s => SafeContainer)
+                .SetContrastCurve(s => s.PlatformType == Platform.Phone ? GetContrastCurve(4.5) : GetContrastCurve(7))
+                .Build();
+            return base.OnSafeContainer.ToBuilder().ExtendSpecVersion(SpecVersion.Spec2025, color2025).Build();
+        }
+    }
+
     // Primary Fixed Colors [PF]
     public new DynamicColor PrimaryFixed
     {
@@ -1503,4 +1851,4 @@ private static double GetVibrantNeutralChroma(Hct sourceColorHct, Platform platf
         double neutralHue = GetVibrantNeutralHue(sourceColorHct);
         return platform == Platform.Phone ? 28.0 : (Hct.IsBlue(neutralHue) ? 28.0 : 20.0);
     }
-}
\ No newline at end of file
+}
diff --git a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/DynamicScheme.cs b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/DynamicScheme.cs
index 00e301a6e5..9f5cfbd9b2 100644
--- a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/DynamicScheme.cs
+++ b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/DynamicScheme.cs
@@ -1,11 +1,18 @@
 using static System.Math;
 
+using System.Windows.Media;
+
 namespace MaterialColorUtilities;
 
 public class DynamicScheme
 {
     public static readonly SpecVersion DEFAULT_SPEC_VERSION = SpecVersion.Spec2021;
     public static readonly Platform DEFAULT_PLATFORM = Platform.Phone;
+    public static readonly Color DEFAULT_WARNING_HIGH_COLOR = Color.FromArgb(255, 212, 69, 41);
+    public static readonly Color DEFAULT_WARNING_LOW_COLOR = Color.FromArgb(255, 252, 163, 41);
+    public static readonly Color DEFAULT_INFORMATION_COLOR = Color.FromArgb(255, 0, 46, 122);
+    public static readonly Color DEFAULT_SAFE_COLOR = Color.FromArgb(255, 41, 138, 64);
+    public static readonly Color DEFAULT_ERROR_COLOR = Color.FromArgb(255, 163, 23, 26);
 
     // Core properties
     public int SourceColorArgb { get; private set; }
@@ -22,6 +29,10 @@ public class DynamicScheme
     public TonalPalette NeutralPalette { get; }
     public TonalPalette NeutralVariantPalette { get; }
     public TonalPalette ErrorPalette { get; }
+    public TonalPalette WarningHighPalette { get; }
+    public TonalPalette WarningLowPalette { get; }
+    public TonalPalette InformationPalette { get; }
+    public TonalPalette SafePalette { get; }
 
     public DynamicScheme() => throw new NotImplementedException();
 
@@ -47,6 +58,10 @@ public DynamicScheme(
             tertiaryPalette,
             neutralPalette,
             neutralVariantPalette,
+            null,
+            null,
+            null,
+            null,
             null)
     {
     }
@@ -74,7 +89,11 @@ public DynamicScheme(
             tertiaryPalette,
             neutralPalette,
             neutralVariantPalette,
-            errorPalette)
+            errorPalette,
+            null,
+            null,
+            null,
+            null)
     {
     }
 
@@ -90,7 +109,11 @@ public DynamicScheme(
         TonalPalette tertiaryPalette,
         TonalPalette neutralPalette,
         TonalPalette neutralVariantPalette,
-        TonalPalette? errorPalette)
+        TonalPalette? errorPalette,
+        TonalPalette? warningHighPalette = null,
+        TonalPalette? warningLowPalette = null,
+        TonalPalette? informationPalette = null,
+        TonalPalette? safePalette = null)
     {
         SourceColorArgb = sourceColorHct.Argb;
         SourceColorHct = sourceColorHct;
@@ -105,7 +128,11 @@ public DynamicScheme(
         TertiaryPalette = tertiaryPalette;
         NeutralPalette = neutralPalette;
         NeutralVariantPalette = neutralVariantPalette;
-        ErrorPalette = errorPalette ?? TonalPalette.FromHueAndChroma(25.0, 84.0);
+        ErrorPalette = errorPalette ?? TonalPalette.FromInt(ColorUtils.ArgbFromColor(DEFAULT_ERROR_COLOR));
+        WarningHighPalette = warningHighPalette ?? TonalPalette.FromInt(ColorUtils.ArgbFromColor(DEFAULT_WARNING_HIGH_COLOR));
+        WarningLowPalette = warningLowPalette ?? TonalPalette.FromInt(ColorUtils.ArgbFromColor(DEFAULT_WARNING_LOW_COLOR));
+        InformationPalette = informationPalette ?? TonalPalette.FromInt(ColorUtils.ArgbFromColor(DEFAULT_INFORMATION_COLOR));
+        SafePalette = safePalette ?? TonalPalette.FromInt(ColorUtils.ArgbFromColor(DEFAULT_SAFE_COLOR));
     }
 
     public static DynamicScheme From(DynamicScheme other, bool isDark) => From(other, isDark, other.ContrastLevel);
@@ -124,7 +151,11 @@ public static DynamicScheme From(DynamicScheme other, bool isDark, double contra
             other.TertiaryPalette,
             other.NeutralPalette,
             other.NeutralVariantPalette,
-            other.ErrorPalette);
+            other.ErrorPalette,
+            other.WarningHighPalette,
+            other.WarningLowPalette,
+            other.InformationPalette,
+            other.SafePalette);
     }
 
     public static double GetPiecewiseValue(Hct sourceColorHct, double[] hueBreakpoints, double[] hues)
diff --git a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/MaterialDynamicColors.cs b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/MaterialDynamicColors.cs
index def4908c25..ea4c29f239 100644
--- a/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/MaterialDynamicColors.cs
+++ b/src/MaterialDesign3.MaterialColorUtilities/DynamicColor/MaterialDynamicColors.cs
@@ -13,6 +13,10 @@ public sealed class MaterialDynamicColors
     public DynamicColor NeutralPaletteKeyColor => colorSpec.NeutralPaletteKeyColor;
     public DynamicColor NeutralVariantPaletteKeyColor => colorSpec.NeutralVariantPaletteKeyColor;
     public DynamicColor ErrorPaletteKeyColor => colorSpec.ErrorPaletteKeyColor;
+    public DynamicColor WarningHighPaletteKeyColor => colorSpec.WarningHighPaletteKeyColor;
+    public DynamicColor WarningLowPaletteKeyColor => colorSpec.WarningLowPaletteKeyColor;
+    public DynamicColor InformationPaletteKeyColor => colorSpec.InformationPaletteKeyColor;
+    public DynamicColor SafePaletteKeyColor => colorSpec.SafePaletteKeyColor;
 
     // Surfaces [S]
     public DynamicColor Background => colorSpec.Background;
@@ -77,6 +81,34 @@ public sealed class MaterialDynamicColors
     public DynamicColor ErrorContainer => colorSpec.ErrorContainer;
     public DynamicColor OnErrorContainer => colorSpec.OnErrorContainer;
 
+    // Warning High [WH]
+    public DynamicColor WarningHigh => colorSpec.WarningHigh;
+    public DynamicColor? WarningHighDim => colorSpec.WarningHighDim;
+    public DynamicColor OnWarningHigh => colorSpec.OnWarningHigh;
+    public DynamicColor WarningHighContainer => colorSpec.WarningHighContainer;
+    public DynamicColor OnWarningHighContainer => colorSpec.OnWarningHighContainer;
+
+    // Warning Low [WL]
+    public DynamicColor WarningLow => colorSpec.WarningLow;
+    public DynamicColor? WarningLowDim => colorSpec.WarningLowDim;
+    public DynamicColor OnWarningLow => colorSpec.OnWarningLow;
+    public DynamicColor WarningLowContainer => colorSpec.WarningLowContainer;
+    public DynamicColor OnWarningLowContainer => colorSpec.OnWarningLowContainer;
+
+    // Information [I]
+    public DynamicColor Information => colorSpec.Information;
+    public DynamicColor? InformationDim => colorSpec.InformationDim;
+    public DynamicColor OnInformation => colorSpec.OnInformation;
+    public DynamicColor InformationContainer => colorSpec.InformationContainer;
+    public DynamicColor OnInformationContainer => colorSpec.OnInformationContainer;
+
+    // Safe [SF]
+    public DynamicColor Safe => colorSpec.Safe;
+    public DynamicColor? SafeDim => colorSpec.SafeDim;
+    public DynamicColor OnSafe => colorSpec.OnSafe;
+    public DynamicColor SafeContainer => colorSpec.SafeContainer;
+    public DynamicColor OnSafeContainer => colorSpec.OnSafeContainer;
+
     // Primary Fixed
     public DynamicColor PrimaryFixed => colorSpec.PrimaryFixed;
     public DynamicColor PrimaryFixedDim => colorSpec.PrimaryFixedDim;
@@ -102,6 +134,10 @@ public IEnumerable<DynamicColor> AllDynamicColors()
         yield return NeutralPaletteKeyColor;
         yield return NeutralVariantPaletteKeyColor;
         yield return ErrorPaletteKeyColor;
+        yield return WarningHighPaletteKeyColor;
+        yield return WarningLowPaletteKeyColor;
+        yield return InformationPaletteKeyColor;
+        yield return SafePaletteKeyColor;
         yield return Background;
         yield return OnBackground;
         yield return Surface;
@@ -155,6 +191,26 @@ public IEnumerable<DynamicColor> AllDynamicColors()
         yield return OnError;
         yield return ErrorContainer;
         yield return OnErrorContainer;
+        yield return WarningHigh;
+        yield return WarningHighDim!;
+        yield return OnWarningHigh;
+        yield return WarningHighContainer;
+        yield return OnWarningHighContainer;
+        yield return WarningLow;
+        yield return WarningLowDim!;
+        yield return OnWarningLow;
+        yield return WarningLowContainer;
+        yield return OnWarningLowContainer;
+        yield return Information;
+        yield return InformationDim!;
+        yield return OnInformation;
+        yield return InformationContainer;
+        yield return OnInformationContainer;
+        yield return Safe;
+        yield return SafeDim!;
+        yield return OnSafe;
+        yield return SafeContainer;
+        yield return OnSafeContainer;
         yield return ControlActivated;
         yield return ControlNormal;
         yield return ControlHighlight;
@@ -164,4 +220,4 @@ public IEnumerable<DynamicColor> AllDynamicColors()
         yield return TextSecondaryAndTertiaryInverseDisabled;
         yield return TextHintInverse;
     }
-}
\ No newline at end of file
+}
diff --git a/src/MaterialDesignThemes.Wpf/Behaviors/Internal/TabControlHeaderScrollBehavior.cs b/src/MaterialDesignThemes.Wpf/Behaviors/Internal/TabControlHeaderScrollBehavior.cs
index 6605714ac4..7ad1d90b4f 100644
--- a/src/MaterialDesignThemes.Wpf/Behaviors/Internal/TabControlHeaderScrollBehavior.cs
+++ b/src/MaterialDesignThemes.Wpf/Behaviors/Internal/TabControlHeaderScrollBehavior.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.ComponentModel;
 using System.Windows.Media.Animation;
 using Microsoft.Xaml.Behaviors;
 
@@ -13,6 +13,9 @@ public class TabControlHeaderScrollBehavior : Behavior<ScrollViewer>
     public static void SetCustomHorizontalOffset(DependencyObject obj, double value) => obj.SetValue(CustomHorizontalOffsetProperty, value);
     private static void CustomHorizontalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
+        if (DesignerProperties.GetIsInDesignMode(d))
+            return;
+
         var scrollViewer = (ScrollViewer)d;
         scrollViewer.ScrollToHorizontalOffset((double)e.NewValue);
     }
@@ -36,21 +39,64 @@ public TabControl TabControl
 
     private static void OnTabControlChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
+        if (DesignerProperties.GetIsInDesignMode(d))
+            return;
+
         var behavior = (TabControlHeaderScrollBehavior)d;
         if (e.OldValue is TabControl oldTabControl)
         {
             oldTabControl.SelectionChanged -= behavior.OnTabChanged;
             oldTabControl.SizeChanged -= behavior.OnTabControlSizeChanged;
             oldTabControl.PreviewKeyDown -= behavior.OnTabControlPreviewKeyDown;
+            oldTabControl.ItemContainerGenerator.ItemsChanged -= behavior.OnTabsChanged;
         }
         if (e.NewValue is TabControl newTabControl)
         {
             newTabControl.SelectionChanged += behavior.OnTabChanged;
             newTabControl.SizeChanged += behavior.OnTabControlSizeChanged;
             newTabControl.PreviewKeyDown += behavior.OnTabControlPreviewKeyDown;
+            newTabControl.ItemContainerGenerator.ItemsChanged += behavior.OnTabsChanged;
         }
     }
 
+    public double AdditionalHeaderPanelContentWidth
+    {
+        get => (double)GetValue(AdditionalHeaderPanelContentWidthProperty);
+        set => SetValue(AdditionalHeaderPanelContentWidthProperty, value);
+    }
+
+    public static readonly DependencyProperty AdditionalHeaderPanelContentWidthProperty =
+        DependencyProperty.Register(nameof(AdditionalHeaderPanelContentWidth), typeof(double),
+            typeof(TabControlHeaderScrollBehavior), new PropertyMetadata(0d, AdditionalHeaderPanelContentWidthChanged));
+
+    private static void AdditionalHeaderPanelContentWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (DesignerProperties.GetIsInDesignMode(d))
+            return;
+
+        var behavior = (TabControlHeaderScrollBehavior)d;
+        behavior.AddPaddingToScrollableContentIfWiderThanViewPort();
+    }
+
+    public double NavigationPanelLeftWidth
+    {
+        get => (double)GetValue(NavigationPanelLeftWidthProperty);
+        set => SetValue(NavigationPanelLeftWidthProperty, value);
+    }
+
+    public static readonly DependencyProperty NavigationPanelLeftWidthProperty =
+        DependencyProperty.Register(nameof(NavigationPanelLeftWidth), typeof(double),
+            typeof(TabControlHeaderScrollBehavior), new PropertyMetadata(0d, NavigationPanelLeftWidthChanged));
+
+    private static void NavigationPanelLeftWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (DesignerProperties.GetIsInDesignMode(d))
+            return;
+
+        var behavior = (TabControlHeaderScrollBehavior)d;
+        behavior.AddPaddingToScrollableContentIfWiderThanViewPort();
+    }
+
     public FrameworkElement ScrollableContent
     {
         get => (FrameworkElement)GetValue(ScrollableContentProperty);
@@ -63,13 +109,123 @@ public FrameworkElement ScrollableContent
 
     private static void OnScrollableContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
+        if (DesignerProperties.GetIsInDesignMode(d))
+            return;
+
         var behavior = (TabControlHeaderScrollBehavior)d;
         behavior.AddPaddingToScrollableContentIfWiderThanViewPort();
     }
 
+    public ICommand NextTabCommand { get; }
+    public ICommand PreviousTabCommand { get; }
+
     private double? _desiredScrollStart;
     private bool _isAnimatingScroll;
 
+    public TabControlHeaderScrollBehavior()
+    {
+        if (DesignerProperties.GetIsInDesignMode(this))
+        {
+            NextTabCommand = null!;
+            PreviousTabCommand = null!;
+            return;
+        }
+
+        NextTabCommand = new SimpleICommandImplementation(_ =>
+        {
+            if (TabControl is { } tabControl)
+            {
+                NavigationPanelBehavior behavior = TabAssist.GetNavigationPanelBehavior(tabControl);
+                if (behavior == NavigationPanelBehavior.Scroll)
+                {
+                    _desiredScrollStart = AssociatedObject.ContentHorizontalOffset;
+                    double newOffset = Math.Min(AssociatedObject.ContentHorizontalOffset + AssociatedObject.ActualWidth, AssociatedObject.ExtentWidth - AssociatedObject.ActualWidth - AssociatedObject.Margin.Left - AssociatedObject.Margin.Right);
+                    AssociatedObject.ScrollToHorizontalOffset(newOffset);
+                }
+                else if (behavior == NavigationPanelBehavior.Select && TryGetNextTabIndex(tabControl, out int nextIndex))
+                {
+                    tabControl.SelectedIndex = nextIndex;
+                }
+            }
+        }, CanNextTabCommandExecute);
+        PreviousTabCommand = new SimpleICommandImplementation(_ =>
+        {
+            if (TabControl is { } tabControl)
+            {
+                NavigationPanelBehavior behavior = TabAssist.GetNavigationPanelBehavior(tabControl);
+                if (behavior == NavigationPanelBehavior.Scroll)
+                {
+                    _desiredScrollStart = AssociatedObject.ContentHorizontalOffset;
+                    AssociatedObject.ScrollToHorizontalOffset(AssociatedObject.ContentHorizontalOffset - AssociatedObject.ActualWidth);
+                }
+                else if (behavior == NavigationPanelBehavior.Select && TryGetPreviousTabIndex(tabControl, out int previousIndex))
+                {
+                    tabControl.SelectedIndex = previousIndex;
+                }
+            }
+        }, CanPreviousTabCommandExecute);
+
+        bool CanNextTabCommandExecute(object? _)
+        {
+            if (TabControl is not { } tabControl)
+                return false;
+
+            NavigationPanelBehavior behavior = TabAssist.GetNavigationPanelBehavior(tabControl);
+            return behavior switch
+            {
+                NavigationPanelBehavior.Scroll => AssociatedObject.ContentHorizontalOffset < AssociatedObject.ExtentWidth - AssociatedObject.ActualWidth - AssociatedObject.Margin.Left - AssociatedObject.Margin.Right,
+                NavigationPanelBehavior.Select => TryGetNextTabIndex(tabControl, out int _),
+                _ => false
+            };
+        }
+
+        bool CanPreviousTabCommandExecute(object? _)
+        {
+            if (TabControl is not { } tabControl)
+                return false;
+
+            NavigationPanelBehavior behavior = TabAssist.GetNavigationPanelBehavior(tabControl);
+            return behavior switch
+            {
+                NavigationPanelBehavior.Scroll => AssociatedObject.ContentHorizontalOffset > 0,
+                NavigationPanelBehavior.Select => TryGetPreviousTabIndex(tabControl, out int _),
+                _ => false
+            };
+        }
+
+        static bool TryGetNextTabIndex(TabControl tabControl, out int nextTabIndex)
+        {
+            nextTabIndex = -1;
+            var nextTabs = GetEnabledTabItemIndices(tabControl, index => index > tabControl.SelectedIndex);
+            if (nextTabs.Count > 0)
+            {
+                nextTabIndex = nextTabs.First();
+                return true;
+            }
+            return false;
+        }
+
+        static bool TryGetPreviousTabIndex(TabControl tabControl, out int previousTabIndex)
+        {
+            previousTabIndex = -1;
+            var previousTabs = GetEnabledTabItemIndices(tabControl, index => index < tabControl.SelectedIndex);
+            if (previousTabs.Count > 0)
+            {
+                previousTabIndex = previousTabs.Last();
+                return true;
+            }
+            return false;
+        }
+
+        static List<int> GetEnabledTabItemIndices(TabControl tabControl, Predicate<int> predicate) => [.. tabControl
+            .Items
+            .Cast<object>()
+            .Select(item => (TabItem)tabControl.ItemContainerGenerator.ContainerFromItem(item))
+            .Where(tab => tab != null && tab.IsEnabled)
+            .Select(tab => tabControl.ItemContainerGenerator.IndexFromContainer(tab))
+            .Where(tabIndex => predicate(tabIndex))];
+    }
+
     private void OnTabChanged(object sender, SelectionChangedEventArgs e)
     {
         var tabControl = (TabControl)sender;
@@ -89,12 +245,27 @@ bool IsMovingForward()
             if (e.RemovedItems.Count == 0) return true;
             int previousIndex = GetItemIndex(e.RemovedItems[0]);
             int nextIndex = GetItemIndex(e.AddedItems[^1]);
-            return nextIndex > previousIndex;
+
+            NavigationPanelBehavior behavior = TabAssist.GetNavigationPanelBehavior(tabControl);
+            return behavior switch
+            {
+                NavigationPanelBehavior.Scroll => GetItemOffset(nextIndex) > 0,
+                _ => nextIndex > previousIndex
+            };
         }
 
         int GetItemIndex(object? item) => tabControl.Items.IndexOf(item);
+
+        double GetItemOffset(int index)
+        {
+            if (index < 0 || tabControl.ItemContainerGenerator.ContainerFromIndex(index) is not TabItem container)
+                return 1;
+            return container.TranslatePoint(new Point(), AssociatedObject).X;
+        }
     }
 
+    private void OnTabsChanged(object sender, ItemsChangedEventArgs e)
+        => AssociatedObject.Dispatcher.BeginInvoke(() => AddPaddingToScrollableContentIfWiderThanViewPort(), System.Windows.Threading.DispatcherPriority.Loaded);   // Defer execution until collection change is rendered
     private void OnTabControlSizeChanged(object sender, SizeChangedEventArgs _) => AddPaddingToScrollableContentIfWiderThanViewPort();
     private void AssociatedObject_SizeChanged(object sender, SizeChangedEventArgs _) => AddPaddingToScrollableContentIfWiderThanViewPort();
 
@@ -105,15 +276,19 @@ private void AddPaddingToScrollableContentIfWiderThanViewPort()
         if (ScrollableContent is null)
             return;
 
-        if (ScrollableContent.ActualWidth > TabControl.ActualWidth)
+        if (ScrollableContent.ActualWidth > TabControl.ActualWidth - AdditionalHeaderPanelContentWidth)
         {
             double offset = TabAssist.GetHeaderPadding(TabControl);
-            ScrollableContent.Margin = new(offset, 0, offset, 0);
+            ScrollableContent.Margin = new(offset, 0, offset + AdditionalHeaderPanelContentWidth, 0);
+            TabAssist.SetIsOverflowing(TabControl, true);
         }
         else
         {
             ScrollableContent.Margin = new();
+            AssociatedObject.SetCurrentValue(TabControlHeaderScrollBehavior.CustomHorizontalOffsetProperty, 0d);
+            TabAssist.SetIsOverflowing(TabControl, false);
         }
+        AssociatedObject.Margin = new(NavigationPanelLeftWidth, 0, AdditionalHeaderPanelContentWidth, 0);
     }
 
     private void OnTabControlPreviewKeyDown(object sender, KeyEventArgs e)
@@ -128,6 +303,9 @@ private void OnTabControlPreviewKeyDown(object sender, KeyEventArgs e)
     protected override void OnAttached()
     {
         base.OnAttached();
+        if (DesignerProperties.GetIsInDesignMode(this))
+            return;
+
         AssociatedObject.ScrollChanged += AssociatedObject_ScrollChanged;
         AssociatedObject.SizeChanged += AssociatedObject_SizeChanged;
         Dispatcher.BeginInvoke(() => AddPaddingToScrollableContentIfWiderThanViewPort());
@@ -136,6 +314,9 @@ protected override void OnAttached()
     protected override void OnDetaching()
     {
         base.OnDetaching();
+        if (DesignerProperties.GetIsInDesignMode(this))
+            return;
+
         if (AssociatedObject is { } ao)
         {
             ao.ScrollChanged -= AssociatedObject_ScrollChanged;
@@ -145,6 +326,9 @@ protected override void OnDetaching()
 
     private void AssociatedObject_ScrollChanged(object sender, ScrollChangedEventArgs e)
     {
+        ((SimpleICommandImplementation)PreviousTabCommand!).Refresh();
+        ((SimpleICommandImplementation)NextTabCommand!).Refresh();
+
         if (TabAssist.GetUseHeaderPadding(TabControl) == false)
             return;
         TimeSpan duration = TabAssist.GetScrollDuration(TabControl);
@@ -165,6 +349,9 @@ private void AssociatedObject_ScrollChanged(object sender, ScrollChangedEventArg
         DoubleAnimation scrollAnimation = new(originalValue, newValue, new Duration(duration));
         scrollAnimation.Completed += (_, _) =>
         {
+            ((SimpleICommandImplementation)PreviousTabCommand!).Refresh();
+            ((SimpleICommandImplementation)NextTabCommand!).Refresh();
+
             _desiredScrollStart = null;
             _isAnimatingScroll = false;
 
@@ -173,6 +360,34 @@ private void AssociatedObject_ScrollChanged(object sender, ScrollChangedEventArg
         };
         AssociatedObject.BeginAnimation(TabControlHeaderScrollBehavior.CustomHorizontalOffsetProperty, scrollAnimation);
     }
+
+    private class SimpleICommandImplementation : ICommand
+    {
+        private readonly Action<object?> _execute;
+        private readonly Func<object?, bool> _canExecute;
+
+        public SimpleICommandImplementation(Action<object?> execute)
+            : this(execute, null)
+        { }
+
+        public SimpleICommandImplementation(Action<object?> execute, Func<object?, bool>? canExecute)
+        {
+            _execute = execute ?? throw new ArgumentNullException(nameof(execute));
+            _canExecute = canExecute ?? (x => true);
+        }
+
+        public bool CanExecute(object? parameter) => _canExecute(parameter);
+
+        public void Execute(object? parameter) => _execute(parameter);
+
+        public event EventHandler? CanExecuteChanged
+        {
+            add => CommandManager.RequerySuggested += value;
+            remove => CommandManager.RequerySuggested -= value;
+        }
+
+        public void Refresh() => CommandManager.InvalidateRequerySuggested();
+    }
 }
 
 public enum TabScrollDirection
diff --git a/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlAdditionalHeaderPanelContentMarginConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlAdditionalHeaderPanelContentMarginConverter.cs
new file mode 100644
index 0000000000..2651fe94d4
--- /dev/null
+++ b/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlAdditionalHeaderPanelContentMarginConverter.cs
@@ -0,0 +1,21 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
+
+public class TabControlAdditionalHeaderPanelContentMarginConverter : IMultiValueConverter
+{
+    public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (values is [double scrollableContentWidthDefault, double scrollableContentWidthNonUniform, double controlWidth, StackPanel navPanel, ..])
+        {
+            double scrollableContentWidth = Math.Max(scrollableContentWidthDefault, scrollableContentWidthNonUniform);
+            double xOffset = Math.Min(controlWidth, scrollableContentWidth + navPanel.ActualWidth) - navPanel.ActualWidth;
+            return new Thickness(xOffset, 0, 0, 0);
+        }
+        return new Thickness(0);
+    }
+
+    public object?[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
diff --git a/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonPanelMarginConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonPanelMarginConverter.cs
new file mode 100644
index 0000000000..76d7260267
--- /dev/null
+++ b/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonPanelMarginConverter.cs
@@ -0,0 +1,19 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
+
+public class TabControlNavButtonPanelMarginConverter : IMultiValueConverter
+{
+    public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (values is [Thickness margin, Visibility previousButtonVisibility, Visibility nextButtonVisibility])
+        {
+            return previousButtonVisibility == Visibility.Collapsed && nextButtonVisibility == Visibility.Collapsed ? new Thickness(0) : margin;
+        }
+        return new Thickness(0);
+    }
+
+    public object?[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
diff --git a/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonPanelVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonPanelVisibilityConverter.cs
new file mode 100644
index 0000000000..e3cfc9243c
--- /dev/null
+++ b/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonPanelVisibilityConverter.cs
@@ -0,0 +1,19 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
+
+public class TabControlNavButtonPanelVisibilityConverter : IMultiValueConverter
+{
+    public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (values is [bool useNavigationPanel, bool isOverflowing])
+        {
+            return useNavigationPanel && isOverflowing ? Visibility.Visible : Visibility.Collapsed;
+        }
+        return Visibility.Collapsed;
+    }
+
+    public object?[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}
diff --git a/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonVisibilityConverter.cs
new file mode 100644
index 0000000000..336b9fca83
--- /dev/null
+++ b/src/MaterialDesignThemes.Wpf/Converters/Internal/TabControlNavButtonVisibilityConverter.cs
@@ -0,0 +1,41 @@
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
+
+public class TabControlNavButtonVisibilityConverter : IValueConverter
+{
+    [TypeConverter(typeof(NavigationPanelPlacementTypeConverter))]
+    public NavigationPanelPlacement[] VisiblePlacements { get; set; } = [];
+
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is NavigationPanelPlacement placement)
+        {
+            return VisiblePlacements.Contains(placement) ? Visibility.Visible : Visibility.Collapsed;
+        }
+        return Visibility.Visible;
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+
+    class NavigationPanelPlacementTypeConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
+            => sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+
+        public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
+        {
+            if (value is string s)
+            {
+                return s.Split([',', ' '], StringSplitOptions.RemoveEmptyEntries)
+                        .Select(x => Enum.Parse(typeof(NavigationPanelPlacement), x.Trim()))
+                        .Cast<NavigationPanelPlacement>()
+                        .ToArray();
+            }
+            return base.ConvertFrom(context, culture, value);
+        }
+    }
+}
diff --git a/src/MaterialDesignThemes.Wpf/Properties/AssemblyInfo.cs b/src/MaterialDesignThemes.Wpf/Properties/AssemblyInfo.cs
index a730e8f92a..2d3782e0a7 100644
--- a/src/MaterialDesignThemes.Wpf/Properties/AssemblyInfo.cs
+++ b/src/MaterialDesignThemes.Wpf/Properties/AssemblyInfo.cs
@@ -5,6 +5,11 @@
 [assembly: XmlnsDefinition("http://materialdesigninxaml.net/winfx/xaml/themes", "MaterialDesignThemes.Wpf.Transitions")]
 [assembly: XmlnsDefinition("http://materialdesigninxaml.net/winfx/xaml/themes", "MaterialDesignThemes.Wpf.Converters")]
 
+[assembly: XmlnsPrefix("http://materialdesigninxaml.net/winfx/xaml/themes-internal", "materialDesignInternal")]
+[assembly: XmlnsDefinition("http://materialdesigninxaml.net/winfx/xaml/themes-internal", "MaterialDesignThemes.Wpf.Internal")]
+[assembly: XmlnsDefinition("http://materialdesigninxaml.net/winfx/xaml/themes-internal", "MaterialDesignThemes.Wpf.Converters.Internal")]
+[assembly: XmlnsDefinition("http://materialdesigninxaml.net/winfx/xaml/themes-internal", "MaterialDesignThemes.Wpf.Behaviors.Internal")]
+
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
diff --git a/src/MaterialDesignThemes.Wpf/TabAssist.cs b/src/MaterialDesignThemes.Wpf/TabAssist.cs
index b5ad4374a0..8769559892 100644
--- a/src/MaterialDesignThemes.Wpf/TabAssist.cs
+++ b/src/MaterialDesignThemes.Wpf/TabAssist.cs
@@ -34,6 +34,62 @@ public static void SetHeaderPanelMargin(DependencyObject element, Thickness valu
     public static Thickness GetHeaderPanelMargin(DependencyObject element)
         => (Thickness)element.GetValue(HeaderPanelMarginProperty);
 
+    public static object? GetHeaderPanelCustomContent(DependencyObject obj)
+        => (object?)obj.GetValue(HeaderPanelCustomContentProperty);
+
+    public static void SetHeaderPanelCustomContent(DependencyObject obj, object? value)
+        => obj.SetValue(HeaderPanelCustomContentProperty, value);
+
+    public static readonly DependencyProperty HeaderPanelCustomContentProperty = DependencyProperty.RegisterAttached(
+        "HeaderPanelCustomContent", typeof(object), typeof(TabAssist), new PropertyMetadata(default));
+
+    internal static readonly DependencyPropertyKey IsOverflowingPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
+        "IsOverflowing", typeof(bool), typeof(TabAssist), new PropertyMetadata(false));
+
+    public static readonly DependencyProperty IsOverflowingProperty = IsOverflowingPropertyKey.DependencyProperty;
+
+    public static bool GetIsOverflowing(DependencyObject obj)
+        => (bool)obj.GetValue(IsOverflowingProperty);
+
+    internal static void SetIsOverflowing(DependencyObject obj, bool value)
+    => obj.SetValue(IsOverflowingPropertyKey, value);
+
+    public static bool GetUseNavigationPanel(DependencyObject obj)
+        => (bool)obj.GetValue(UseNavigationPanelProperty);
+
+    public static void SetUseNavigationPanel(DependencyObject obj, bool value)
+        => obj.SetValue(UseNavigationPanelProperty, value);
+
+    public static readonly DependencyProperty UseNavigationPanelProperty = DependencyProperty.RegisterAttached(
+        "UseNavigationPanel", typeof(bool), typeof(TabAssist), new PropertyMetadata(false));
+
+    public static Thickness GetNavigationPanelMargin(DependencyObject obj)
+        => (Thickness)obj.GetValue(NavigationPanelMarginProperty);
+
+    public static void SetNavigationPanelMargin(DependencyObject obj, Thickness value)
+        => obj.SetValue(NavigationPanelMarginProperty, value);
+
+    public static readonly DependencyProperty NavigationPanelMarginProperty = DependencyProperty.RegisterAttached(
+        "NavigationPanelMargin", typeof(Thickness), typeof(TabAssist), new PropertyMetadata(default(Thickness)));
+
+    public static NavigationPanelPlacement GetNavigationPanelPlacement(DependencyObject obj)
+        => (NavigationPanelPlacement)obj.GetValue(NavigationPanelPlacementProperty);
+
+    public static void SetNavigationPanelPlacement(DependencyObject obj, NavigationPanelPlacement value)
+        => obj.SetValue(NavigationPanelPlacementProperty, value);
+
+    public static readonly DependencyProperty NavigationPanelPlacementProperty = DependencyProperty.RegisterAttached(
+        "NavigationPanelPlacement", typeof(NavigationPanelPlacement), typeof(TabAssist), new PropertyMetadata(NavigationPanelPlacement.Split));
+
+    public static NavigationPanelBehavior GetNavigationPanelBehavior(DependencyObject obj)
+        => (NavigationPanelBehavior)obj.GetValue(NavigationPanelBehaviorProperty);
+
+    public static void SetNavigationPanelBehavior(DependencyObject obj, NavigationPanelBehavior value)
+        => obj.SetValue(NavigationPanelBehaviorProperty, value);
+
+    public static readonly DependencyProperty NavigationPanelBehaviorProperty = DependencyProperty.RegisterAttached(
+        "NavigationPanelBehavior", typeof(NavigationPanelBehavior), typeof(TabAssist), new PropertyMetadata(NavigationPanelBehavior.Scroll));
+
     public static Visibility GetBindableIsItemsHost(DependencyObject obj)
         => (Visibility)obj.GetValue(BindableIsItemsHostProperty);
 
@@ -99,3 +155,16 @@ public static void SetScrollDuration(DependencyObject obj, TimeSpan value)
         DependencyProperty.RegisterAttached("ScrollDuration", typeof(TimeSpan),
             typeof(TabAssist), new PropertyMetadata(TimeSpan.Zero));
 }
+
+public enum NavigationPanelPlacement
+{
+    Split,
+    Left,
+    Right
+}
+
+public enum NavigationPanelBehavior
+{
+    Scroll,
+    Select
+}
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml
index 1dd1ee9528..0261ae11cd 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml
@@ -452,6 +452,7 @@
                         Focusable="True"
                         Foreground="{DynamicResource MaterialDesign.Brush.Foreground}"
                         IsTabStop="False"
+                        KeyboardNavigation.TabNavigation="Cycle"
                         Opacity="0"
                         RenderTransformOrigin=".5,.5"
                         Tag="{TemplateBinding DialogBackground}"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
index 0819b32a48..6619e62af9 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+                    xmlns:convertersInternal="clr-namespace:MaterialDesignThemes.Wpf.Converters.Internal"
                     xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
                     xmlns:behaviorsInternal="clr-namespace:MaterialDesignThemes.Wpf.Behaviors.Internal"
                     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
@@ -25,6 +26,15 @@
   </Style>
 
   <ControlTemplate x:Key="ScrollingTabControlTemplate" TargetType="{x:Type TabControl}">
+    <ControlTemplate.Resources>
+      <convertersInternal:TabControlAdditionalHeaderPanelContentMarginConverter x:Key="TabControlAdditionalHeaderPanelContentMarginConverter" />
+      <convertersInternal:TabControlNavButtonPanelVisibilityConverter x:Key="TabControlNavButtonPanelVisibilityConverter" />
+      <convertersInternal:TabControlNavButtonVisibilityConverter x:Key="LeftPreviousTabControlNavButtonVisibilityConverter" VisiblePlacements="Split, Left" />
+      <convertersInternal:TabControlNavButtonVisibilityConverter x:Key="LeftNextTabControlNavButtonVisibilityConverter" VisiblePlacements="Left" />
+      <convertersInternal:TabControlNavButtonVisibilityConverter x:Key="RightPreviousTabControlNavButtonVisibilityConverter" VisiblePlacements="Right" />
+      <convertersInternal:TabControlNavButtonVisibilityConverter x:Key="RightNextTabControlNavButtonVisibilityConverter" VisiblePlacements="Split, Right" />
+      <convertersInternal:TabControlNavButtonPanelMarginConverter x:Key="TabControlNavButtonPanelMarginConverter" />
+    </ControlTemplate.Resources>
     <DockPanel KeyboardNavigation.TabNavigation="Local">
       <wpf:ColorZone x:Name="PART_HeaderZone"
                            VerticalAlignment="Stretch"
@@ -33,37 +43,129 @@
                            Background="{TemplateBinding wpf:ColorZoneAssist.Background}"
                            DockPanel.Dock="Top"
                            Focusable="False">
-        <ScrollViewer wpf:ScrollViewerAssist.BubbleVerticalScroll="True"
-                              wpf:ScrollViewerAssist.SupportHorizontalScroll="True"
-                              wpf:ScrollViewerAssist.IgnorePadding="{Binding Path=(wpf:ScrollViewerAssist.IgnorePadding), RelativeSource={RelativeSource TemplatedParent}}"
-                              wpf:ScrollViewerAssist.PaddingMode="{Binding Path=(wpf:ScrollViewerAssist.PaddingMode), RelativeSource={RelativeSource TemplatedParent}}"
-                              HorizontalScrollBarVisibility="Hidden"
-                              VerticalScrollBarVisibility="Hidden">
-          <b:Interaction.Behaviors>
-            <behaviorsInternal:TabControlHeaderScrollBehavior TabControl="{Binding RelativeSource={RelativeSource TemplatedParent}}" ScrollableContent="{Binding ElementName=ScrollableContent}" />
-          </b:Interaction.Behaviors>
-          <internal:PaddedBringIntoViewStackPanel x:Name="ScrollableContent"
-                                                  ScrollDirection="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(behaviorsInternal:TabControlHeaderScrollBehavior.ScrollDirection)}"
-                                                  HeaderPadding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.HeaderPadding)}"
-                                                  UseHeaderPadding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.UseHeaderPadding)}">
-            <UniformGrid x:Name="CenteredHeaderPanel"
-                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     Margin="{Binding Path=(wpf:TabAssist.HeaderPanelMargin), RelativeSource={RelativeSource TemplatedParent}}"
-                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     wpf:TabAssist.BindableIsItemsHost="{Binding Visibility, RelativeSource={RelativeSource Self}}"
-                                     Focusable="False"
-                                     KeyboardNavigation.TabIndex="1"
-                                     Rows="1" />
-            <VirtualizingStackPanel x:Name="HeaderPanel"
-                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                Margin="{Binding Path=(wpf:TabAssist.HeaderPanelMargin), RelativeSource={RelativeSource TemplatedParent}}"
-                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                wpf:TabAssist.BindableIsItemsHost="{Binding Visibility, RelativeSource={RelativeSource Self}}"
-                                                Focusable="False"
-                                                KeyboardNavigation.TabIndex="1"
-                                                Orientation="Horizontal" />
-          </internal:PaddedBringIntoViewStackPanel>
-        </ScrollViewer>
+        <Grid>
+          <ScrollViewer wpf:ScrollViewerAssist.BubbleVerticalScroll="True"
+                        wpf:ScrollViewerAssist.SupportHorizontalScroll="True"
+                        wpf:ScrollViewerAssist.IgnorePadding="{Binding Path=(wpf:ScrollViewerAssist.IgnorePadding), RelativeSource={RelativeSource TemplatedParent}}"
+                        wpf:ScrollViewerAssist.PaddingMode="{Binding Path=(wpf:ScrollViewerAssist.PaddingMode), RelativeSource={RelativeSource TemplatedParent}}"
+                        HorizontalScrollBarVisibility="Hidden"
+                        VerticalScrollBarVisibility="Hidden">
+            <b:Interaction.Behaviors>
+              <behaviorsInternal:TabControlHeaderScrollBehavior x:Name="TabControlHeaderScrollBehavior"
+                                                                TabControl="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                                                ScrollableContent="{Binding ElementName=ScrollableContent}"
+                                                                AdditionalHeaderPanelContentWidth="{Binding ElementName=AdditionalHeaderPanelContent, Path=ActualWidth}"
+                                                                NavigationPanelLeftWidth="{Binding ElementName=NavigationPanelLeft, Path=ActualWidth}"/>
+            </b:Interaction.Behaviors>
+            <internal:PaddedBringIntoViewStackPanel x:Name="ScrollableContent"
+                                                    ScrollDirection="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(behaviorsInternal:TabControlHeaderScrollBehavior.ScrollDirection)}"
+                                                    HeaderPadding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.HeaderPadding)}"
+                                                    UseHeaderPadding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.UseHeaderPadding)}">
+              <UniformGrid x:Name="CenteredHeaderPanel"
+                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                           Margin="{Binding Path=(wpf:TabAssist.HeaderPanelMargin), RelativeSource={RelativeSource TemplatedParent}}"
+                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                           wpf:TabAssist.BindableIsItemsHost="{Binding Visibility, RelativeSource={RelativeSource Self}}"
+                           Focusable="False"
+                           KeyboardNavigation.TabIndex="1"
+                           Rows="1" />
+              <VirtualizingStackPanel x:Name="HeaderPanel"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      Margin="{Binding Path=(wpf:TabAssist.HeaderPanelMargin), RelativeSource={RelativeSource TemplatedParent}}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      wpf:TabAssist.BindableIsItemsHost="{Binding Visibility, RelativeSource={RelativeSource Self}}"
+                                      Focusable="False"
+                                      KeyboardNavigation.TabIndex="1"
+                                      Orientation="Horizontal" />
+            </internal:PaddedBringIntoViewStackPanel>
+          </ScrollViewer>
+
+          <StackPanel x:Name="AdditionalHeaderPanelContent" Orientation="Horizontal" HorizontalAlignment="Left">
+            <StackPanel.Margin>
+              <MultiBinding Converter="{StaticResource TabControlAdditionalHeaderPanelContentMarginConverter}">
+                <Binding ElementName="CenteredHeaderPanel" Path="ActualWidth" />
+                <Binding ElementName="HeaderPanel" Path="ActualWidth" />
+                <Binding ElementName="PART_HeaderZone" Path="ActualWidth" />
+                <Binding RelativeSource="{RelativeSource Self}" />
+                <!-- Below binding only added to trigger the converter (using it directly will cause converter to be invoked repeatedly due to "rounding errors") -->
+                <Binding ElementName="AdditionalHeaderPanelContent" Path="ActualWidth" />
+              </MultiBinding>
+            </StackPanel.Margin>
+
+            <!-- Navigation panel (right) -->
+            <StackPanel x:Name="NavigationPanelRight" Orientation="Horizontal">
+              <StackPanel.Margin>
+                <MultiBinding Converter="{StaticResource TabControlNavButtonPanelMarginConverter}">
+                  <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TabAssist.NavigationPanelMargin)" />
+                  <Binding ElementName="RightPreviousButton" Path="Visibility" />
+                  <Binding ElementName="RightNextButton" Path="Visibility" />
+                </MultiBinding>
+              </StackPanel.Margin>
+              <StackPanel.Visibility>
+                <MultiBinding Converter="{StaticResource TabControlNavButtonPanelVisibilityConverter}">
+                  <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TabAssist.UseNavigationPanel)" />
+                  <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TabAssist.IsOverflowing)" />
+                </MultiBinding>
+              </StackPanel.Visibility>
+              <Button x:Name="RightPreviousButton"
+                      Width="16"
+                      Height="16"
+                      Padding="0"
+                      Margin="0,0,8,0"
+                      Command="{Binding ElementName=TabControlHeaderScrollBehavior, Path=PreviousTabCommand}"
+                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.NavigationPanelPlacement), Converter={StaticResource RightPreviousTabControlNavButtonVisibilityConverter}}">
+                <wpf:PackIcon Kind="ChevronLeft" Width="12" Height="12" />
+              </Button>
+              <Button x:Name="RightNextButton"
+                      Width="16"
+                      Height="16"
+                      Padding="0"
+                      Command="{Binding ElementName=TabControlHeaderScrollBehavior, Path=NextTabCommand}"
+                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.NavigationPanelPlacement), Converter={StaticResource RightNextTabControlNavButtonVisibilityConverter}}">
+                <wpf:PackIcon Kind="ChevronRight" Width="12" Height="12" />
+              </Button>
+            </StackPanel>
+
+            <!-- Custom content -->
+            <ContentControl Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.HeaderPanelCustomContent)}" />
+          </StackPanel>
+
+          <!-- Navigation panel (left) - for some reason the extra Grid is needed to trigger updates to NavigationPanelLeft.ActualWidth in the binding above -->
+          <Grid x:Name="NavigationPanelLeft" HorizontalAlignment="Left">
+            <StackPanel Orientation="Horizontal">
+              <StackPanel.Margin>
+                <MultiBinding Converter="{StaticResource TabControlNavButtonPanelMarginConverter}">
+                  <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TabAssist.NavigationPanelMargin)" />
+                  <Binding ElementName="LeftPreviousButton" Path="Visibility" />
+                  <Binding ElementName="LeftNextButton" Path="Visibility" />
+                </MultiBinding>
+              </StackPanel.Margin>
+              <StackPanel.Visibility>
+                <MultiBinding Converter="{StaticResource TabControlNavButtonPanelVisibilityConverter}">
+                  <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TabAssist.UseNavigationPanel)" />
+                  <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TabAssist.IsOverflowing)" />
+                </MultiBinding>
+              </StackPanel.Visibility>
+              <Button x:Name="LeftPreviousButton"
+                      Width="16"
+                      Height="16"
+                      Padding="0"
+                      Command="{Binding ElementName=TabControlHeaderScrollBehavior, Path=PreviousTabCommand}"
+                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.NavigationPanelPlacement), Converter={StaticResource LeftPreviousTabControlNavButtonVisibilityConverter}}">
+                <wpf:PackIcon Kind="ChevronLeft" Width="12" Height="12" />
+              </Button>
+              <Button x:Name="LeftNextButton"
+                      Width="16"
+                      Height="16"
+                      Padding="0"
+                      Margin="8,0,0,0"
+                      Command="{Binding ElementName=TabControlHeaderScrollBehavior, Path=NextTabCommand}"
+                      Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TabAssist.NavigationPanelPlacement), Converter={StaticResource LeftNextTabControlNavButtonVisibilityConverter}}">
+                <wpf:PackIcon Kind="ChevronRight" Width="12" Height="12" />
+              </Button>
+            </StackPanel>
+          </Grid>
+        </Grid>
       </wpf:ColorZone>
 
       <Border x:Name="PART_BorderSelectedContent"
@@ -240,6 +342,7 @@
     <Setter Property="wpf:TabAssist.HeaderPadding" Value="40" />
     <Setter Property="wpf:TabAssist.UseHeaderPadding" Value="True" />
     <Setter Property="wpf:TabAssist.ScrollDuration" Value="0:0:0.250" />
+    <Setter Property="wpf:TabAssist.NavigationPanelMargin" Value="8,0" />
 
     <Style.Triggers>
       <Trigger Property="wpf:TabAssist.HeaderBehavior" Value="Wrapping">
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
index a043a77973..0c554972f2 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
@@ -17,7 +17,7 @@
   </ResourceDictionary.MergedDictionaries>
 
   <Style x:Key="MaterialDesignToolBarVerticalOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.ToolBar.Background}" />
+    <Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource AncestorType=ToolBar}}" />
     <Setter Property="MinHeight" Value="0" />
     <Setter Property="MinWidth" Value="0" />
     <Setter Property="Template">
@@ -55,7 +55,7 @@
   </Style>
 
   <Style x:Key="MaterialDesignToolBarHorizontalOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.ToolBar.Background}" />
+    <Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource AncestorType=ToolBar}}" />
     <Setter Property="MinHeight" Value="0" />
     <Setter Property="MinWidth" Value="0" />
     <Setter Property="Template">
@@ -187,7 +187,7 @@
                      CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
                 <Border x:Name="ToolBarSubMenuBorder"
                         Margin="1"
-                        Background="{DynamicResource MaterialDesign.Brush.ToolBar.Background}"
+                        Background="{TemplateBinding Background}"
                         BorderBrush="{DynamicResource MaterialDesign.Brush.ToolBar.Overflow.Border}"
                         BorderThickness="1"
                         CornerRadius="2"
@@ -246,7 +246,6 @@
               <Setter TargetName="ToolBarSubMenuBorder" Property="Margin" Value="5,5,5,5" />
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
-              <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.ToolBar.Background}" />
               <Setter TargetName="Grid" Property="Margin" Value="1,3,1,1" />
               <Setter TargetName="MainPanelBorder" Property="Margin" Value="0,0,0,11" />
               <Setter TargetName="OverflowButton" Property="Style" Value="{StaticResource MaterialDesignToolBarVerticalOverflowButtonStyle}" />
diff --git a/tests/MaterialColorUtilities.Tests/CustomSemanticSwatchTests.cs b/tests/MaterialColorUtilities.Tests/CustomSemanticSwatchTests.cs
new file mode 100644
index 0000000000..f835896293
--- /dev/null
+++ b/tests/MaterialColorUtilities.Tests/CustomSemanticSwatchTests.cs
@@ -0,0 +1,167 @@
+using System.Windows.Media;
+
+namespace MaterialColorUtilities.Tests;
+
+public sealed class CustomSemanticSwatchTests
+{
+    [Test]
+    [Arguments(true)]
+    [Arguments(false)]
+    public async Task CustomSemanticSwatches_ExtractExpectedThemeColors(bool isDark)
+    {
+        MaterialDynamicColors materialDynamicColors = new();
+
+        foreach (var semanticColor in GetSemanticColorExpectations())
+        {
+            var expected = isDark ? semanticColor.Dark : semanticColor.Light;
+            var scheme = CreateSchemeWithCustomErrorSwatch(semanticColor.Swatch, isDark);
+
+            await Assert.That(materialDynamicColors.ErrorPaletteKeyColor.GetColor(scheme))
+                .IsEqualTo(expected.PaletteKey)
+                .Because($"{semanticColor.Name} palette key did not match for {(isDark ? "dark" : "light")} mode.");
+
+            await Assert.That(materialDynamicColors.Error.GetColor(scheme))
+                .IsEqualTo(expected.Role)
+                .Because($"{semanticColor.Name} role color did not match for {(isDark ? "dark" : "light")} mode.");
+
+            await Assert.That(materialDynamicColors.OnError.GetColor(scheme))
+                .IsEqualTo(expected.OnRole)
+                .Because($"{semanticColor.Name} on-role color did not match for {(isDark ? "dark" : "light")} mode.");
+
+            await Assert.That(materialDynamicColors.ErrorContainer.GetColor(scheme))
+                .IsEqualTo(expected.Container)
+                .Because($"{semanticColor.Name} container color did not match for {(isDark ? "dark" : "light")} mode.");
+
+            await Assert.That(materialDynamicColors.OnErrorContainer.GetColor(scheme))
+                .IsEqualTo(expected.OnContainer)
+                .Because($"{semanticColor.Name} on-container color did not match for {(isDark ? "dark" : "light")} mode.");
+        }
+    }
+
+    private static DynamicScheme CreateSchemeWithCustomErrorSwatch(Color semanticSwatch, bool isDark)
+    {
+        var sourceColor = Color.FromArgb(255, 106, 156, 89);
+        var baseScheme = DynamicSchemeFactory.Create(
+            sourceColor,
+            Variant.TonalSpot,
+            isDark,
+            0.5,
+            Platform.Phone,
+            SpecVersion.Spec2025,
+            primary: null,
+            secondary: null,
+            tertiary: null,
+            neutral: null,
+            neutralVariant: null,
+            error: null);
+
+        return new DynamicScheme(
+            baseScheme.SourceColorHct,
+            baseScheme.Variant,
+            baseScheme.IsDark,
+            baseScheme.ContrastLevel,
+            baseScheme.PlatformType,
+            baseScheme.SpecVersion,
+            baseScheme.PrimaryPalette,
+            baseScheme.SecondaryPalette,
+            baseScheme.TertiaryPalette,
+            baseScheme.NeutralPalette,
+            baseScheme.NeutralVariantPalette,
+            TonalPalette.FromInt(ColorUtils.ArgbFromColor(semanticSwatch)));
+    }
+
+    private static SemanticColorExpectation[] GetSemanticColorExpectations()
+    {
+        return
+        [
+            new SemanticColorExpectation(
+                "WarningHigh",
+                Color.FromArgb(255, 212, 69, 41),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 212, 69, 41),
+                    Role: Color.FromArgb(255, 111, 15, 0),
+                    OnRole: Colors.White,
+                    Container: Color.FromArgb(255, 198, 59, 32),
+                    OnContainer: Colors.White),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 212, 69, 41),
+                    Role: Color.FromArgb(255, 255, 210, 201),
+                    OnRole: Color.FromArgb(255, 80, 8, 0),
+                    Container: Color.FromArgb(255, 247, 94, 63),
+                    OnContainer: Colors.Black)),
+            new SemanticColorExpectation(
+                "WarningLow",
+                Color.FromArgb(255, 252, 163, 41),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 252, 163, 41),
+                    Role: Color.FromArgb(255, 80, 47, 0),
+                    OnRole: Colors.White,
+                    Container: Color.FromArgb(255, 156, 95, 0),
+                    OnContainer: Colors.White),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 252, 163, 41),
+                    Role: Color.FromArgb(255, 255, 213, 169),
+                    OnRole: Color.FromArgb(255, 57, 32, 0),
+                    Container: Color.FromArgb(255, 205, 127, 0),
+                    OnContainer: Colors.Black)),
+            new SemanticColorExpectation(
+                "Information",
+                Color.FromArgb(255, 0, 46, 122),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 0, 46, 122),
+                    Role: Color.FromArgb(255, 5, 49, 125),
+                    OnRole: Colors.White,
+                    Container: Color.FromArgb(255, 76, 106, 184),
+                    OnContainer: Colors.White),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 0, 46, 122),
+                    Role: Color.FromArgb(255, 210, 219, 255),
+                    OnRole: Color.FromArgb(255, 0, 33, 93),
+                    Container: Color.FromArgb(255, 112, 142, 222),
+                    OnContainer: Colors.Black)),
+            new SemanticColorExpectation(
+                "Safe",
+                Color.FromArgb(255, 41, 138, 64),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 41, 138, 64),
+                    Role: Color.FromArgb(255, 0, 64, 21),
+                    OnRole: Colors.White,
+                    Container: Color.FromArgb(255, 24, 126, 53),
+                    OnContainer: Colors.White),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 41, 138, 64),
+                    Role: Color.FromArgb(255, 145, 242, 155),
+                    OnRole: Color.FromArgb(255, 0, 45, 12),
+                    Container: Color.FromArgb(255, 69, 163, 86),
+                    OnContainer: Colors.Black)),
+            new SemanticColorExpectation(
+                "Error",
+                Color.FromArgb(255, 163, 23, 26),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 163, 23, 26),
+                    Role: Color.FromArgb(255, 115, 0, 9),
+                    OnRole: Colors.White,
+                    Container: Color.FromArgb(255, 201, 53, 49),
+                    OnContainer: Colors.White),
+                new ExtractedSemanticColors(
+                    PaletteKey: Color.FromArgb(255, 163, 23, 26),
+                    Role: Color.FromArgb(255, 255, 210, 205),
+                    OnRole: Color.FromArgb(255, 84, 0, 4),
+                    Container: Color.FromArgb(255, 251, 89, 80),
+                    OnContainer: Colors.Black))
+        ];
+    }
+
+    private sealed record SemanticColorExpectation(
+        string Name,
+        Color Swatch,
+        ExtractedSemanticColors Light,
+        ExtractedSemanticColors Dark);
+
+    private sealed record ExtractedSemanticColors(
+        Color PaletteKey,
+        Color Role,
+        Color OnRole,
+        Color Container,
+        Color OnContainer);
+}
diff --git a/tests/MaterialColorUtilities.Tests/DynamicSchemeTests.cs b/tests/MaterialColorUtilities.Tests/DynamicSchemeTests.cs
index aa4399b291..6eed13b846 100644
--- a/tests/MaterialColorUtilities.Tests/DynamicSchemeTests.cs
+++ b/tests/MaterialColorUtilities.Tests/DynamicSchemeTests.cs
@@ -88,7 +88,7 @@ public async Task CreateThemeFromColor()
             () => mdc.TertiaryPaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x2B, 0x9F, 0x94)),
             () => mdc.NeutralPaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x75, 0x78, 0x71)),
             () => mdc.NeutralVariantPaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x72, 0x79, 0x6C)),
-            () => mdc.ErrorPaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xDE, 0x37, 0x30)),
+            () => mdc.ErrorPaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xA3, 0x17, 0x1A)),
 
             // Surfaces [S]
             () => mdc.Background.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x11, 0x14, 0x0F)),
@@ -108,8 +108,8 @@ public async Task CreateThemeFromColor()
             () => mdc.OutlineVariant.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x8B, 0x93, 0x85)),
             () => mdc.InverseSurface.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xE1, 0xE3, 0xDB)),
             () => mdc.InverseOnSurface.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x28, 0x2B, 0x25)),
-            () => mdc.Shadow.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x00, 0x00)),
-            () => mdc.Scrim.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x00, 0x00)),
+            () => mdc.Shadow.GetColor(scheme).ShouldBe(Colors.Black),
+            () => mdc.Scrim.GetColor(scheme).ShouldBe(Colors.Black),
             () => mdc.SurfaceTint.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x9F, 0xD5, 0x8B)),
 
             // Primaries [P]
@@ -117,7 +117,7 @@ public async Task CreateThemeFromColor()
             () => mdc.PrimaryDim?.GetColor(scheme).ShouldBe(Color.FromArgb(0x00, 0x00, 0x00, 0x00)),
             () => mdc.OnPrimary.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x04, 0x2D, 0x00)),
             () => mdc.PrimaryContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x6B, 0x9D, 0x5A)),
-            () => mdc.OnPrimaryContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x00, 0x00)),
+            () => mdc.OnPrimaryContainer.GetColor(scheme).ShouldBe(Colors.Black),
             () => mdc.PrimaryFixed.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xBB, 0xF1, 0xA5)),
             () => mdc.PrimaryFixedDim.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x9F, 0xD5, 0x8B)),
             () => mdc.OnPrimaryFixed.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x01, 0x16, 0x00)),
@@ -129,7 +129,7 @@ public async Task CreateThemeFromColor()
             () => mdc.SecondaryDim?.GetColor(scheme).ShouldBe(Color.FromArgb(0x00, 0x00, 0x00, 0x00)),
             () => mdc.OnSecondary.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x18, 0x2A, 0x12)),
             () => mdc.SecondaryContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x81, 0x97, 0x77)),
-            () => mdc.OnSecondaryContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x00, 0x00)),
+            () => mdc.OnSecondaryContainer.GetColor(scheme).ShouldBe(Colors.Black),
 
             // Secondary Fixed [QF]
             () => mdc.SecondaryFixed.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xD2, 0xE9, 0xC5)),
@@ -142,7 +142,7 @@ public async Task CreateThemeFromColor()
             () => mdc.TertiaryDim?.GetColor(scheme).ShouldBe(Color.FromArgb(0x00, 0x00, 0x00, 0x00)),
             () => mdc.OnTertiary.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x2B, 0x27)),
             () => mdc.TertiaryContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x2D, 0xA1, 0x96)),
-            () => mdc.OnTertiaryContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x00, 0x00)),
+            () => mdc.OnTertiaryContainer.GetColor(scheme).ShouldBe(Colors.Black),
 
             // Tertiary Fixed [TF]
             () => mdc.TertiaryFixed.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x8B, 0xF5, 0xE8)),
@@ -151,11 +151,39 @@ public async Task CreateThemeFromColor()
             () => mdc.OnTertiaryFixedVariant.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x3E, 0x38)),
 
             // Errors [E]
-            () => mdc.Error.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xFF, 0xD2, 0xCC)),
+            () => mdc.Error.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xFF, 0xD2, 0xCD)),
             () => mdc.ErrorDim?.GetColor(scheme).ShouldBe(Color.FromArgb(0x00, 0x00, 0x00, 0x00)),
-            () => mdc.OnError.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x54, 0x00, 0x03)),
-            () => mdc.ErrorContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xFF, 0x54, 0x49)),
-            () => mdc.OnErrorContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x00, 0x00)),
+            () => mdc.OnError.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x54, 0x00, 0x04)),
+            () => mdc.ErrorContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xFB, 0x59, 0x50)),
+            () => mdc.OnErrorContainer.GetColor(scheme).ShouldBe(Colors.Black),
+
+            // Warning High [WH]
+            () => mdc.WarningHighPaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(255, 212, 69, 41)),
+            () => mdc.WarningHigh.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xFF, 0xD2, 0xC9)),
+            () => mdc.OnWarningHigh.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x50, 0x08, 0x00)),
+            () => mdc.WarningHighContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xF7, 0x5E, 0x3F)),
+            () => mdc.OnWarningHighContainer.GetColor(scheme).ShouldBe(Colors.Black),
+
+            // Warning Low [WL]
+            () => mdc.WarningLowPaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(255, 252, 163, 41)),
+            () => mdc.WarningLow.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xFF, 0xD5, 0xA9)),
+            () => mdc.OnWarningLow.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x39, 0x20, 0x00)),
+            () => mdc.WarningLowContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xCD, 0x7F, 0x00)),
+            () => mdc.OnWarningLowContainer.GetColor(scheme).ShouldBe(Colors.Black),
+
+            // Information [I]
+            () => mdc.InformationPaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(255, 0, 46, 122)),
+            () => mdc.Information.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0xD2, 0xDB, 0xFF)),
+            () => mdc.OnInformation.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x21, 0x5D)),
+            () => mdc.InformationContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x70, 0x8E, 0xDE)),
+            () => mdc.OnInformationContainer.GetColor(scheme).ShouldBe(Colors.Black),
+
+            // Safe [S]
+            () => mdc.SafePaletteKeyColor.GetColor(scheme).ShouldBe(Color.FromArgb(255, 41, 138, 64)),
+            () => mdc.Safe.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x91, 0xF2, 0x9B)),
+            () => mdc.OnSafe.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x00, 0x2D, 0x0C)),
+            () => mdc.SafeContainer.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x45, 0xA3, 0x56)),
+            () => mdc.OnSafeContainer.GetColor(scheme).ShouldBe(Colors.Black),
 
             // Android-only
             () => mdc.ControlActivated.GetColor(scheme).ShouldBe(Color.FromArgb(0xFF, 0x23, 0x51, 0x17)),
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
index 088c82ad1a..8009e45c41 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
@@ -4,7 +4,6 @@
 
 using static MaterialDesignThemes.UITests.MaterialDesignSpec;
 
-
 namespace MaterialDesignThemes.UITests.WPF.DialogHosts;
 
 public class DialogHostTests : TestBase
@@ -514,4 +513,66 @@ await Wait.For(async () =>
 
         recorder.Success();
     }
+
+    [Test]
+    [Description("Issue 4027")]
+    [Arguments("", new[] { Key.Tab })]
+    [Arguments("", new[] { Key.LeftShift, Key.Tab })]
+    [Arguments("MaterialDesignEmbeddedDialogHost", new[] { Key.Tab })]
+    [Arguments("MaterialDesignEmbeddedDialogHost", new[] { Key.LeftShift, Key.Tab })]
+    public async Task DialogHost_TrapsFocusInsidePopup_WhenTabbing(string dialogHostStyle, Key[] inputActions)
+    {
+        await using var recorder = new TestRecorder(App);
+
+        var dialogHost = await LoadXaml<DialogHost>("""
+    <materialDesign:DialogHost>
+        <Grid>
+            <StackPanel>
+                <TextBox />
+                <Button x:Name="btnOpenDialog"
+                        Content="Open dialog"
+                        Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}" />
+            </StackPanel>
+        </Grid>
+
+        <materialDesign:DialogHost.DialogContent>
+            <StackPanel Width="300">
+                <TextBox x:Name="TextBoxOne" />
+                <TextBox x:Name="TextBoxTwo" />
+            </StackPanel>
+        </materialDesign:DialogHost.DialogContent>
+    </materialDesign:DialogHost>
+    """);
+
+        if (!string.IsNullOrEmpty(dialogHostStyle))
+        {
+            await dialogHost.RemoteExecute(SetDialogHostStyle, dialogHostStyle);
+        }
+
+        var openDialogButton = await dialogHost.GetElement<Button>("btnOpenDialog");
+        var textBoxOne = await dialogHost.GetElement<TextBox>("TextBoxOne");
+        var textBoxTwo = await dialogHost.GetElement<TextBox>("TextBoxTwo");
+
+        await openDialogButton.LeftClick();
+
+        // By default the first focusable element should be focused
+        await Wait.For(async () => await Assert.That(await textBoxOne.GetIsFocused()).IsTrue());
+
+        await textBoxOne.SendInput(new KeyboardInput(inputActions));
+        
+        await Wait.For(async () => await Assert.That(await textBoxTwo.GetIsFocused()).IsTrue());
+
+        await textBoxTwo.SendInput(new KeyboardInput(inputActions));
+
+        await Wait.For(async () => await Assert.That(await textBoxOne.GetIsFocused()).IsTrue());
+
+        recorder.Success();
+
+        static object SetDialogHostStyle(DialogHost dialogHost, string styleName)
+        {
+            var style = (Style)dialogHost.FindResource(styleName);
+            dialogHost.Style = style;
+            return null!;
+        }
+    }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
index a5d23a6461..7e5d048996 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
@@ -221,4 +221,288 @@ public async Task ScrollingTabs_WithLessTabsThanScreenRealEstate_ShouldNotAddLef
 
         recorder.Success();
     }
+
+    [Test]
+    [Arguments("", 5, false)]                                     // UniformGrid style
+    [Arguments("", 20, true)]                                     // UniformGrid style
+    [Arguments("HorizontalContentAlignment=\"Left\"", 5, false)]  // VirtualizingStackPanel style
+    [Arguments("HorizontalContentAlignment=\"Left\"", 20, true)]  // VirtualizingStackPanel style
+    public async Task ScrollingTabs_WithNavigationPanels_ShouldCorrectlySetIsOverflowingAndNavigationPanelVisibility(string additionalProperties, int numberOfTabs, bool expectedToOverflow)
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        StringBuilder xaml = new($"""
+            <TabControl materialDesign:TabAssist.UseNavigationPanel="True" {additionalProperties}>
+            """);
+            
+        for (int i = 1; i <= numberOfTabs; i++)
+        {
+            xaml.Append($"""
+                <TabItem Header="TAB {i}">
+                  <TextBlock Margin="8" Text="Tab {i}" />
+                </TabItem>
+                """);
+        }
+        xaml.Append("</TabControl>");
+        IVisualElement<TabControl> tabControl = await LoadXaml<TabControl>(xaml.ToString());
+        IVisualElement<StackPanel> navigationPanelLeft = await (await tabControl.GetElement<Grid>("NavigationPanelLeft")).GetElement<StackPanel>();
+        IVisualElement<StackPanel> navigationPanelRight = await tabControl.GetElement<StackPanel>("NavigationPanelRight");
+
+        static bool GetIsOverflowing(TabControl tc) => TabAssist.GetIsOverflowing(tc);
+
+        //Act
+        bool isOverflowing = await tabControl.RemoteExecute(GetIsOverflowing);
+        Visibility navigationPanelLeftVisibility = await navigationPanelLeft.GetVisibility();
+        Visibility navigationPanelRightVisibility = await navigationPanelRight.GetVisibility();
+
+        // Assert
+        await Assert.That(isOverflowing).IsEqualTo(expectedToOverflow);
+        await Assert.That(navigationPanelLeftVisibility).IsEqualTo(expectedToOverflow ? Visibility.Visible : Visibility.Collapsed);
+        await Assert.That(navigationPanelRightVisibility).IsEqualTo(expectedToOverflow ? Visibility.Visible : Visibility.Collapsed);
+
+        recorder.Success();
+    }
+
+    [Test]
+    [Arguments("")]                                     // UniformGrid style
+    [Arguments("HorizontalContentAlignment=\"Left\"")]  // VirtualizingStackPanel style
+    public async Task ScrollingTabs_WithNavigationPanelLeft_ShouldCorrectlySetIsOverflowingAndNavigationPanelLeftVisibility(string additionalProperties)
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        StringBuilder xaml = new($"""
+            <TabControl materialDesign:TabAssist.UseNavigationPanel="True" materialDesign:TabAssist.NavigationPanelPlacement="Left" {additionalProperties}>
+            """);
+
+        const int numTabs = 20;
+        for (int i = 1; i <= numTabs; i++)
+        {
+            xaml.Append($"""
+                <TabItem Header="TAB {i}">
+                  <TextBlock Margin="8" Text="Tab {i}" />
+                </TabItem>
+                """);
+        }
+        xaml.Append("</TabControl>");
+        IVisualElement<TabControl> tabControl = await LoadXaml<TabControl>(xaml.ToString());
+        IVisualElement<StackPanel> navigationPanel = await (await tabControl.GetElement<Grid>("NavigationPanelLeft")).GetElement<StackPanel>();
+
+        static bool GetIsOverflowing(TabControl tc) => TabAssist.GetIsOverflowing(tc);
+
+        //Act
+        bool isOverflowing = await tabControl.RemoteExecute(GetIsOverflowing);
+        Visibility navigationPanelVisibility = await navigationPanel.GetVisibility();
+
+        // Assert
+        await Assert.That(isOverflowing).IsEqualTo(true);
+        await Assert.That(navigationPanelVisibility).IsEqualTo(Visibility.Visible);
+
+        recorder.Success();
+    }
+
+    [Test]
+    [Arguments("")]                                     // UniformGrid style
+    [Arguments("HorizontalContentAlignment=\"Left\"")]  // VirtualizingStackPanel style
+    public async Task ScrollingTabs_WithNavigationPanelRight_ShouldCorrectlySetIsOverflowingAndNavigationPanelLeftVisibility(string additionalProperties)
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        StringBuilder xaml = new($"""
+            <TabControl materialDesign:TabAssist.UseNavigationPanel="True" materialDesign:TabAssist.NavigationPanelPlacement="Right" {additionalProperties}>
+            """);
+
+        const int numTabs = 20;
+        for (int i = 1; i <= numTabs; i++)
+        {
+            xaml.Append($"""
+                <TabItem Header="TAB {i}">
+                  <TextBlock Margin="8" Text="Tab {i}" />
+                </TabItem>
+                """);
+        }
+        xaml.Append("</TabControl>");
+        IVisualElement<TabControl> tabControl = await LoadXaml<TabControl>(xaml.ToString());
+        IVisualElement<StackPanel> navigationPanel = await tabControl.GetElement<StackPanel>("NavigationPanelRight");
+
+        static bool GetIsOverflowing(TabControl tc) => TabAssist.GetIsOverflowing(tc);
+
+        //Act
+        bool isOverflowing = await tabControl.RemoteExecute(GetIsOverflowing);
+        Visibility navigationPanelVisibility = await navigationPanel.GetVisibility();
+
+        // Assert
+        await Assert.That(isOverflowing).IsEqualTo(true);
+        await Assert.That(navigationPanelVisibility).IsEqualTo(Visibility.Visible);
+
+        recorder.Success();
+    }
+
+    [Test]
+    [Arguments("")]                                     // UniformGrid style
+    [Arguments("HorizontalContentAlignment=\"Left\"")]  // VirtualizingStackPanel style
+    public async Task ScrollingTabs_WithNavigationPanelAndSelectBehavior_ShouldChangeSelectedTabWhenClicked(string additionalProperties)
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        StringBuilder xaml = new($"""
+            <TabControl materialDesign:TabAssist.UseNavigationPanel="True" materialDesign:TabAssist.NavigationPanelBehavior="Select" {additionalProperties}>
+            """);
+
+        const int numTabs = 20;
+        for (int i = 1; i <= numTabs; i++)
+        {
+            xaml.Append($"""
+                <TabItem Header="TAB {i}">
+                  <TextBlock Margin="8" Text="Tab {i}" />
+                </TabItem>
+                """);
+        }
+        xaml.Append("</TabControl>");
+        IVisualElement<TabControl> tabControl = await LoadXaml<TabControl>(xaml.ToString());
+        IVisualElement<ScrollViewer> scrollViewer = await tabControl.GetElement<ScrollViewer>();
+        IVisualElement<StackPanel> navigationPanel = await tabControl.GetElement<StackPanel>("NavigationPanelRight");
+        IVisualElement<Button> rightNextButton = await navigationPanel.GetElement<Button>("RightNextButton");
+
+        static bool GetIsOverflowing(TabControl tc) => TabAssist.GetIsOverflowing(tc);
+
+        //Act
+        await Wait.For(async () => await tabControl.RemoteExecute(GetIsOverflowing));
+        await Wait.For(async () => await rightNextButton.GetIsEnabled());
+        await Wait.For(async () =>
+        {
+            await rightNextButton.LeftClick();
+            return await tabControl.GetSelectedIndex() > 0;
+        }, new Retry(10, TimeSpan.FromSeconds(5)));
+
+        // Assert
+        await Assert.That(await tabControl.GetSelectedIndex()).IsGreaterThanOrEqualTo(1);
+        await Assert.That(await scrollViewer.GetContentHorizontalOffset()).IsEqualTo(0);
+
+        recorder.Success();
+    }
+
+    [Test]
+    [Arguments("")]                                     // UniformGrid style
+    [Arguments("HorizontalContentAlignment=\"Left\"")]  // VirtualizingStackPanel style
+    public async Task ScrollingTabs_WithNavigationPanelAndScrollBehavior_ShouldScrollWhenClicked(string additionalProperties)
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        StringBuilder xaml = new($"""
+            <TabControl materialDesign:TabAssist.UseNavigationPanel="True" materialDesign:TabAssist.NavigationPanelBehavior="Scroll" {additionalProperties}>
+            """);
+
+        const int numTabs = 20;
+        for (int i = 1; i <= numTabs; i++)
+        {
+            xaml.Append($"""
+                <TabItem Header="TAB {i}">
+                  <TextBlock Margin="8" Text="Tab {i}" />
+                </TabItem>
+                """);
+        }
+        xaml.Append("</TabControl>");
+        IVisualElement<TabControl> tabControl = await LoadXaml<TabControl>(xaml.ToString());
+        IVisualElement<ScrollViewer> scrollViewer = await tabControl.GetElement<ScrollViewer>();
+        IVisualElement<StackPanel> navigationPanel = await tabControl.GetElement<StackPanel>("NavigationPanelRight");
+        IVisualElement<Button> rightNextButton = await navigationPanel.GetElement<Button>("RightNextButton");
+
+        static bool GetIsOverflowing(TabControl tc) => TabAssist.GetIsOverflowing(tc);
+
+        //Act
+        await Wait.For(async () => await tabControl.RemoteExecute(GetIsOverflowing));
+        await Wait.For(async() => await rightNextButton.GetIsEnabled());
+        await Wait.For(async () =>
+        {
+            await rightNextButton.LeftClick();
+            return await scrollViewer.GetContentHorizontalOffset() > 0;
+        }, new Retry(10, TimeSpan.FromSeconds(5)));
+
+        // Assert
+        await Assert.That(await tabControl.GetSelectedIndex()).IsEqualTo(0);
+        await Assert.That(await scrollViewer.GetContentHorizontalOffset()).IsGreaterThan(0);
+
+        recorder.Success();
+    }
+
+    [Test]
+    public async Task ScrollingTabs_NavigationPanel_ScrollsAndBringsSelectedTabIntoView()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        // Arrange
+        const int numTabs = 20;
+        StringBuilder xaml = new($"<TabControl Width=\"504\" materialDesign:TabAssist.HeaderBehavior=\"Scrolling\" materialDesign:TabAssist.UseNavigationPanel=\"True\" materialDesign:TabAssist.NavigationPanelPlacement=\"Right\">");
+        for (int i = 1; i <= numTabs; i++)
+        {
+            xaml.Append($"""
+            <TabItem Header="TAB {i}">
+              <TextBlock Margin="8" Text="Tab {i}" />
+            </TabItem>
+            """);
+        }
+        xaml.Append("</TabControl>");
+
+        IVisualElement<TabControl> tabControl = await LoadXaml<TabControl>(xaml.ToString());
+        IVisualElement<PaddedBringIntoViewStackPanel> headerPanel = await tabControl.GetElement<PaddedBringIntoViewStackPanel>();
+        IVisualElement<ScrollViewer> scrollViewer = await tabControl.GetElement<ScrollViewer>();
+        IVisualElement<StackPanel> navigationPanel = await tabControl.GetElement<StackPanel>("NavigationPanelRight");
+        IVisualElement<Button> rightNextButton = await navigationPanel.GetElement<Button>("RightNextButton");
+        IVisualElement<Button> rightPreviousButton = await navigationPanel.GetElement<Button>("RightPreviousButton");
+
+        static bool GetIsOverflowing(TabControl tc) => TabAssist.GetIsOverflowing(tc);
+        var retry = new Retry(10, TimeSpan.FromSeconds(5));
+
+        // Act
+        // Wait for layout to complete and overflow to be detected
+        await Wait.For(async () => await tabControl.RemoteExecute(GetIsOverflowing));
+
+        // Scroll right once
+        double offsetBefore = await scrollViewer.GetContentHorizontalOffset();
+        await Wait.For(async () => await rightNextButton.GetIsEnabled());
+        await Task.Delay(200);
+        await rightNextButton.LeftClick();
+        await Wait.For(async () => await scrollViewer.GetContentHorizontalOffset() > offsetBefore, retry);
+
+        // Select an arbitrary tab (index 8)
+        IVisualElement<TabItem> someTab = await tabControl.GetElement<TabItem>("/TabItem[8]");
+        await someTab.LeftClick();
+        await Wait.For(async () => await tabControl.GetSelectedIndex() == 8, retry);
+
+        // Scroll back to the left
+        double offsetAfterScrollRight = await scrollViewer.GetContentHorizontalOffset();
+        await Wait.For(async () => await rightPreviousButton.GetIsEnabled());
+        await rightPreviousButton.LeftClick();
+        await Wait.For(async () => await scrollViewer.GetContentHorizontalOffset() < offsetAfterScrollRight, retry);
+
+        // Select the last visible tab
+        // NB: The last visible tab is "hardcoded" to always be index 4 due to the fixed Width of 504 on the TabControl
+        IVisualElement<TabItem> lastVisibleTab = await tabControl.GetElement<TabItem>($"/TabItem[4]");
+        await lastVisibleTab.LeftClick();
+        await Wait.For(async () => await tabControl.GetSelectedIndex() == 4, retry);
+
+        // Assert
+        int selectedTabIndex = await tabControl.GetSelectedIndex();
+        await Assert.That(selectedTabIndex).IsEqualTo(4);
+
+        double offsetWhenOverflowingWidth = await headerPanel.GetHeaderPadding();
+        Thickness margin = await headerPanel.GetMargin();
+
+        await Assert.That(offsetWhenOverflowingWidth).IsGreaterThan(0);
+        await Assert.That(margin.Left).IsEqualTo(offsetWhenOverflowingWidth);
+
+        static Thickness GetNavigationPanelMargin(TabControl tc) => TabAssist.GetNavigationPanelMargin(tc);
+
+        Thickness navigationPanelMargin = await tabControl.RemoteExecute(GetNavigationPanelMargin);
+        double navigationPanelActualWidth = await navigationPanel.GetActualWidth() + navigationPanelMargin.Left + navigationPanelMargin.Right;
+
+        await Assert.That(margin.Right).IsEqualTo(offsetWhenOverflowingWidth + navigationPanelActualWidth);
+
+        recorder.Success();
+    }
 }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
index 9c576eb180..47e84bbb91 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Windows.Media;
 
 
 namespace MaterialDesignThemes.UITests.WPF.ToolBars;
@@ -30,4 +31,28 @@ public async Task ToolBar_OverflowGrid_RespectsOrientation(Orientation orientati
 
         recorder.Success();
     }
+
+    [Description("Issue 3694")]
+    [Test]
+    public async Task ToolBar_OverflowButton_InheritsCustomBackground()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        var toolBarTray = await LoadXaml<ToolBarTray>(@"
+<ToolBarTray DockPanel.Dock=""Top"">
+  <ToolBar Style=""{StaticResource MaterialDesignToolBar}"" Background=""Fuchsia"" OverflowMode=""Always"">
+    <Button Content=""{materialDesign:PackIcon Kind=File}""/>
+  </ToolBar>
+</ToolBarTray>");
+        var overflowButton = await toolBarTray.GetElement<ToggleButton>("OverflowButton");
+
+        //Act
+        Color? overflowBackground = await overflowButton.GetBackgroundColor();
+
+        //Assert
+        await Assert.That(overflowBackground).IsEqualTo(Colors.Fuchsia);
+
+        recorder.Success();
+    }
 }