From b44c2ccd8c7a1be5c3ea0e50f5c0d2120245fafe Mon Sep 17 00:00:00 2001
From: SlimeNull <slimenull@outlook.com>
Date: Fri, 30 Aug 2024 16:41:40 +0800
Subject: [PATCH] feat: more about fluent design

---
 .../FluentResource.cs                         | 154 +++++++++++--
 .../FluentResourceNames.txt                   | 133 +++++++++++
 .../Styles/OverviewResources.xaml             | 100 +++++----
 .../Styles/PasswordBoxResources.xaml          |  38 ++--
 .../Styles/TextBoxResources.xaml              |  38 ++--
 EleCho.WpfSuite.FluentDesign/Themes/Dark.xaml | 166 +++++++++++++-
 .../Themes/Light.xaml                         | 210 +++++++++++++-----
 EleCho.WpfSuite/Controls/ScrollBar.cs         |  10 +-
 .../Controls/ScrollBarResources.xaml          | 154 +++++++++++--
 EleCho.WpfSuite/Controls/Thumb.cs             |  37 ++-
 EleCho.WpfSuite/Controls/ThumbResources.xaml  |  81 ++++++-
 WpfTest/MainWindow.xaml                       |   9 +-
 WpfTest/Tests/TempPage.xaml                   |   8 +
 WpfTest/Tests/TempPage.xaml.cs                |  17 ++
 14 files changed, 964 insertions(+), 191 deletions(-)
 create mode 100644 EleCho.WpfSuite.FluentDesign/FluentResourceNames.txt

diff --git a/EleCho.WpfSuite.FluentDesign/FluentResource.cs b/EleCho.WpfSuite.FluentDesign/FluentResource.cs
index 7cfeb61..33a67bc 100644
--- a/EleCho.WpfSuite.FluentDesign/FluentResource.cs
+++ b/EleCho.WpfSuite.FluentDesign/FluentResource.cs
@@ -2,25 +2,139 @@
 {
     public enum FluentResource
     {
-        TextColor,
-        PrimaryColor,
-        ControlBackgroundColor,
-        ControlHoverBackgroundColor,
-        ControlPressedBackgroundColor,
-        TextControlBackgroundColor,
-        TextControlHoverBackgroundColor,
-        TextControlFocusedBackgroundColor,
-
-        TextBrush,
-        PrimaryBrush,
-        ControlBackgroundBrush,
-        ControlHoverBackgroundBrush,
-        ControlPressedBackgroundBrush,
-        TextControlBackgroundBrush,
-        TextControlHoverBackgroundBrush,
-        TextControlFocusedBackgroundBrush,
-
-        ControlBorderBrush,
-        TextControlBorderBrush,
+        TextFillColorPrimaryBrush,
+        TextFillColorSecondaryBrush,
+        TextFillColorTertiaryBrush,
+        TextFillColorDisabledBrush,
+
+        AccentTextFillColorPrimaryBrush,
+        AccentTextFillColorSecondaryBrush,
+        AccentTextFillColorTertiaryBrush,
+        AccentTextFillColorDisabledBrush,
+
+        TextOnAccentFillColorPrimaryBrush,
+        TextOnAccentFillColorSecondaryBrush,
+        TextOnAccentFillColorDisabledBrush,
+        TextOnAccentFillColorSelectedTextBrush,
+
+        ControlFillColorDefaultBrush,
+        ControlFillColorSecondaryBrush,
+        ControlFillColorTertiaryBrush,
+        ControlFillColorQuarternaryBrush,
+        ControlFillColorDisabledBrush,
+        ControlFillColorTransparentBrush,
+        ControlFillColorInputActiveBrush,
+
+        ControlAltFillColorTransparentBrush,
+        ControlAltFillColorSecondaryBrush,
+        ControlAltFillColorTertiaryBrush,
+        ControlAltFillColorQuarternaryBrush,
+        ControlAltFillColorDisabledBrush,
+
+        ControlSolidFillColorDefaultBrush,
+        ControlStrongFillColorDefaultBrush,
+        ControlStrongFillColorDisabledBrush,
+
+        SubtleFillColorTransparentBrush,
+        SubtleFillColorSecondaryBrush,
+        SubtleFillColorTertiaryBrush,
+        SubtleFillColorDisabledBrush,
+
+        ControlOnImageFillColorDefaultBrush,
+        ControlOnImageFillColorSecondaryBrush,
+        ControlOnImageFillColorTertiaryBrush,
+        ControlOnImageFillColorDisabledBrush,
+
+        AccentFillColorDefaultBrush,
+        AccentFillColorSecondaryBrush,
+        AccentFillColorTertiaryBrush,
+        AccentFillColorDisabledBrush,
+        AccentFillColorSelectedTextBackgroundBrush,
+
+        CardStrokeColorDefaultBrush,
+        CardStrokeColorDefaultSolidBrush,
+
+        ControlElevationBorderBrush,
+        CircleElevationBorderBrush,
+        TextControlElevationBorderBrush,
+        TextControlElevationBorderFocusedBrush,
+        AccentControlElevationBorderBrush,
+
+        ControlStrokeColorDefaultBrush,
+        ControlStrokeColorSecondaryBrush,
+        ControlStrokeColorOnAccentDefaultBrush,
+        ControlStrokeColorOnAccentSecondaryBrush,
+        ControlStrokeColorOnAccentTertiaryBrush,
+        ControlStrokeColorOnAccentDisabledBrush,
+        ControlStrokeColorForStrongFillWhenOnImageBrush,
+
+        ControlStrongStrokeColorDefaultBrush,
+        ControlStrongStrokeColorDisabledBrush,
+
+        SurfaceStrokeColorDefaultBrush,
+        SurfaceStrokeColorFlyoutBrush,
+
+        DividerStrokeColorDefaultBrush,
+
+        FocusStrokeColorOuterBrush,
+        FocusStrokeColorInnerBrush,
+
+        CardBackgroundFillColorDefaultBrush,
+        CardBackgroundFillColorSecondaryBrush,
+        CardBackgroundTertiaryBrush,
+
+        SmokeFillColorDefaultBrush,
+
+        LayerFillColorDefaultBrush,
+        LayerFillColorAltBrush,
+
+        LayerOnAcrylicFillColorDefaultBrush,
+
+        LayerOnMicaBaseAltFillColorDefaultBrush,
+        LayerOnMicaBaseAltFillColorTertiaryBrush,
+        LayerOnMicaBaseAltFillColorTransparentBrush,
+        LayerOnMicaBaseAltFillColorSecondaryBrush,
+
+        SolidBackgroundFillColorBaseBrush,
+        SolidBackgroundFillColorBaseAltBrush,
+        SolidBackgroundFillColorSecondaryBrush,
+        SolidBackgroundFillColorTertiaryBrush,
+        SolidBackgroundFillColorQuarternaryBrush,
+        SolidBackgroundFillColorQuinaryBrush,
+        SolidBackgroundFillColorSenaryBrush,
+
+        MicaBackgroundFillColorBaseBrush,
+        MicaBackgroundFillColorBaseAltBrush,
+
+        AcrylicBackgroundFillColorBaseBrush,
+        AcrylicBackgroundFillColorDefaultBrush,
+
+        AccentAcrylicBackgroundFillColorBaseBrush,
+        AccentAcrylicBackgroundFillColorDefaultBrush,
+
+
+        SystemFillColorSuccessBrush,
+        SystemFillColorCautionBrush,
+        SystemFillColorCriticalBrush,
+        SystemFillColorSuccessBackgroundBrush,
+        SystemFillColorCautionBackgroundBrush,
+        SystemFillColorCriticalBackgroundBrush,
+        SystemFillColorAttentionBrush,
+        SystemFillColorNeutralBrush,
+        SystemFillColorSolidNeutralBrush,
+        SystemFillColorAttentionBackgroundBrush,
+        SystemFillColorNeutralBackgroundBrush,
+        SystemFillColorSolidNeutralBackgroundBrush,
+        SystemFillColorSolidAttentionBackgroundBrush,
+
+        SystemColorWindowTextColor,
+        SystemColorHighlightTextColor,
+        SystemColorButtonTextColor,
+        SystemColorHotlightColor,
+        SystemColorWindowColor,
+        SystemColorHighlightColor,
+        SystemColorButtonFaceColor,
+        SystemColorGreyTextColor,
+
     }
 }
diff --git a/EleCho.WpfSuite.FluentDesign/FluentResourceNames.txt b/EleCho.WpfSuite.FluentDesign/FluentResourceNames.txt
new file mode 100644
index 0000000..c56eb71
--- /dev/null
+++ b/EleCho.WpfSuite.FluentDesign/FluentResourceNames.txt
@@ -0,0 +1,133 @@
+TextFillColorPrimaryBrush
+TextFillColorSecondaryBrush
+TextFillColorTertiaryBrush
+TextFillColorDisabledBrush
+
+AccentTextFillColorPrimaryBrush
+AccentTextFillColorSecondaryBrush
+AccentTextFillColorTertiaryBrush
+AccentTextFillColorDisabledBrush
+
+TextOnAccentFillColorPrimaryBrush
+TextOnAccentFillColorSecondaryBrush
+TextOnAccentFillColorDisabledBrush
+TextOnAccentFillColorSelectedTextBrush
+
+ControlFillColorDefaultBrush
+ControlFillColorSecondaryBrush
+ControlFillColorTertiaryBrush
+ControlFillColorQuarternaryBrush
+ControlFillColorDisabledBrush
+ControlFillColorTransparentBrush
+ControlFillColorInputActiveBrush
+
+ControlAltFillColorTransparentBrush
+ControlAltFillColorSecondaryBrush
+ControlAltFillColorTertiaryBrush
+ControlAltFillColorQuarternaryBrush
+ControlAltFillColorDisabledBrush
+
+ControlSolidFillColorDefaultBrush
+ControlStrongFillColorDefaultBrush
+ControlStrongFillColorDisabledBrush
+
+SubtleFillColorTransparentBrush
+SubtleFillColorSecondaryBrush
+SubtleFillColorTertiaryBrush
+SubtleFillColorDisabledBrush
+
+ControlOnImageFillColorDefaultBrush
+ControlOnImageFillColorSecondaryBrush
+ControlOnImageFillColorTertiaryBrush
+ControlOnImageFillColorDisabledBrush
+
+AccentFillColorDefaultBrush
+AccentFillColorSecondaryBrush
+AccentFillColorTertiaryBrush
+AccentFillColorDisabledBrush
+AccentFillColorSelectedTextBackgroundBrush
+
+CardStrokeColorDefaultBrush
+CardStrokeColorDefaultSolidBrush
+
+ControlElevationBorderBrush
+CircleElevationBorderBrush
+TextControlElevationBorderBrush
+TextControlElevationBorderFocusedBrush
+AccentControlElevationBorderBrush
+
+ControlStrokeColorDefaultBrush
+ControlStrokeColorSecondaryBrush
+ControlStrokeColorOnAccentDefaultBrush
+ControlStrokeColorOnAccentSecondaryBrush
+ControlStrokeColorOnAccentTertiaryBrush
+ControlStrokeColorOnAccentDisabledBrush
+ControlStrokeColorForStrongFillWhenOnImageBrush
+
+ControlStrongStrokeColorDefaultBrush
+ControlStrongStrokeColorDisabledBrush
+
+SurfaceStrokeColorDefaultBrush
+SurfaceStrokeColorFlyoutBrush
+
+DividerStrokeColorDefaultBrush
+
+FocusStrokeColorOuterBrush
+FocusStrokeColorInnerBrush
+
+CardBackgroundFillColorDefaultBrush
+CardBackgroundFillColorSecondaryBrush
+CardBackgroundTertiaryBrush
+
+SmokeFillColorDefaultBrush
+
+LayerFillColorDefaultBrush
+LayerFillColorAltBrush
+
+LayerOnAcrylicFillColorDefaultBrush
+
+LayerOnMicaBaseAltFillColorDefaultBrush
+LayerOnMicaBaseAltFillColorTertiaryBrush
+LayerOnMicaBaseAltFillColorTransparentBrush
+LayerOnMicaBaseAltFillColorSecondaryBrush
+
+SolidBackgroundFillColorBaseBrush
+SolidBackgroundFillColorBaseAltBrush
+SolidBackgroundFillColorSecondaryBrush
+SolidBackgroundFillColorTertiaryBrush
+SolidBackgroundFillColorQuarternaryBrush
+SolidBackgroundFillColorQuinaryBrush
+SolidBackgroundFillColorSenaryBrush
+
+MicaBackgroundFillColorBaseBrush
+MicaBackgroundFillColorBaseAltBrush
+
+AcrylicBackgroundFillColorBaseBrush
+AcrylicBackgroundFillColorDefaultBrush
+
+AccentAcrylicBackgroundFillColorBaseBrush
+AccentAcrylicBackgroundFillColorDefaultBrush
+
+
+SystemFillColorSuccessBrush
+SystemFillColorCautionBrush
+SystemFillColorCriticalBrush
+SystemFillColorSuccessBackgroundBrush
+SystemFillColorCautionBackgroundBrush
+SystemFillColorCriticalBackgroundBrush
+SystemFillColorAttentionBrush
+SystemFillColorNeutralBrush
+SystemFillColorSolidNeutralBrush
+SystemFillColorAttentionBackgroundBrush
+SystemFillColorNeutralBackgroundBrush
+SystemFillColorSolidNeutralBackgroundBrush
+SystemFillColorSolidAttentionBackgroundBrush
+
+SystemColorWindowTextColor
+SystemColorHighlightTextColor
+SystemColorButtonTextColor
+SystemColorHotlightColor
+SystemColorWindowColor
+SystemColorHighlightColor
+SystemColorButtonFaceColor
+SystemColorGreyTextColor
diff --git a/EleCho.WpfSuite.FluentDesign/Styles/OverviewResources.xaml b/EleCho.WpfSuite.FluentDesign/Styles/OverviewResources.xaml
index 3213926..974648c 100644
--- a/EleCho.WpfSuite.FluentDesign/Styles/OverviewResources.xaml
+++ b/EleCho.WpfSuite.FluentDesign/Styles/OverviewResources.xaml
@@ -9,51 +9,38 @@
         <ResourceDictionary Source="pack://application:,,,/EleCho.WpfSuite.FluentDesign;component/Styles/PasswordBoxResources.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Color x:Key="{x:Static wsd:FluentResource.PrimaryColor}">#0067c0</Color>
-    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.PrimaryBrush}" Color="{DynamicResource ResourceKey={x:Static wsd:FluentResource.PrimaryColor}}"/>
-
-    <!--<LinearGradientBrush x:Key="ControlBorder" StartPoint="0,0" EndPoint="0,1">
-        <GradientStop Offset="0" Color="#18000000"/>
-        <GradientStop Offset=".9" Color="#18000000"/>
-        <GradientStop Offset="1" Color="#33000000"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="TextBoxBorder" StartPoint="0,0" EndPoint="0,1">
-        <GradientStop Offset="0" Color="#18000000"/>
-        <GradientStop Offset=".9" Color="#18000000"/>
-        <GradientStop Offset="1" Color="#88000000"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="FocusedTextBoxBorder" StartPoint="0,0" EndPoint="0,1">
-        <GradientStop Offset="0" Color="#18000000"/>
-        <GradientStop Offset=".9" Color="#18000000"/>
-        <GradientStop Offset="1" Color="{DynamicResource ResourceKey={x:Static wsd:FluentResource.PrimaryColor}}"/>
-    </LinearGradientBrush>-->
+    <Style TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static wsd:FluentResource.TextFillColorPrimaryBrush}}"/>
+    </Style>
 
     <Style TargetType="{x:Type ws:Button}"
            BasedOn="{StaticResource {x:Type ws:Button}}">
         <Setter Property="CornerRadius" Value="4"/>
         <Setter Property="Padding" Value="8 6"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlBorderBrush}}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlElevationBorderBrush}}"/>
         <Setter Property="HoverBorderBrush" Value="{x:Null}"/>
-        <Setter Property="PressedBorderBrush" Value="{x:Null}"/>
-        <Setter Property="DisabledBorderBrush" Value="{x:Null}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.ControlBackgroundBrush}}"/>
-        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlHoverBackgroundBrush}}"/>
-        <Setter Property="PressedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlPressedBackgroundBrush}}"/>
+        <Setter Property="PressedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}}"/>
+        <Setter Property="DisabledBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}}"/>
+        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDefaultBrush}}"/>
+        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}}"/>
+        <Setter Property="PressedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorTertiaryBrush}}"/>
+        <Setter Property="DisabledBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDisabledBrush}}"/>
     </Style>
 
     <Style TargetType="{x:Type ws:ToggleButton}"
            BasedOn="{StaticResource {x:Type ws:ToggleButton}}">
         <Setter Property="CornerRadius" Value="4"/>
         <Setter Property="Padding" Value="8 6"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlBorderBrush}}"/>
+        <Setter Property="CheckedForeground" Value="{DynamicResource {x:Static wsd:FluentResource.TextOnAccentFillColorPrimaryBrush}}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlElevationBorderBrush}}"/>
         <Setter Property="HoverBorderBrush" Value="{x:Null}"/>
-        <Setter Property="PressedBorderBrush" Value="{x:Null}"/>
-        <Setter Property="DisabledBorderBrush" Value="{x:Null}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.ControlBackgroundBrush}}"/>
-        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlHoverBackgroundBrush}}"/>
-        <Setter Property="PressedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlPressedBackgroundBrush}}"/>
+        <Setter Property="PressedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}}"/>
+        <Setter Property="DisabledBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}}"/>
+        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDefaultBrush}}"/>
+        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}}"/>
+        <Setter Property="PressedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorTertiaryBrush}}"/>
+        <Setter Property="CheckedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.AccentFillColorDefaultBrush}}"/>
+        <Setter Property="DisabledBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDisabledBrush}}"/>
     </Style>
 
     <Style TargetType="{x:Type ws:ComboBox}"
@@ -62,16 +49,17 @@
         <Setter Property="CornerRadius" Value="4"/>
         <Setter Property="PopupCornerRadius" Value="4"/>
         <Setter Property="ClipToBounds" Value="True"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlBorderBrush}}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlElevationBorderBrush}}"/>
         <Setter Property="HoverBorderBrush" Value="{x:Null}"/>
-        <Setter Property="PressedBorderBrush" Value="{x:Null}"/>
-        <Setter Property="DisabledBorderBrush" Value="{x:Null}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.ControlBackgroundBrush}}"/>
-        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlHoverBackgroundBrush}}"/>
-        <Setter Property="PressedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlPressedBackgroundBrush}}"/>
+        <Setter Property="PressedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}}"/>
+        <Setter Property="DisabledBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}}"/>
+        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDefaultBrush}}"/>
+        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}}"/>
+        <Setter Property="PressedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorTertiaryBrush}}"/>
+        <Setter Property="DisabledBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDisabledBrush}}"/>
         
         <!--Popup-->
-        <Setter Property="PopupBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlBorderBrush}}"/>
+        <Setter Property="PopupBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}}"/>
     </Style>
 
     <Style TargetType="{x:Type ws:ComboBoxItem}"
@@ -84,14 +72,14 @@
         <Setter Property="HoverBorderBrush" Value="#11000000"/>
 
         <Setter Property="SelectedBackground" Value="#11000000"/>
-        <Setter Property="SelectedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.PrimaryBrush}}"/>
+        <Setter Property="SelectedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.AccentFillColorDefaultBrush}}"/>
 
         <Setter Property="HoverFocusedBackground" Value="#11000000"/>
         <Setter Property="HoverFocusedBorderBrush" Value="#11000000"/>
         
         <Setter Property="SelectedFocusedBackground" Value="#11000000"/>
         <Setter Property="HoverSelectedBackground" Value="#11000000"/>
-        <Setter Property="HoverSelectedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.PrimaryBrush}}"/>
+        <Setter Property="HoverSelectedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.AccentFillColorDefaultBrush}}"/>
         <Setter Property="FocusedBorderBrush" Value="Transparent"/>
     </Style>
 
@@ -103,21 +91,29 @@
     <Style TargetType="{x:Type ws:ListBox}"
            BasedOn="{StaticResource {x:Type ws:ListBox}}">
         <Setter Property="CornerRadius" Value="4"/>
+        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.CardBackgroundFillColorDefaultBrush}}"/>
     </Style>
 
     <Style TargetType="{x:Type ws:ListBoxItem}"
            BasedOn="{StaticResource {x:Type ws:ListBoxItem}}">
         <Setter Property="CornerRadius" Value="4"/>
+        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDefaultBrush}}"/>
+        <Setter Property="SelectedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}}"/>
+        <Setter Property="SelectedActiveBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorTertiaryBrush}}"/>
     </Style>
 
     <Style TargetType="{x:Type ws:ListView}"
            BasedOn="{StaticResource {x:Type ws:ListView}}">
         <Setter Property="CornerRadius" Value="4"/>
+        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.CardBackgroundFillColorDefaultBrush}}"/>
     </Style>
 
     <Style TargetType="{x:Type ws:ListViewItem}"
            BasedOn="{StaticResource {x:Type ws:ListViewItem}}">
         <Setter Property="CornerRadius" Value="4"/>
+        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDefaultBrush}}"/>
+        <Setter Property="SelectedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}}"/>
+        <Setter Property="SelectedActiveBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorTertiaryBrush}}"/>
     </Style>
 
     <Style TargetType="{x:Type ws:TabControl}"
@@ -145,10 +141,32 @@
         <Setter Property="CornerRadius" Value="2"/>
     </Style>
 
+    <Style TargetType="{x:Type ws:GroupBox}">
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.DividerStrokeColorDefaultBrush}}"/>
+    </Style>
+
     <Style TargetType="{x:Type ws:ScrollBar}"
            BasedOn="{StaticResource {x:Type ws:ScrollBar}}">
+        <Setter Property="CornerRadius" Value="3"/>
         <Setter Property="ThumbCornerRadius" Value="3"/>
         <Setter Property="ButtonCornerRadius" Value="3"/>
+        <Setter Property="BorderBrush" Value="{x:Null}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="GlyphBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextFillColorPrimaryBrush}}"/>
+        <Setter Property="HoverGlyphBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextFillColorSecondaryBrush}}"/>
+        <Setter Property="PressedGlyphBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextFillColorTertiaryBrush}}"/>
+        <Setter Property="DisabledGlyphBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextFillColorDisabledBrush}}"/>
+
+        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.LayerFillColorAltBrush}}"/>
+        <Setter Property="HoverBackground" Value="{x:Null}"/>
+        <Setter Property="PressedBackground" Value="{x:Null}"/>
+        <Setter Property="DisabledBackground" Value="{x:Null}"/>
+
+        <Setter Property="ThumbBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrongStrokeColorDefaultBrush}}"/>
+        <Setter Property="HoverThumbBrush" Value="{x:Null}"/>
+        <Setter Property="DraggingThumbBrush" Value="{x:Null}"/>
+        <Setter Property="DisabledThumbBrush" Value="{DynamicResource {x:Static wsd:FluentResource.ControlStrongStrokeColorDisabledBrush}}"/>
+
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Width" Value="12"/>
diff --git a/EleCho.WpfSuite.FluentDesign/Styles/PasswordBoxResources.xaml b/EleCho.WpfSuite.FluentDesign/Styles/PasswordBoxResources.xaml
index 69f3918..7f60fd0 100644
--- a/EleCho.WpfSuite.FluentDesign/Styles/PasswordBoxResources.xaml
+++ b/EleCho.WpfSuite.FluentDesign/Styles/PasswordBoxResources.xaml
@@ -7,14 +7,15 @@
         <Setter Property="Padding" Value="4 6"/>
         <Setter Property="CornerRadius" Value="4"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Background" Value="{DynamicResource ResourceKey={x:Static wsd:FluentResource.TextControlBackgroundBrush}}"/>
-        <Setter Property="HoverBackground" Value="{DynamicResource ResourceKey={x:Static wsd:FluentResource.TextControlHoverBackgroundBrush}}"/>
-        <Setter Property="FocusedBackground" Value="{DynamicResource ResourceKey={x:Static wsd:FluentResource.TextControlFocusedBackgroundBrush}}"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static wsd:FluentResource.TextBrush}}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextControlBorderBrush}}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static wsd:FluentResource.TextFillColorPrimaryBrush}}"/>
+        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDefaultBrush}}"/>
+        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}}"/>
+        <Setter Property="FocusedBackground" Value="{DynamicResource ResourceKey={x:Static wsd:FluentResource.ControlFillColorInputActiveBrush}}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextControlElevationBorderBrush}}"/>
         <Setter Property="HoverBorderBrush" Value="{x:Null}"/>
-        <Setter Property="FocusedBorderBrush" Value="{x:Null}"/>
+        <Setter Property="FocusedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextControlElevationBorderFocusedBrush}}"/>
         <Setter Property="DisabledBorderBrush" Value="#d0d1d4"/>
+        
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
@@ -31,17 +32,18 @@
                                    BorderBrush="{TemplateBinding BorderBrush}"
                                    BorderThickness="{TemplateBinding BorderThickness}"
                                    CornerRadius="{TemplateBinding CornerRadius}"
-                                   SnapsToDevicePixels="True">
+                                   SnapsToDevicePixels="True"/>
 
-                            <ws:BoxPanel x:Name="PART_ContentContainer">
-                                <ws:ScrollViewer x:Name="PART_ContentHost"
+                        <ws:BoxPanel x:Name="PART_ContentContainer"
+                                     Margin="{TemplateBinding BorderThickness}">
+                            <ws:ScrollViewer x:Name="PART_ContentHost"
                                                  Focusable="false"
                                                  HorizontalScrollBarVisibility="Hidden"
                                                  VerticalScrollBarVisibility="Hidden"
                                                  TextElement.FontSize="26"
                                                  TextElement.Foreground="Red"/>
-                                <Border Padding="{TemplateBinding Padding}" >
-                                    <TextBlock x:Name="PART_Placeholder"
+                            <Border Padding="{TemplateBinding Padding}" >
+                                <TextBlock x:Name="PART_Placeholder"
                                                Text="{TemplateBinding Placeholder}"
                                                TextWrapping="{TemplateBinding TextWrapping}"
                                                Foreground="{TemplateBinding PlaceholderBrush}"
@@ -50,14 +52,8 @@
                                                Margin="2 0 2 0"
                                                Visibility="Hidden"
                                                IsEnabled="False"/>
-                                </Border>
-                            </ws:BoxPanel>
-                        </ws:Border>
-                        <Border x:Name="focusBorder"
-                                BorderBrush="{DynamicResource ResourceKey={x:Static wsd:FluentResource.PrimaryBrush}}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                BorderThickness="0 0 0 2"
-                                Visibility="Hidden"/>
+                            </Border>
+                        </ws:BoxPanel>
                     </ws:BoxPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="ClipToBounds" Value="True">
@@ -109,8 +105,8 @@
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
-                            <Setter TargetName="focusBorder"
-                                    Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="border"
+                                    Property="BorderThickness" Value="1 1 1 3"/>
                         </Trigger>
 
                         <!--Disabled styles bellow-->
diff --git a/EleCho.WpfSuite.FluentDesign/Styles/TextBoxResources.xaml b/EleCho.WpfSuite.FluentDesign/Styles/TextBoxResources.xaml
index 72886a6..aed3095 100644
--- a/EleCho.WpfSuite.FluentDesign/Styles/TextBoxResources.xaml
+++ b/EleCho.WpfSuite.FluentDesign/Styles/TextBoxResources.xaml
@@ -7,13 +7,13 @@
         <Setter Property="Padding" Value="4 6"/>
         <Setter Property="CornerRadius" Value="4"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.TextControlBackgroundBrush}}"/>
-        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.TextControlHoverBackgroundBrush}}"/>
-        <Setter Property="FocusedBackground" Value="{DynamicResource ResourceKey={x:Static wsd:FluentResource.TextControlFocusedBackgroundBrush}}"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static wsd:FluentResource.TextBrush}}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextControlBorderBrush}}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static wsd:FluentResource.TextFillColorPrimaryBrush}}"/>
+        <Setter Property="Background" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDefaultBrush}}"/>
+        <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}}"/>
+        <Setter Property="FocusedBackground" Value="{DynamicResource ResourceKey={x:Static wsd:FluentResource.ControlFillColorInputActiveBrush}}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextControlElevationBorderBrush}}"/>
         <Setter Property="HoverBorderBrush" Value="{x:Null}"/>
-        <Setter Property="FocusedBorderBrush" Value="{x:Null}"/>
+        <Setter Property="FocusedBorderBrush" Value="{DynamicResource {x:Static wsd:FluentResource.TextControlElevationBorderFocusedBrush}}"/>
         <Setter Property="DisabledBorderBrush" Value="#d0d1d4"/>
 
         <Setter Property="BorderThickness" Value="1"/>
@@ -32,17 +32,17 @@
                                    BorderBrush="{TemplateBinding BorderBrush}"
                                    BorderThickness="{TemplateBinding BorderThickness}"
                                    CornerRadius="{TemplateBinding CornerRadius}"
-                                   SnapsToDevicePixels="True">
-
-                            <ws:BoxPanel x:Name="PART_ContentContainer">
-                                <ws:ScrollViewer x:Name="PART_ContentHost"
+                                   SnapsToDevicePixels="True"/>
+                        <ws:BoxPanel x:Name="PART_ContentContainer"
+                                     Margin="{TemplateBinding BorderThickness}">
+                            <ws:ScrollViewer x:Name="PART_ContentHost"
                                                  Focusable="false"
                                                  HorizontalScrollBarVisibility="Hidden"
                                                  VerticalScrollBarVisibility="Hidden"
                                                  TextElement.FontSize="26"
                                                  TextElement.Foreground="Red"/>
-                                <Border Padding="{TemplateBinding Padding}" >
-                                    <TextBlock x:Name="PART_Placeholder"
+                            <Border Padding="{TemplateBinding Padding}" >
+                                <TextBlock x:Name="PART_Placeholder"
                                                Text="{TemplateBinding Placeholder}"
                                                TextWrapping="{TemplateBinding TextWrapping}"
                                                Foreground="{TemplateBinding PlaceholderBrush}"
@@ -51,14 +51,8 @@
                                                Margin="2 0 2 0"
                                                Visibility="Hidden"
                                                IsEnabled="False"/>
-                                </Border>
-                            </ws:BoxPanel>
-                        </ws:Border>
-                        <Border x:Name="focusBorder"
-                                BorderBrush="{DynamicResource ResourceKey={x:Static wsd:FluentResource.PrimaryBrush}}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                BorderThickness="0 0 0 2"
-                                Visibility="Hidden"/>
+                            </Border>
+                        </ws:BoxPanel>
                     </ws:BoxPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="ClipToBounds" Value="True">
@@ -110,8 +104,8 @@
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
-                            <Setter TargetName="focusBorder"
-                                    Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="border"
+                                    Property="BorderThickness" Value="1 1 1 3"/>
                         </Trigger>
 
                         <!--Disabled styles bellow-->
diff --git a/EleCho.WpfSuite.FluentDesign/Themes/Dark.xaml b/EleCho.WpfSuite.FluentDesign/Themes/Dark.xaml
index afe41e4..a27bc58 100644
--- a/EleCho.WpfSuite.FluentDesign/Themes/Dark.xaml
+++ b/EleCho.WpfSuite.FluentDesign/Themes/Dark.xaml
@@ -1,7 +1,171 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:wsd="clr-namespace:EleCho.WpfSuite.FluentDesign">
+    
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextFillColorPrimaryBrush}">#FFFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextFillColorSecondaryBrush}">#C5FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextFillColorTertiaryBrush}">#87FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextFillColorDisabledBrush}">#5DFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentTextFillColorPrimaryBrush}">#FF99EBFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentTextFillColorSecondaryBrush}">#FF99EBFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentTextFillColorTertiaryBrush}">#FF4CC2FF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentTextFillColorDisabledBrush}">#5DFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextOnAccentFillColorPrimaryBrush}">#FF000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextOnAccentFillColorSecondaryBrush}">#80000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextOnAccentFillColorDisabledBrush}">#87FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextOnAccentFillColorSelectedTextBrush}">#FFFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorDefaultBrush}">#0FFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}">#15FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorTertiaryBrush}">#08FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorDisabledBrush}">#0BFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorTransparentBrush}">#00FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorInputActiveBrush}">#B31E1E1E</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorTransparentBrush}">#00FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorSecondaryBrush}">#19000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorTertiaryBrush}">#0BFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorQuarternaryBrush}">#12FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorDisabledBrush}">#00FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlSolidFillColorDefaultBrush}">#FF454545</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrongFillColorDefaultBrush}">#8BFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrongFillColorDisabledBrush}">#3FFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SubtleFillColorTransparentBrush}">#00FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SubtleFillColorSecondaryBrush}">#0FFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SubtleFillColorTertiaryBrush}">#0AFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SubtleFillColorDisabledBrush}">#00FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlOnImageFillColorDefaultBrush}">#B31C1C1C</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlOnImageFillColorSecondaryBrush}">#FF1A1A1A</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlOnImageFillColorTertiaryBrush}">#FF131313</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlOnImageFillColorDisabledBrush}">#FF1E1E1E</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorDefaultBrush}">#FF4CC2FF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorSecondaryBrush}" Opacity="0.8999999761581421" Color="#FF4CC2FF"/>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorTertiaryBrush}" Opacity="0.800000011920929" Color="#FF4CC2FF"/>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorDisabledBrush}">#28FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorSelectedTextBackgroundBrush}">#FF0078D4</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.CardStrokeColorDefaultBrush}">#19000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.CardStrokeColorDefaultSolidBrush}">#FF1C1C1C</SolidColorBrush>
+
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.ControlElevationBorderBrush}" EndPoint="0,3" MappingMode="Absolute">
+        <LinearGradientBrush.RelativeTransform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#18FFFFFF" Offset="0.33000001311302185"/>
+        <GradientStop Color="#12FFFFFF" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.CircleElevationBorderBrush}" EndPoint="0,1">
+        <LinearGradientBrush.RelativeTransform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#18FFFFFF" Offset="0.699999988079071"/>
+        <GradientStop Color="#12FFFFFF" Offset="0.5"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.TextControlElevationBorderBrush}" EndPoint="0,2" MappingMode="Absolute">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterX="0" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#8BFFFFFF" Offset="0.5"/>
+        <GradientStop Color="#12FFFFFF" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.TextControlElevationBorderFocusedBrush}" EndPoint="0,2" MappingMode="Absolute">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterX="0" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#FF4CC2FF" Offset="1"/>
+        <GradientStop Color="#12FFFFFF" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.AccentControlElevationBorderBrush}" EndPoint="0,3" MappingMode="Absolute">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterX="0" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#23000000" Offset="0.33000001311302185"/>
+        <GradientStop Color="#14FFFFFF" Offset="1"/>
+    </LinearGradientBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}">#12FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorSecondaryBrush}">#18FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorOnAccentDefaultBrush}">#14FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorOnAccentSecondaryBrush}">#23000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorOnAccentTertiaryBrush}">#37000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorOnAccentDisabledBrush}">#33000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorForStrongFillWhenOnImageBrush}">#6B000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrongStrokeColorDefaultBrush}">#8BFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrongStrokeColorDisabledBrush}">#28FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SurfaceStrokeColorDefaultBrush}">#66757575</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SurfaceStrokeColorFlyoutBrush}">#33000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.DividerStrokeColorDefaultBrush}">#15FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.FocusStrokeColorOuterBrush}">#FFFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.FocusStrokeColorInnerBrush}">#B3000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.CardBackgroundFillColorDefaultBrush}">#0DFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.CardBackgroundFillColorSecondaryBrush}">#08FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SmokeFillColorDefaultBrush}">#4D000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerFillColorDefaultBrush}">#4C3A3A3A</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerFillColorAltBrush}">#0DFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnAcrylicFillColorDefaultBrush}">#09FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnMicaBaseAltFillColorDefaultBrush}">#733A3A3A</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnMicaBaseAltFillColorTertiaryBrush}">#FF2C2C2C</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnMicaBaseAltFillColorTransparentBrush}">#00FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnMicaBaseAltFillColorSecondaryBrush}">#0FFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorBaseBrush}">#FF202020</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorBaseAltBrush}">#FF0A0A0A</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorSecondaryBrush}">#FF1C1C1C</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorTertiaryBrush}">#FF282828</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorQuarternaryBrush}">#FF2C2C2C</SolidColorBrush>
+
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSuccessBrush}">#FF6CCB5F</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorCautionBrush}">#FFFCE100</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorCriticalBrush}">#FFFF99A4</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSuccessBackgroundBrush}">#FF393D1B</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorCautionBackgroundBrush}">#FF433519</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorCriticalBackgroundBrush}">#FF442726</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorAttentionBrush}">#FF4CC2FF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorNeutralBrush}">#8BFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSolidNeutralBrush}">#FF9D9D9D</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorAttentionBackgroundBrush}">#08FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorNeutralBackgroundBrush}">#08FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSolidNeutralBackgroundBrush}">#FF2E2E2E</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSolidAttentionBackgroundBrush}">#FF2E2E2E</SolidColorBrush>
+
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorWindowTextColor}">#FF000000</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorHighlightTextColor}">#FFFFFFFF</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorButtonTextColor}">#FF000000</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorHotlightColor}">#FF0066CC</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorWindowColor}">#FFFFFFFF</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorHighlightColor}">#FF0078D7</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorButtonFaceColor}">#FFF0F0F0</Color>
 
 
-    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/EleCho.WpfSuite.FluentDesign/Themes/Light.xaml b/EleCho.WpfSuite.FluentDesign/Themes/Light.xaml
index d91364f..176e11b 100644
--- a/EleCho.WpfSuite.FluentDesign/Themes/Light.xaml
+++ b/EleCho.WpfSuite.FluentDesign/Themes/Light.xaml
@@ -1,74 +1,172 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:wsd="clr-namespace:EleCho.WpfSuite.FluentDesign">
+    
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextFillColorPrimaryBrush}">#E4000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextFillColorSecondaryBrush}">#9E000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextFillColorTertiaryBrush}">#72000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextFillColorDisabledBrush}">#5C000000</SolidColorBrush>
 
-    <Color x:Key="{x:Static wsd:FluentResource.TextColor}">Black</Color>
-
-    <Color x:Key="{x:Static wsd:FluentResource.ControlBackgroundColor}">#EEFFFFFF</Color>
-    <Color x:Key="{x:Static wsd:FluentResource.ControlHoverBackgroundColor}">#88FFFFFF</Color>
-    <Color x:Key="{x:Static wsd:FluentResource.ControlPressedBackgroundColor}">#44FFFFFF</Color>
-
-    <Color x:Key="{x:Static wsd:FluentResource.TextControlBackgroundColor}">#AAFFFFFF</Color>
-    <Color x:Key="{x:Static wsd:FluentResource.TextControlHoverBackgroundColor}">#66FFFFFF</Color>
-    <Color x:Key="{x:Static wsd:FluentResource.TextControlFocusedBackgroundColor}">White</Color>
-
-    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextBrush}"
-                     Color="{DynamicResource {x:Static wsd:FluentResource.TextColor}}"/>
-
-    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlBackgroundBrush}"
-                     Color="{DynamicResource {x:Static wsd:FluentResource.ControlBackgroundColor}}"/>
-    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlHoverBackgroundBrush}"
-                     Color="{DynamicResource {x:Static wsd:FluentResource.ControlHoverBackgroundColor}}"/>
-    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlPressedBackgroundBrush}"
-                     Color="{DynamicResource {x:Static wsd:FluentResource.ControlPressedBackgroundColor}}"/>
-
-    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextControlBackgroundBrush}"
-                     Color="{DynamicResource {x:Static wsd:FluentResource.TextControlBackgroundColor}}"/>
-    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextControlHoverBackgroundBrush}"
-                     Color="{DynamicResource {x:Static wsd:FluentResource.TextControlHoverBackgroundColor}}"/>
-    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextControlFocusedBackgroundBrush}"
-                     Color="{DynamicResource {x:Static wsd:FluentResource.TextControlFocusedBackgroundColor}}"/>
-
-    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.ControlBorderBrush}"
-                         StartPoint="0,0" EndPoint="0,3"
-                         MappingMode="Absolute"
-                         SpreadMethod="Pad">
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentTextFillColorPrimaryBrush}">#FF003E92</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentTextFillColorSecondaryBrush}">#FF001A68</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentTextFillColorTertiaryBrush}">#FF0067C0</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentTextFillColorDisabledBrush}">#5C000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextOnAccentFillColorPrimaryBrush}">#FFFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextOnAccentFillColorSecondaryBrush}">#B3FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextOnAccentFillColorDisabledBrush}">#FFFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.TextOnAccentFillColorSelectedTextBrush}">#FFFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorDefaultBrush}">#B3FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}">#80F9F9F9</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorTertiaryBrush}">#4DF9F9F9</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorDisabledBrush}">#4DF9F9F9</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorTransparentBrush}">#00FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlFillColorInputActiveBrush}">#FFFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorTransparentBrush}">#00FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorSecondaryBrush}">#06000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorTertiaryBrush}">#0F000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorQuarternaryBrush}">#18000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlAltFillColorDisabledBrush}">#00FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlSolidFillColorDefaultBrush}">#FFFFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrongFillColorDefaultBrush}">#72000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrongFillColorDisabledBrush}">#51000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SubtleFillColorTransparentBrush}">#00FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SubtleFillColorSecondaryBrush}">#09000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SubtleFillColorTertiaryBrush}">#06000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SubtleFillColorDisabledBrush}">#00FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlOnImageFillColorDefaultBrush}">#C9FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlOnImageFillColorSecondaryBrush}">#FFF3F3F3</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlOnImageFillColorTertiaryBrush}">#FFEBEBEB</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlOnImageFillColorDisabledBrush}">#00FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorDefaultBrush}">#FF0067C0</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorSecondaryBrush}" Opacity="0.8999999761581421" Color="#FF0067C0"/>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorTertiaryBrush}" Opacity="0.800000011920929" Color="#FF0067C0"/>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorDisabledBrush}">#37000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.AccentFillColorSelectedTextBackgroundBrush}">#FF0078D4</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.CardStrokeColorDefaultBrush}">#0F000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.CardStrokeColorDefaultSolidBrush}">#FFEBEBEB</SolidColorBrush>
+
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.ControlElevationBorderBrush}" EndPoint="0,3" MappingMode="Absolute">
         <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
+            <ScaleTransform CenterX="0" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
         </LinearGradientBrush.RelativeTransform>
-        <GradientStop Color="#29000000" Offset="0.3"/>
-        <GradientStop Color="#0f000000" Offset="1"/>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#29000000" Offset="0.33000001311302185"/>
+        <GradientStop Color="#0F000000" Offset="1"/>
     </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.TextControlBorderBrush}"
-                         StartPoint="0,0" EndPoint="0,2"
-                         MappingMode="Absolute"
-                         SpreadMethod="Pad">
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.CircleElevationBorderBrush}" EndPoint="0,1">
         <LinearGradientBrush.RelativeTransform>
-            <ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
+            <MatrixTransform Matrix="Identity"/>
         </LinearGradientBrush.RelativeTransform>
-        <GradientStop Color="#72000000" Offset="0.3"/>
-        <GradientStop Color="#0f000000" Offset="1"/>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#0F000000" Offset="0.5"/>
+        <GradientStop Color="#29000000" Offset="0.699999988079071"/>
     </LinearGradientBrush>
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.TextControlElevationBorderBrush}" EndPoint="0,2" MappingMode="Absolute">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterX="0" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#72000000" Offset="0.5"/>
+        <GradientStop Color="#0F000000" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.TextControlElevationBorderFocusedBrush}" EndPoint="0,2" MappingMode="Absolute">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterX="0" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#FF0067C0" Offset="1"/>
+        <GradientStop Color="#0F000000" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="{x:Static wsd:FluentResource.AccentControlElevationBorderBrush}" EndPoint="0,3" MappingMode="Absolute">
+        <LinearGradientBrush.RelativeTransform>
+            <ScaleTransform CenterX="0" CenterY="0.5" ScaleX="1" ScaleY="-1"/>
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.Transform>
+            <MatrixTransform Matrix="Identity"/>
+        </LinearGradientBrush.Transform>
+        <GradientStop Color="#66000000" Offset="0.33000001311302185"/>
+        <GradientStop Color="#14FFFFFF" Offset="1"/>
+    </LinearGradientBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorDefaultBrush}">#0F000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorSecondaryBrush}">#29000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorOnAccentDefaultBrush}">#14FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorOnAccentSecondaryBrush}">#66000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorOnAccentTertiaryBrush}">#37000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorOnAccentDisabledBrush}">#0F000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrokeColorForStrongFillWhenOnImageBrush}">#59FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrongStrokeColorDefaultBrush}">#72000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.ControlStrongStrokeColorDisabledBrush}">#37000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SurfaceStrokeColorDefaultBrush}">#66757575</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SurfaceStrokeColorFlyoutBrush}">#0F000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.DividerStrokeColorDefaultBrush}">#0F000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.FocusStrokeColorOuterBrush}">#E4000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.FocusStrokeColorInnerBrush}">#B3FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.CardBackgroundFillColorDefaultBrush}">#B3FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.CardBackgroundFillColorSecondaryBrush}">#80F6F6F6</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SmokeFillColorDefaultBrush}">#4D000000</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerFillColorDefaultBrush}">#80FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerFillColorAltBrush}">#FFFFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnAcrylicFillColorDefaultBrush}">#40FFFFFF</SolidColorBrush>
+
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnMicaBaseAltFillColorDefaultBrush}">#B3FFFFFF</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnMicaBaseAltFillColorTertiaryBrush}">#FFF9F9F9</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnMicaBaseAltFillColorTransparentBrush}">#00000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.LayerOnMicaBaseAltFillColorSecondaryBrush}">#0A000000</SolidColorBrush>
 
-    <SolidColorBrush x:Key="TextFillColorPrimaryBrush">#1a1a1a</SolidColorBrush>
-    <SolidColorBrush x:Key="TextFillColorSecondaryBrush">#5c5c5c</SolidColorBrush>
-    <SolidColorBrush x:Key="TextFillColorTertiaryBrush">#868686</SolidColorBrush>
-    <SolidColorBrush x:Key="TextFillColorDisabledBrush">#9b9b9b</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorBaseBrush}">#FFF3F3F3</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorBaseAltBrush}">#FFDADADA</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorSecondaryBrush}">#FFEEEEEE</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorTertiaryBrush}">#FFF9F9F9</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SolidBackgroundFillColorQuarternaryBrush}">#FFFFFFFF</SolidColorBrush>
 
-    <SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush">#003e92</SolidColorBrush>
-    <SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush">#001a68</SolidColorBrush>
-    <SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush">#0067c0</SolidColorBrush>
-    <SolidColorBrush x:Key="AccentTextFillColorDisabledBrush">#9b9b9b</SolidColorBrush>
 
-    <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush">#ffffff</SolidColorBrush>
-    <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush">#fbfbfb</SolidColorBrush>
-    <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush">#ffffff</SolidColorBrush>
-    <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush">#ffffff</SolidColorBrush>
 
-    <SolidColorBrush x:Key="ControlFillColorDefaultBrush"></SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSuccessBrush}">#FF0F7B0F</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorCautionBrush}">#FF9D5D00</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorCriticalBrush}">#FFC42B1C</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSuccessBackgroundBrush}">#FFDFF6DD</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorCautionBackgroundBrush}">#FFFFF4CE</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorCriticalBackgroundBrush}">#FFFDE7E9</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorAttentionBrush}">#FF0078D4</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorNeutralBrush}">#72000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSolidNeutralBrush}">#FF8A8A8A</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorAttentionBackgroundBrush}">#80F6F6F6</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorNeutralBackgroundBrush}">#06000000</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSolidNeutralBackgroundBrush}">#FFF3F3F3</SolidColorBrush>
+    <SolidColorBrush x:Key="{x:Static wsd:FluentResource.SystemFillColorSolidAttentionBackgroundBrush}">#FFF7F7F7</SolidColorBrush>
 
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorWindowTextColor}">#FF000000</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorHighlightTextColor}">#FFFFFFFF</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorButtonTextColor}">#FF000000</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorHotlightColor}">#FF0066CC</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorWindowColor}">#FFFFFFFF</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorHighlightColor}">#FF0078D7</Color>
+    <Color x:Key="{x:Static wsd:FluentResource.SystemColorButtonFaceColor}">#FFF0F0F0</Color>
 
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/EleCho.WpfSuite/Controls/ScrollBar.cs b/EleCho.WpfSuite/Controls/ScrollBar.cs
index e4d420c..fb7c6e3 100644
--- a/EleCho.WpfSuite/Controls/ScrollBar.cs
+++ b/EleCho.WpfSuite/Controls/ScrollBar.cs
@@ -126,10 +126,10 @@ public Brush PressedBorderBrush
             set { SetValue(PressedBorderBrushProperty, value); }
         }
 
-        public Brush PressedThumbBrush
+        public Brush DraggingThumbBrush
         {
-            get { return (Brush)GetValue(PressedThumbBrushProperty); }
-            set { SetValue(PressedThumbBrushProperty, value); }
+            get { return (Brush)GetValue(DraggingThumbBrushProperty); }
+            set { SetValue(DraggingThumbBrushProperty, value); }
         }
 
         public Brush PressedGlyphBrush
@@ -213,8 +213,8 @@ public Brush DisabledGlyphBrush
         public static readonly DependencyProperty PressedBorderBrushProperty =
             DependencyProperty.Register(nameof(PressedBorderBrush), typeof(Brush), typeof(ScrollBar), new FrameworkPropertyMetadata(null));
 
-        public static readonly DependencyProperty PressedThumbBrushProperty =
-            DependencyProperty.Register(nameof(PressedThumbBrush), typeof(Brush), typeof(ScrollBar), new FrameworkPropertyMetadata(null));
+        public static readonly DependencyProperty DraggingThumbBrushProperty =
+            DependencyProperty.Register(nameof(DraggingThumbBrush), typeof(Brush), typeof(ScrollBar), new FrameworkPropertyMetadata(null));
 
         public static readonly DependencyProperty PressedGlyphBrushProperty =
             DependencyProperty.Register(nameof(PressedGlyphBrush), typeof(Brush), typeof(ScrollBar), new FrameworkPropertyMetadata(null));
diff --git a/EleCho.WpfSuite/Controls/ScrollBarResources.xaml b/EleCho.WpfSuite/Controls/ScrollBarResources.xaml
index c4dab43..37395d7 100644
--- a/EleCho.WpfSuite/Controls/ScrollBarResources.xaml
+++ b/EleCho.WpfSuite/Controls/ScrollBarResources.xaml
@@ -152,7 +152,7 @@
         </Setter>
     </Style>
     <Style x:Key="ScrollBarThumbVertical" TargetType="{x:Type ws:Thumb}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <!--<Setter Property="OverridesDefaultStyle" Value="true"/>-->
         <Setter Property="IsTabStop" Value="false"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -164,12 +164,72 @@
                             Height="{TemplateBinding Height}"
                             SnapsToDevicePixels="True"/>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Background" TargetName="rectangle" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=HoverBackground}"/>
+
+                        <!--Hover styles bellow-->
+
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="rectangle" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="rectangle" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+
+                        <!--Dragging styles bellow-->
+
+                        <Trigger Property="IsDragging" Value="True">
+                            <Setter TargetName="rectangle" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DraggingBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="rectangle" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DraggingBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
                         </Trigger>
-                        <Trigger Property="IsDragging" Value="true">
-                            <Setter Property="Background" TargetName="rectangle" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=PressedBackground}"/>
+
+                        <!--Disabled styles bellow-->
+
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="rectangle" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DisabledBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="rectangle" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DisabledBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
                         </Trigger>
+
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -181,14 +241,78 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ws:Thumb}">
-                    <Rectangle x:Name="rectangle" Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="{TemplateBinding Width}"/>
+                    <Border x:Name="rectangle"
+                            Background="{TemplateBinding Background}"
+                            Height="{TemplateBinding Height}"
+                            SnapsToDevicePixels="True"
+                            Width="{TemplateBinding Width}"/>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Fill" TargetName="rectangle" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=HoverBackground}"/>
+
+                        <!--Hover styles bellow-->
+
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="rectangle" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="rectangle" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+
+                        <!--Dragging styles bellow-->
+
+                        <Trigger Property="IsDragging" Value="True">
+                            <Setter TargetName="rectangle" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DraggingBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="rectangle" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DraggingBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
                         </Trigger>
-                        <Trigger Property="IsDragging" Value="true">
-                            <Setter Property="Fill" TargetName="rectangle" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=PressedBackground}"/>
+
+                        <!--Disabled styles bellow-->
+
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="rectangle" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DisabledBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="rectangle" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DisabledBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
                         </Trigger>
+
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -207,7 +331,7 @@
         <Setter Property="HoverThumbBrush" Value="#A6A6A6"/>
         <Setter Property="PressedBackground" Value="#606060"/>
         <Setter Property="PressedBorderBrush" Value="#606060"/>
-        <Setter Property="PressedThumbBrush" Value="#606060"/>
+        <Setter Property="DraggingThumbBrush" Value="#606060"/>
         <Setter Property="PressedGlyphBrush" Value="#FFFFFF"/>
         <Setter Property="DisabledBackground" Value="#F0F0F0"/>
         <Setter Property="DisabledBorderBrush" Value="#F0F0F0"/>
@@ -241,6 +365,7 @@
                                              HoverBorderBrush="{TemplateBinding HoverBorderBrush}"
                                              PressedBorderBrush="{TemplateBinding PressedBorderBrush}"
                                              DisabledBorderBrush="{TemplateBinding DisabledBorderBrush}"
+                                             BorderThickness="{TemplateBinding BorderThickness}"
                                              CornerRadius="{TemplateBinding ButtonCornerRadius}">
                                 <Path x:Name="ArrowTop"
                                       Data="{TemplateBinding ArrowUpGlyph}"
@@ -261,7 +386,7 @@
                                     <ws:Thumb Style="{StaticResource ScrollBarThumbVertical}"
                                               Background="{TemplateBinding ThumbBrush}"
                                               HoverBackground="{TemplateBinding HoverThumbBrush}"
-                                              PressedBackground="{TemplateBinding PressedThumbBrush}"
+                                              DraggingBackground="{TemplateBinding DraggingThumbBrush}"
                                               DisabledBackground="{TemplateBinding DisabledThumbBrush}"
                                               CornerRadius="{TemplateBinding ThumbCornerRadius}"/>
                                 </Track.Thumb>
@@ -279,6 +404,7 @@
                                              HoverBorderBrush="{TemplateBinding HoverBorderBrush}"
                                              PressedBorderBrush="{TemplateBinding PressedBorderBrush}"
                                              DisabledBorderBrush="{TemplateBinding DisabledBorderBrush}"
+                                             BorderThickness="{TemplateBinding BorderThickness}"
                                              CornerRadius="{TemplateBinding ButtonCornerRadius}">
                                 <Path x:Name="ArrowBottom" Data="{TemplateBinding ArrowDownGlyph}"
                                       Fill="{TemplateBinding GlyphBrush}"
@@ -390,6 +516,7 @@
                                                      HoverBorderBrush="{TemplateBinding HoverBorderBrush}"
                                                      PressedBorderBrush="{TemplateBinding PressedBorderBrush}"
                                                      DisabledBorderBrush="{TemplateBinding DisabledBorderBrush}"
+                                                     BorderThickness="{TemplateBinding BorderThickness}"
                                                      CornerRadius="{TemplateBinding ButtonCornerRadius}">
                                         <Path x:Name="ArrowLeft"
                                               Data="{TemplateBinding ArrowLeftGlyph}"
@@ -410,7 +537,7 @@
                                             <ws:Thumb Style="{StaticResource ScrollBarThumbHorizontal}"
                                                       Background="{TemplateBinding ThumbBrush}"
                                                       HoverBackground="{TemplateBinding HoverThumbBrush}"
-                                                      PressedBackground="{TemplateBinding PressedThumbBrush}"
+                                                      DraggingBackground="{TemplateBinding DraggingThumbBrush}"
                                                       DisabledBackground="{TemplateBinding DisabledThumbBrush}"
                                                       CornerRadius="{TemplateBinding ThumbCornerRadius}"/>
                                         </Track.Thumb>
@@ -428,6 +555,7 @@
                                                      HoverBorderBrush="{TemplateBinding HoverBorderBrush}"
                                                      PressedBorderBrush="{TemplateBinding PressedBorderBrush}"
                                                      DisabledBorderBrush="{TemplateBinding DisabledBorderBrush}"
+                                                     BorderThickness="{TemplateBinding BorderThickness}"
                                                      CornerRadius="{TemplateBinding ButtonCornerRadius}">
                                         <Path x:Name="ArrowRight"
                                               Data="{TemplateBinding ArrowRightGlyph}"
diff --git a/EleCho.WpfSuite/Controls/Thumb.cs b/EleCho.WpfSuite/Controls/Thumb.cs
index 9580b3c..1d67946 100644
--- a/EleCho.WpfSuite/Controls/Thumb.cs
+++ b/EleCho.WpfSuite/Controls/Thumb.cs
@@ -21,16 +21,34 @@ public CornerRadius CornerRadius
             set { SetValue(CornerRadiusProperty, value); }
         }
 
+        public Brush HoverBorderBrush
+        {
+            get { return (Brush)GetValue(HoverBorderBrushProperty); }
+            set { SetValue(HoverBorderBrushProperty, value); }
+        }
+
+        public Brush DraggingBorderBrush
+        {
+            get { return (Brush)GetValue(DraggingBorderBrushProperty); }
+            set { SetValue(DraggingBorderBrushProperty, value); }
+        }
+
+        public Brush DisabledBorderBrush
+        {
+            get { return (Brush)GetValue(DisabledBorderBrushProperty); }
+            set { SetValue(DisabledBorderBrushProperty, value); }
+        }
+
         public Brush HoverBackground
         {
             get { return (Brush)GetValue(HoverBackgroundProperty); }
             set { SetValue(HoverBackgroundProperty, value); }
         }
 
-        public Brush PressedBackground
+        public Brush DraggingBackground
         {
-            get { return (Brush)GetValue(PressedBackgroundProperty); }
-            set { SetValue(PressedBackgroundProperty, value); }
+            get { return (Brush)GetValue(DraggingBackgroundProperty); }
+            set { SetValue(DraggingBackgroundProperty, value); }
         }
 
         public Brush DisabledBackground
@@ -46,10 +64,19 @@ public Brush DisabledBackground
         public static readonly DependencyProperty HoverBackgroundProperty =
             DependencyProperty.Register(nameof(HoverBackground), typeof(Brush), typeof(Thumb), new FrameworkPropertyMetadata(null));
 
-        public static readonly DependencyProperty PressedBackgroundProperty =
-            DependencyProperty.Register(nameof(PressedBackground), typeof(Brush), typeof(Thumb), new FrameworkPropertyMetadata(null));
+        public static readonly DependencyProperty DraggingBackgroundProperty =
+            DependencyProperty.Register(nameof(DraggingBackground), typeof(Brush), typeof(Thumb), new FrameworkPropertyMetadata(null));
 
         public static readonly DependencyProperty DisabledBackgroundProperty =
             DependencyProperty.Register(nameof(DisabledBackground), typeof(Brush), typeof(Thumb), new FrameworkPropertyMetadata(null));
+
+        public static readonly DependencyProperty HoverBorderBrushProperty =
+            DependencyProperty.Register(nameof(HoverBorderBrush), typeof(Brush), typeof(Thumb), new FrameworkPropertyMetadata(null));
+
+        public static readonly DependencyProperty DraggingBorderBrushProperty =
+            DependencyProperty.Register(nameof(DraggingBorderBrush), typeof(Brush), typeof(Thumb), new FrameworkPropertyMetadata(null));
+
+        public static readonly DependencyProperty DisabledBorderBrushProperty =
+            DependencyProperty.Register(nameof(DisabledBorderBrush), typeof(Brush), typeof(Thumb), new FrameworkPropertyMetadata(null));
     }
 }
diff --git a/EleCho.WpfSuite/Controls/ThumbResources.xaml b/EleCho.WpfSuite/Controls/ThumbResources.xaml
index 564d5ba..631cdbc 100644
--- a/EleCho.WpfSuite/Controls/ThumbResources.xaml
+++ b/EleCho.WpfSuite/Controls/ThumbResources.xaml
@@ -15,9 +15,17 @@
                                BorderThickness="{TemplateBinding BorderThickness}"
                                CornerRadius="{TemplateBinding CornerRadius}">
                         <Grid x:Name="PART_Content">
-                            <Border Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" BorderThickness="0,0,1,1"/>
-                            <Border Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" BorderThickness="0,0,1,1" Margin="1"/>
-                            <Border Background="{TemplateBinding Background}" Margin="2"/>
+                            <Border Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" 
+                                    CornerRadius="{TemplateBinding CornerRadius}"
+                                    BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" 
+                                    BorderThickness="0,0,1,1"/>
+                            <Border Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" 
+                                    CornerRadius="{TemplateBinding CornerRadius}"
+                                    BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" 
+                                    BorderThickness="0,0,1,1" Margin="1"/>
+                            <Border Background="{TemplateBinding Background}" 
+                                    CornerRadius="{TemplateBinding CornerRadius}"
+                                    Margin="2"/>
                         </Grid>
                     </ws:Border>
                     <ControlTemplate.Triggers>
@@ -26,6 +34,73 @@
                                     Property="Clip"
                                     Value="{Binding ElementName=PART_Border,Path=ContentClip}"/>
                         </Trigger>
+
+                        <!--Hover styles bellow-->
+
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Border" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="PART_Border" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+
+                        <!--Dragging styles bellow-->
+
+                        <Trigger Property="IsDragging" Value="True">
+                            <Setter TargetName="PART_Border" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DraggingBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="PART_Border" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DraggingBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="HoverBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+
+                        <!--Disabled styles bellow-->
+
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="PART_Border" Property="Background">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DisabledBackground"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="Background"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="PART_Border" Property="BorderBrush">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{x:Static ws:FallbackConverter.Instance}">
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="DisabledBorderBrush"/>
+                                        <Binding RelativeSource="{RelativeSource Mode=TemplatedParent}" Path="BorderBrush"/>
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+
+
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/WpfTest/MainWindow.xaml b/WpfTest/MainWindow.xaml
index b8ba4a1..9a955b2 100644
--- a/WpfTest/MainWindow.xaml
+++ b/WpfTest/MainWindow.xaml
@@ -13,6 +13,7 @@
         Icon="Assets/logo.png"
         Loaded="Window_Loaded"
         ws:WindowOption.IsCaptionMenuVisible="False"
+        ws:WindowOption.Corner="RoundSmall"
         d:Background="White"
         d:DataContext="{d:DesignInstance Type=local:MainWindow}">
 
@@ -138,7 +139,7 @@
                         </ws:ComboBox>
                     </StackPanel>
                     <ws:ListBox Name="AppNavigations"
-                            Background="#33FFFFFF"
+                            Background="{DynamicResource {x:Static wsd:FluentResource.CardBackgroundFillColorDefaultBrush}}"
                             Grid.Column="0"
                             BorderThickness="0 0 0 0"
                             ItemsSource="{Binding NavigationItems}"
@@ -152,9 +153,9 @@
                                 <Setter Property="Margin" Value="2 1"/>
                                 <Setter Property="CornerRadius" Value="5"/>
                                 <Setter Property="BorderThickness" Value="0"/>
-                                <Setter Property="HoverBackground" Value="#0F444444"/>
-                                <Setter Property="SelectedBackground" Value="#0F222222"/>
-                                <Setter Property="SelectedActiveBackground" Value="#0F000000"/>
+                                <Setter Property="HoverBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorDefaultBrush}}"/>
+                                <Setter Property="SelectedBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorSecondaryBrush}}"/>
+                                <Setter Property="SelectedActiveBackground" Value="{DynamicResource {x:Static wsd:FluentResource.ControlFillColorTertiaryBrush}}"/>
                             </Style>
                         </ws:ListBox.ItemContainerStyle>
                         <ws:ListBox.ItemTemplate>
diff --git a/WpfTest/Tests/TempPage.xaml b/WpfTest/Tests/TempPage.xaml
index 28eb8b0..a785caf 100644
--- a/WpfTest/Tests/TempPage.xaml
+++ b/WpfTest/Tests/TempPage.xaml
@@ -260,6 +260,14 @@
                 <Image Source="/Assets/TestImage2.jpg"/>
             </ws:Border>
 
+            <ws:Border Width="200" Height="50"
+                       BorderBrush="{DynamicResource {x:Static wsd:FluentResource.TextControlElevationBorderFocusedBrush}}"
+                       BorderThickness="3">
+
+            </ws:Border>
+
+            <ws:Button Content="Toggle Theme"
+                       Click="ToggleThemeButton_Click"/>
         </ws:StackPanel>
     </ws:ScrollViewer>
 </Page>
diff --git a/WpfTest/Tests/TempPage.xaml.cs b/WpfTest/Tests/TempPage.xaml.cs
index a1779b6..7819f48 100644
--- a/WpfTest/Tests/TempPage.xaml.cs
+++ b/WpfTest/Tests/TempPage.xaml.cs
@@ -15,6 +15,8 @@
 using System.Windows.Shapes;
 using System.Windows.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
+using EleCho.WpfSuite;
+using EleCho.WpfSuite.FluentDesign;
 
 namespace WpfTest.Tests
 {
@@ -39,5 +41,20 @@ private void Button_Click(object sender, RoutedEventArgs e)
         {
             buttonContentControl.Content = System.IO.Path.GetRandomFileName();
         }
+
+        private void ToggleThemeButton_Click(object sender, RoutedEventArgs e)
+        {
+            var resources = App.Current.Resources.MergedDictionaries
+                .OfType<FluentResources>()
+                .FirstOrDefault();
+            var window = Window.GetWindow(this);
+
+            if (resources is not null &&
+                window is not null)
+            {
+                resources.IsDarkMode ^= true;
+                WindowOption.SetIsDarkMode(window, !WindowOption.GetIsDarkMode(window));
+            }
+        }
     }
 }