diff --git a/demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml
index c3605fa..3de4aaa 100644
--- a/demo/Semi.Avalonia.Demo/App.axaml
+++ b/demo/Semi.Avalonia.Demo/App.axaml
@@ -5,8 +5,8 @@
     xmlns:semi="https://irihi.tech/semi">
     <Application.Styles>
         <!-- You can still reference in old way.  -->
-        <!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
-        <semi:SemiTheme Locale="zh-cn" />
+        <!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
+        <semi:SemiTheme Locale="zh-CN" />
         <semi:SemiPopupAnimations/>
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
diff --git a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
index ef965c6..01f9480 100644
--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
@@ -14,13 +14,13 @@
             RowDefinitions="*, Auto, *">
             <Border
                 HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiYellow3Color}"
+                Background="{DynamicResource SemiGrey0Color}"
                 CornerRadius="10" />
             <GridSplitter Grid.Row="1" ShowsPreview="True" />
             <Border
                 Grid.Row="2"
                 HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiYellow3Color}"
+                Background="{DynamicResource SemiGrey0Color}"
                 CornerRadius="10" />
         </Grid>
         <Grid
@@ -29,13 +29,13 @@
             ColumnDefinitions="*, Auto, *">
             <Border
                 HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiYellow3Color}"
+                Background="{DynamicResource SemiGrey0Color}"
                 CornerRadius="10" />
             <GridSplitter Grid.Column="1" ShowsPreview="True" />
             <Border
                 Grid.Column="2"
                 HorizontalAlignment="Stretch"
-                Background="{DynamicResource SemiYellow3Color}"
+                Background="{DynamicResource SemiGrey0Color}"
                 CornerRadius="10" />
         </Grid>
     </StackPanel>
diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
index cf23454..ac572b4 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
+using Semi.Avalonia.Tokens.Palette;
 
 namespace Semi.Avalonia.Demo.ViewModels;
 
@@ -51,8 +52,8 @@ public class PaletteDemoViewModel : ObservableObject
 
     public PaletteDemoViewModel()
     {
-        _lightResourceDictionary = new Light.Palette();
-        _darkResourceDictionary = new Dark.Palette();
+        _lightResourceDictionary = new Light();
+        _darkResourceDictionary = new Dark();
         WeakReferenceMessenger.Default.Register<PaletteDemoViewModel, ColorItemViewModel>(this, OnClickColorItem);
     }
 
diff --git a/src/Semi.Avalonia/Themes/Index.axaml b/src/Semi.Avalonia/Index.axaml
similarity index 57%
rename from src/Semi.Avalonia/Themes/Index.axaml
rename to src/Semi.Avalonia/Index.axaml
index dc9ff25..013498e 100644
--- a/src/Semi.Avalonia/Themes/Index.axaml
+++ b/src/Semi.Avalonia/Index.axaml
@@ -1,9 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:semi="https://irihi.tech/semi">
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
-                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
+                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Schemes/LightScheme.axaml" />
+                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Schemes/DarkScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Schemes/AquaticScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Schemes/DesertScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="avares://Semi.Avalonia/Schemes/DuskScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Schemes/NightSkyScheme.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
diff --git a/src/Semi.Avalonia/Schemes/AquaticScheme.axaml b/src/Semi.Avalonia/Schemes/AquaticScheme.axaml
new file mode 100644
index 0000000..4181245
--- /dev/null
+++ b/src/Semi.Avalonia/Schemes/AquaticScheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/DarkScheme.axaml b/src/Semi.Avalonia/Schemes/DarkScheme.axaml
new file mode 100644
index 0000000..0666d38
--- /dev/null
+++ b/src/Semi.Avalonia/Schemes/DarkScheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Palette/Dark.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/DesertScheme.axaml b/src/Semi.Avalonia/Schemes/DesertScheme.axaml
new file mode 100644
index 0000000..6fdac84
--- /dev/null
+++ b/src/Semi.Avalonia/Schemes/DesertScheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/HighContrast/Desert.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/DuskScheme.axaml b/src/Semi.Avalonia/Schemes/DuskScheme.axaml
new file mode 100644
index 0000000..fe3d1b4
--- /dev/null
+++ b/src/Semi.Avalonia/Schemes/DuskScheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/HighContrast/Dusk.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/LightScheme.axaml b/src/Semi.Avalonia/Schemes/LightScheme.axaml
new file mode 100644
index 0000000..28a6714
--- /dev/null
+++ b/src/Semi.Avalonia/Schemes/LightScheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Palette/Light.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml b/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml
new file mode 100644
index 0000000..a337c82
--- /dev/null
+++ b/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/HighContrast/NightSky.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml
similarity index 77%
rename from src/Semi.Avalonia/Themes/SemiTheme.axaml
rename to src/Semi.Avalonia/SemiTheme.axaml
index 77181be..8d158b8 100644
--- a/src/Semi.Avalonia/Themes/SemiTheme.axaml
+++ b/src/Semi.Avalonia/SemiTheme.axaml
@@ -3,12 +3,12 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
-                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Themes/HighContrast/Aquatic.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Themes/HighContrast/Desert.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="avares://Semi.Avalonia/Themes/HighContrast/Dusk.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Themes/HighContrast/NightSky.axaml" />
+                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Schemes/LightScheme.axaml" />
+                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Schemes/DarkScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Schemes/AquaticScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Schemes/DesertScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="avares://Semi.Avalonia/Schemes/DuskScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Schemes/NightSkyScheme.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs b/src/Semi.Avalonia/SemiTheme.axaml.cs
similarity index 100%
rename from src/Semi.Avalonia/Themes/SemiTheme.axaml.cs
rename to src/Semi.Avalonia/SemiTheme.axaml.cs
diff --git a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml
index 53e13c9..37fa75f 100644
--- a/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBorderBrush" Opacity="0.4" Color="#54A9FF" />
-    <SolidColorBrush x:Key="AdornerLayerSolidBorderBrush" Color="#F9F9F9" />
+    <StaticResource x:Key="AdornerLayerBorderBrush" ResourceKey="SemiColorPrimaryLightActive" />
+    <StaticResource x:Key="AdornerLayerSolidBorderBrush" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
index 032758e..eac5510 100644
--- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="#43444A" />
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="AutoCompleteBoxPopupBoxShadow" ResourceKey="SemiShadowElevated"/>
+    <StaticResource x:Key="AutoCompleteBoxPopupBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="AutoCompleteBoxPopupBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml
index 8593cc1..ffe0ab5 100644
--- a/src/Semi.Avalonia/Themes/Dark/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="BorderCardBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
-    <SolidColorBrush x:Key="BorderCardBackground" Color="#232429" />
-    <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="BorderCardBoxShadow" ResourceKey="SemiShadowElevated" />
+    <StaticResource x:Key="BorderCardBackground" ResourceKey="SemiColorBackground1" />
+    <StaticResource x:Key="BorderCardBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml
index 65432c3..945a216 100644
--- a/src/Semi.Avalonia/Themes/Dark/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml
@@ -1,96 +1,77 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Opacity="0.8" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ButtonDefaultSuccessForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonDefaultWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonDefaultDangerForeground" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="ButtonDefaultBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Opacity="0.20" Color="White" />
-
+    <StaticResource x:Key="ButtonDefaultPrimaryForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonDefaultSecondaryForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonDefaultTertiaryForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="ButtonDefaultSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonDefaultWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonDefaultDangerForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ButtonDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ButtonDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ButtonDefaultPressedBackground" ResourceKey="SemiColorFill2" />
     <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Color="Transparent" />
     <!--  end Light  -->
-
     <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonSolidForeground" Color="White" />
-
-    <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="ButtonSolidSecondaryBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBackground" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBackground" Color="#9DDCF9" />
-
-    <SolidColorBrush x:Key="ButtonSolidTertiaryBackground" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPointeroverBackground" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPressedBackground" Color="#C6CACD" />
-
-    <SolidColorBrush x:Key="ButtonSolidSuccessBackground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonSolidSuccessPointeroverBackground" Color="#7FD184" />
-    <SolidColorBrush x:Key="ButtonSolidSuccessPressedBackground" Color="#A6E1A8" />
-
-    <SolidColorBrush x:Key="ButtonSolidWarningBackground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPointeroverBackground" Color="#FFC772" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPressedBackground" Color="#FFDDA1" />
-
-    <SolidColorBrush x:Key="ButtonSolidDangerBackground" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBackground" Color="#FD9983" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPressedBackground" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="ButtonSolidSecondaryBorderBrush" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBorderBrush" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBorderBrush" Color="#9DDCF9" />
-
-    <SolidColorBrush x:Key="ButtonSolidTertiaryBorderBrush" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPointeroverBorderBrush" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPressedBorderBrush" Color="#C6CACD" />
-
-    <SolidColorBrush x:Key="ButtonSolidSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonSolidSuccessPointeroverBorderBrush" Color="#7FD184" />
-    <SolidColorBrush x:Key="ButtonSolidSuccessPressedBorderBrush" Color="#A6E1A8" />
-
-    <SolidColorBrush x:Key="ButtonSolidWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPointeroverBorderBrush" Color="#FFC772" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPressedBorderBrush" Color="#FFDDA1" />
-
-    <SolidColorBrush x:Key="ButtonSolidDangerBorderBrush" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#FD9983" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="#2E3238" />
+    <StaticResource x:Key="ButtonSolidForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ButtonSolidPrimaryBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonSolidPrimaryPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ButtonSolidSecondaryBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonSolidSecondaryPointeroverBackground" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ButtonSolidSecondaryPressedBackground" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ButtonSolidTertiaryBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonSolidTertiaryPointeroverBackground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonSolidTertiaryPressedBackground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ButtonSolidSuccessBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonSolidSuccessPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ButtonSolidSuccessPressedBackground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ButtonSolidWarningBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonSolidWarningPointeroverBackground" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ButtonSolidWarningPressedBackground" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ButtonSolidDangerBackground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonSolidDangerPointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ButtonSolidDangerPressedBackground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ButtonSolidPrimaryBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonSolidPrimaryPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ButtonSolidSecondaryBorderBrush" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonSolidSecondaryPointeroverBorderBrush" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ButtonSolidSecondaryPressedBorderBrush" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ButtonSolidTertiaryBorderBrush" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonSolidTertiaryPointeroverBorderBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonSolidTertiaryPressedBorderBrush" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ButtonSolidSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonSolidSuccessPointeroverBorderBrush" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ButtonSolidSuccessPressedBorderBrush" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ButtonSolidWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonSolidWarningPointeroverBorderBrush" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ButtonSolidWarningPressedBorderBrush" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ButtonSolidDangerBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonSolidDangerPointeroverBorderBrush" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ButtonSolidDangerPressedBorderBrush" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ButtonSolidDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ButtonSolidDisabledBackground" ResourceKey="SemiColorDisabledBackground" />
     <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Transparent" />
     <!--  end Solid  -->
-
     <!--  Outline -->
     <SolidColorBrush x:Key="ButtonOutlineBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonOutlineBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="ButtonOutlinePointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ButtonOutlinePressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ButtonOutlineSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonOutlineWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonOutlineDangerBorderBrush" Color="#FC725A" />
+    <StaticResource x:Key="ButtonOutlineBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="ButtonOutlinePointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ButtonOutlinePressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ButtonOutlineSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonOutlineWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonOutlineDangerBorderBrush" ResourceKey="SemiColorDanger" />
     <!--  end Outline  -->
-
     <!--  Borderless -->
     <SolidColorBrush x:Key="ButtonBorderlessBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonBorderlessBorderBrush" Color="Transparent" />
     <!--  end Borderless  -->
-
-    <SolidColorBrush x:Key="ButtonInputInnerForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="#A9D7FF" />
+    <StaticResource x:Key="ButtonInputInnerForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ButtonInputInnerPointeroverForeground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonInputInnerPressedForeground" ResourceKey="SemiColorPrimaryActive" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
index 29fa9fd..d6d617b 100644
--- a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="#35363C" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.12" Color="White" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonBackground" ResourceKey="SemiColorBackground2" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.16" Color="White" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPressedBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.04" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
index 9b994ad..3a6d10b 100644
--- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
@@ -1,35 +1,29 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CalendarBackground" Color="#43444A" />
-    <SolidColorBrush x:Key="CalendarForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.6" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="#43444A" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#F9F9F9" />
+    <StaticResource x:Key="CalendarBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="CalendarForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalendarBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="CalendarItemWeekDayNameForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarItemIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarItemCalendarButtonBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="CalendarItemCalendarButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Opacity="0.20" Color="White" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="#43444A" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Opacity="0.65" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="#F9F9F9" />
+    <StaticResource x:Key="CalendarItemCalendarButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalendarItemCalendarButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedForeground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="CalendarItemCalendarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonBlackoutForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="CalendarItemCalendarButtonInactiveForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Opacity="0.20" Color="White" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="#43444A" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayBackground" Opacity="0.12" Color="White" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Opacity="0.6" Color="#F9F9F9" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedForeground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonTodayForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonTodayBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonBlackoutForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonInactiveForeground" ResourceKey="SemiColorText2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
index 6be4aac..a8b5559 100644
--- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -1,18 +1,17 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.12" Color="White" />
+    <StaticResource x:Key="CalendarDatePickerIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalendarDatePickerIconPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.16" Color="White" />
+    <StaticResource x:Key="CalendarDatePickerPointeroverBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="CalendarDatePickerPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
-    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
-
+    <StaticResource x:Key="CalendarDatePickerFocusBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalendarDatePickerDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="CalendarDatePickerDisabledIconForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarDatePickerPopupBoxShadows" ResourceKey="SemiShadowElevated" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="CalendarDatePickerBorderedDefaultBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="#7FC1FF" />
+    <StaticResource x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
index 8c54002..77f474d 100644
--- a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="CaptionButtonPressedBackground" Opacity="0.20" Color="White" />
-    <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="#FD9983" />
-    <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="#FDBEAC" />
-    <SolidColorBrush x:Key="CaptionButtonForeground" Opacity="0.6" Color="#F9F9F9" />
+    <StaticResource x:Key="CaptionButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CaptionButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="CaptionButtonClosePointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="CaptionButtonClosePressedBackground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorText2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Carousel.axaml b/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
index 4f990b9..608d577 100644
--- a/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
-    <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
+    <SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="{StaticResource SemiBlackColor}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
index c620699..d0d6b2e 100644
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -1,34 +1,29 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CheckBoxForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CheckBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="CheckBoxGlyphFill" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxGlyphDisabledFill" Color="White" />
-
+    <StaticResource x:Key="CheckBoxForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CheckBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CheckBoxGlyphFill" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="CheckBoxGlyphDisabledFill" ResourceKey="SemiColorWhite" />
     <SolidColorBrush x:Key="CheckBoxDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CheckBoxDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CheckBoxPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxPointeroverBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPressedBorderBrush" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#135CB8" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#135CB8" />
-
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#135CB8" />
-    <SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#A9D7FF" />
+    <StaticResource x:Key="CheckBoxDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="CheckBoxPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CheckBoxPointeroverBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CheckBoxPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CheckBoxPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CheckBoxCheckedDefaultBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CheckBoxCheckedDefaultBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CheckBoxCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CheckBoxCheckedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CheckBoxCheckedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CheckBoxCheckedPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CheckBoxDefaultDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="CheckBoxDefaultDisabledBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="CheckBoxCheckedDisabledBackground" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="CheckBoxCheckedDisabledBorderBrush" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="CheckBoxCardCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="CheckBoxCardCheckedBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CheckBoxCardCheckedDisabledBorderBrush" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="CheckBoxCardPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CheckBoxCardPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CheckBoxCardCheckedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CheckBoxCardCheckedPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 08b1b1e..8294f86 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -1,49 +1,42 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ComboBoxSelectorBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.20" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Opacity="0.04" Color="#E6E8EA" />
+    <StaticResource x:Key="ComboBoxSelectorBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ComboBoxSelectorPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ComboBoxSelectorFocusBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ComboBoxSelectorPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="ComboBoxSelectorDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="ComboBoxSelectorDisabledBorderBrush" ResourceKey="SemiColorDisabledFill" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#54A9FF" />
-
-    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxIconFocusForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="ComboBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
-    <BoxShadows x:Key="ComboBoxPopupBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
-    <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="#43444A" />
-    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="White" />
-
-    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
-
+    <StaticResource x:Key="ComboBoxSelectorFocusBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ComboBoxSelectorPressedBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ComboBoxIconDefaultForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ComboBoxIconPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxIconFocusForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxIconPressedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxIconDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ComboBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ComboBoxPopupBoxShadow" ResourceKey="SemiShadowElevated" />
+    <StaticResource x:Key="ComboBoxPopupBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="ComboBoxPopupBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxItemFocusBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
-
+    <StaticResource x:Key="ComboBoxItemPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ComboBoxItemFocusForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxItemFocusBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ComboBoxItemPressedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxItemPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ComboBoxItemSelectedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxItemSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="ComboBoxItemSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
     <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-
+    <StaticResource x:Key="ComboBoxItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="#7FC1FF" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBorderBrush" Color="#7FC1FF" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedFocusBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBorderBrush" Color="#A9D7FF" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
index 40df42c..4cf39a0 100644
--- a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Opacity="0.4" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FC725A" />
+    <StaticResource x:Key="DataValidationErrorsForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="DataValidationErrorsBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="DataValidationErrorsBorderBrush" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPressedBackground" ResourceKey="SemiColorDangerLightActive" />
+    <StaticResource x:Key="DataValidationErrorsPressedBorderBrush" ResourceKey="SemiColorDangerLightActive" />
+    <StaticResource x:Key="DataValidationErrorsSelectedBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="DataValidationErrorsSelectedBorderBrush" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index 2a19de4..45b9d4a 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -1,30 +1,23 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="#43444A" />
+    <StaticResource x:Key="DateTimePickerPopupBackground" ResourceKey="SemiColorBackground3" />
     <SolidColorBrush x:Key="DateTimePickerPopupBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#F9F9F9" />
-
+    <StaticResource x:Key="DateTimePickerFlyoutButtonForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPressedForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.20" Color="White" />
-
-    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="White" />
-
-
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="DateTimePickerSeparatorBackground" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerButtonBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.16" Color="White" />
+    <StaticResource x:Key="DateTimePickerButtonBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="DateTimePickerButtonForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DateTimePickerIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="DateTimePickerEmptyForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="DateTimePickerButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
-
-    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
+    <StaticResource x:Key="DateTimePickerButtonDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="DateTimePickerButtonDisabledIconForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="DateTimePickerFlyoutBoxShadow" ResourceKey="SemiShadowElevated" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Expander.axaml b/src/Semi.Avalonia/Themes/Dark/Expander.axaml
index 9e41ae3..fb8f9fb 100644
--- a/src/Semi.Avalonia/Themes/Dark/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Expander.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <StaticResource x:Key="ExpanderSeparatorBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="ExpanderHeaderForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ExpanderHeaderDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ExpanderContentForeground" Opacity="0.8" Color="#F9F9F9" />
+    <StaticResource x:Key="ExpanderHeaderHoverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ExpanderHeaderPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ExpanderContentForeground" ResourceKey="SemiColorText1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
index 463e7fa..e3d2b46 100644
--- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="FlyoutBackground" Color="#43444A" />
-    <SolidColorBrush x:Key="FlyoutForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="White" />
-    <BoxShadows x:Key="FlyoutBorderBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
+    <StaticResource x:Key="FlyoutBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="FlyoutForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="FlyoutBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="FlyoutBorderBoxShadow" ResourceKey="SemiShadowElevated" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
index f7b2f61..ffd69e9 100644
--- a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="GridSplitterBackground" Opacity="0.4" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="#0A4694" />
+    <StaticResource x:Key="GridSplitterBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="GridSplitterPreviewBackground" ResourceKey="SemiColorPrimaryLightActive" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
index 56bc792..48abf98 100644
--- a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="HeaderedContentControlBackground" Color="#16161A" />
-    <SolidColorBrush x:Key="HeaderedContentControlBorderBrush" Opacity="0.08" Color="White" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="HeaderedContentControlBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="HeaderedContentControlBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
index 82f0260..843a43b 100644
--- a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="HyperlinkButtonPointeroverForeground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="HyperlinkButtonPressedForeground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="#B553C2" />
+    <StaticResource x:Key="HyperlinkButtonForeground" ResourceKey="SemiColorLink" />
+    <StaticResource x:Key="HyperlinkButtonPointeroverForeground" ResourceKey="SemiColorLinkPointerover" />
+    <StaticResource x:Key="HyperlinkButtonPressedForeground" ResourceKey="SemiColorLinkActive" />
+    <StaticResource x:Key="HyperlinkButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="HyperlinkButtonVisitedForeground" ResourceKey="SemiColorLinkVisited" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
index 1aad3e1..e9c34e9 100644
--- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
@@ -1,15 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- ListBox -->
-    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
+    <StaticResource x:Key="ListBoxItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemPointeroverForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
+    <StaticResource x:Key="ListBoxItemPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ListBoxItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ListBoxItemPressedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ListBoxItemPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ListBoxItemSelectedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ListBoxItemSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="ListBoxItemSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <StaticResource x:Key="ListBoxItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
index 4d23600..7209c6a 100644
--- a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#F9F9F9" />
+    <StaticResource x:Key="ManagedFileChooserIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ManagedFileChooserTextForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
index d3a9ef1..e56bf75 100644
--- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -1,26 +1,21 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="MenuBackground" Color="Transparent"/>
-
+    <StaticResource x:Key="MenuFlyoutScrollViewerIconForeground" ResourceKey="SemiColorText2" />
+    <SolidColorBrush x:Key="MenuBackground" Color="Transparent" />
     <!--  MenuFlyout  -->
-    <SolidColorBrush x:Key="MenuFlyoutBackground" Color="#43444A" />
-    <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="White" />
-    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
-
+    <StaticResource x:Key="MenuFlyoutBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="MenuFlyoutBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="MenuFlyoutBorderBoxShadow" ResourceKey="SemiShadowElevated" />
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="MenuItemForeground" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="MenuItemPointeroverForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.16" Color="White" />
-
-    <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="Gray" />
-    <SolidColorBrush x:Key="MenuItemExpandIconForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="MenuItemExpandIconOpenForeground" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="MenuItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="MenuItemDisabledExpandIconForeground" Opacity="0.35" Color="#F9F9F9" />
+    <StaticResource x:Key="MenuItemForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="MenuItemSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="MenuItemPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="MenuItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="MenuItemPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="MenuItemInputGestureTextForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="MenuItemExpandIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="MenuItemExpandIconOpenForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="MenuItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="MenuItemDisabledInputGestureTextForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="MenuItemDisabledExpandIconForeground" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
index b7d7d0c..a6eb4a9 100644
--- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
@@ -1,21 +1,20 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="NotificationCardBackground" Color="#43444A" />
-    <SolidColorBrush x:Key="NotificationCardInformationIconForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#FC725A" />
-    <BoxShadows x:Key="NotificationCardBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
-    <SolidColorBrush x:Key="NotificationCardTitleForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="NotificationCardMessageForeground" Opacity="0.8" Color="#F9F9F9" />
-    
-    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="#16161A" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBackground" Opacity="0.2" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBackground" Opacity="0.2" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBorderBrush" Color="#FC725A" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBackground" Opacity="0.2" Color="#FC725A" />
-</ResourceDictionary>
+    <StaticResource x:Key="NotificationCardBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="NotificationCardBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="NotificationCardInformationIconForeground" ResourceKey="SemiColorInformation" />
+    <StaticResource x:Key="NotificationCardSuccessIconForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="NotificationCardWarningIconForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="NotificationCardErrorIconForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="NotificationCardBoxShadows" ResourceKey="SemiShadowElevated" />
+    <StaticResource x:Key="NotificationCardTitleForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="NotificationCardMessageForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="NotificationCardLightBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="NotificationCardLightInformationBorderBrush" ResourceKey="SemiColorInformation" />
+    <StaticResource x:Key="NotificationCardLightInformationBackground" ResourceKey="SemiColorInformationLight" />
+    <StaticResource x:Key="NotificationCardLightSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="NotificationCardLightSuccessBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="NotificationCardLightWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="NotificationCardLightWarningBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="NotificationCardLightErrorBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="NotificationCardLightErrorBackground" ResourceKey="SemiColorDangerLight" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs b/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs
deleted file mode 100644
index 196931f..0000000
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Semi.Avalonia.Dark;
-
-public class Palette: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
index 7b74afd..a8885fd 100644
--- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
@@ -1,15 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#F9F9F9" />
+    <StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ProgressBarSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ProgressBarTertiaryForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ProgressBarDangerForeground" Color="#FC725A" />
+    <StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ProgressBarTertiaryForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ProgressBarSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ProgressBarWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ProgressBarDangerForeground" ResourceKey="SemiColorDanger" />
     <!-- Error style is obsolete, use Danger instead -->
-    <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#FC725A" />
+    <StaticResource x:Key="ProgressBarErrorForeground" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
index fe1e7b0..c232295 100644
--- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
@@ -1,49 +1,41 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- RadioButton -->
-    <SolidColorBrush x:Key="RadioButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
+    <StaticResource x:Key="RadioButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Opacity="0.12" Color="White" />
-
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="White" />
-
-
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#135CB8" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#135CB8" />
-    <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
-
-    <SolidColorBrush x:Key="RadioButtonForeground" Color="#F9F9F9" />
+    <StaticResource x:Key="RadioButtonUncheckIconPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="RadioButtonUncheckIconPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="RadioButtonUncheckIconDisabledBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="RadioButtonUncheckIconDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="RadioButtonUncheckIconPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="RadioButtonUncheckIconPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="RadioButtonUncheckIconDisabledBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="RadioButtonCheckIconDefaultBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="RadioButtonCheckIconPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="RadioButtonCheckIconPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="RadioButtonCheckIconDisabledBackground" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="RadioButtonCheckIconDefaultBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="RadioButtonCheckIconPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="RadioButtonCheckIconPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="RadioButtonCheckIconDisabledBorderBrush" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="RadioButtonDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.12" Color="White" />
-
+    <StaticResource x:Key="RadioButtonDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="RadioButtonGroupBackground" ResourceKey="SemiColorFill0" />
     <!-- ButtonRadioButton -->
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="#43444A" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
+    <StaticResource x:Key="RadioButtonButtonUncheckedForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="RadioButtonButtonCheckedBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="RadioButtonButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="RadioButtonButtonCheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <!-- CardRadioButton -->
     <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.16" Color="White" />
+    <StaticResource x:Key="RadioButtonCardCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="RadioButtonCardCheckDefaultBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="RadioButtonCardCheckPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="RadioButtonCardCheckPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="RadioButtonCardUncheckPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="RadioButtonCardUncheckPressedBackground" ResourceKey="SemiColorFill1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml
index a77eb29..eec276e 100644
--- a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="#54A9FF" />
+    <StaticResource x:Key="RefreshVisualizerIconForeground" ResourceKey="SemiColorPrimary" />
     <SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
index 0442022..29ff2aa 100644
--- a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Opacity="0.6" Color="#F9F9F9" />
+    <StaticResource x:Key="ScrollBarButtonDefaultForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="ScrollBarButtonPointeroverForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ScrollBarThumbForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="ScrollBarThumbPointeroverForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="ScrollBarBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
index 4f446cf..8691619 100644
--- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
@@ -1,13 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SliderTrackForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="SliderTrackBackground" Opacity="0.12" Color="White" />
-
+    <StaticResource x:Key="SliderTrackForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="SliderTrackBackground" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="SliderTickForeground" Color="#41464C" />
-    <SolidColorBrush x:Key="SliderThumbBackground" Color="White" />
-    <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#A9D7FF" />
-
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="SliderThumbBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="SliderThumbPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="SliderThumbPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
     <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#41464C" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#0A4694" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#1C1F23" />
diff --git a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
index 0deac77..f135caf 100644
--- a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SplitViewSeparatorBackground" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="SplitViewMaskBrush" Opacity="0.2" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="SplitViewPaneBackground" Color="#16161A" />
+    <StaticResource x:Key="SplitViewSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="SplitViewMaskBrush" ResourceKey="SemiColorOverlayBackground" />
+    <StaticResource x:Key="SplitViewPaneBackground" ResourceKey="SemiColorBackground0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
index 52dbbd2..dc8da64 100644
--- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
@@ -1,11 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Line  -->
     <SolidColorBrush x:Key="TabItemLinePipeBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TabItemLinePipeSelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="TabItemLinePipePressedBorderBrush" Opacity="0.20" Color="White" />
-
-    <SolidColorBrush x:Key="TabItemLineHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Opacity="0.8" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="#F9F9F9" />
+    <StaticResource x:Key="TabItemLinePipeSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="TabItemLinePipePointeroverBorderBrush" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TabItemLinePipePressedBorderBrush" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="TabItemLineHeaderForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TabItemLineHeaderPointeroverForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="TabItemLineHeaderSelectedForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
index ca0e53a..c117b05 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
@@ -1,17 +1,16 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#FC725A" />
-    <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockMarkBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.08" Color="White" />
-
+    <StaticResource x:Key="TextBlockDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TextBlockSecondaryForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="TextBlockTertiaryForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TextBlockQuaternaryForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="TextBlockSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="TextBlockWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="TextBlockDangerForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="TextBlockDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="TextBlockMarkBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="TextBlockCodeForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TextBlockCodeBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TextBlockCodeBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.8" Color="#0041C5" />
-    <SolidColorBrush x:Key="TextBlockSelectionForeground" Color="White" />
+    <StaticResource x:Key="TextBlockSelectionForeground" ResourceKey="SemiColorWhite" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
index 9d1e8d9..ed254e8 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
@@ -1,24 +1,20 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TextBoxTextCaretBrush" Color="White" />
-
+    <StaticResource x:Key="TextBoxTextCaretBrush" ResourceKey="SemiColorWhite" />
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxDefaultBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.16" Color="White" />
+    <StaticResource x:Key="TextBoxDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="TextBoxPointeroverBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.2" Color="White" />
-    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="TextBoxForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.6" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="TextBoxDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <StaticResource x:Key="TextBoxPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="TextBoxFocusBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="TextBoxForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TextBoxInnerForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TextBoxDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="TextBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="Transparent" />
-
     <SolidColorBrush x:Key="TextBoxBorderedDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxBorderedDefaultBorderBrush" Opacity="0.12" Color="White" />
+    <StaticResource x:Key="TextBoxBorderedDefaultBorderBrush" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxBorderedPointeroverBorderBrush" Color="#7FC1FF" />
-
-    <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="#0059D6" />
-    <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="White" />
+    <StaticResource x:Key="TextBoxBorderedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <SolidColorBrush x:Key="TextBoxSelectionBackground" Opacity="0.8" Color="#0041C5" />
+    <StaticResource x:Key="TextBoxSelectionForeground" ResourceKey="SemiColorWhite" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
index beb7ffb..07ce7e9 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
@@ -1,88 +1,75 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.20" Color="White" />
+    <StaticResource x:Key="ToggleButtonDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ToggleButtonDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ToggleButtonDefaultPressedBackground" ResourceKey="SemiColorFill2" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
+    <StaticResource x:Key="ToggleButtonDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />
-
-    <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Opacity="0.8" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultSuccessForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDangerForeground" Color="#FC725A" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#54A9FF" />
+    <StaticResource x:Key="ToggleButtonDefaultPrimaryForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ToggleButtonDefaultSecondaryForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ToggleButtonDefaultTertiaryForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="ToggleButtonDefaultSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ToggleButtonDefaultWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ToggleButtonDefaultDangerForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedBackground" ResourceKey="SemiColorPrimary" />
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#888D92" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessCheckedBackground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedBackground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ToggleButtonDangerCheckedBackground" Color="#FC725A" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessCheckedPointeroverBackground" Color="#7FD184" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#FFC772" />
-    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPointeroverBackground" Color="#FD9983" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#A9D7FF" />
+    <StaticResource x:Key="ToggleButtonSecondaryCheckedBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ToggleButtonTertiaryCheckedBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ToggleButtonSuccessCheckedBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ToggleButtonWarningCheckedBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ToggleButtonDangerCheckedBackground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSuccessCheckedPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ToggleButtonWarningCheckedPointeroverBackground" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ToggleButtonDangerCheckedPointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPressedForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#9DDCF9" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#C6CACD" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessCheckedPressedBackground" Color="#A6E1A8" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="#FFDDA1" />
-    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPressedBackground" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="White" />
-    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledBackground" Color="#2E3238" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBackground" Opacity="0.2" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBackground" Opacity="0.2" Color="#888D92" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminateBackground" Opacity="0.2" Color="#5DC264" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBackground" Opacity="0.2" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminateBackground" Opacity="0.2" Color="#FC725A" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" Opacity="0.8" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminateBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminateBorderBrush" Color="#FC725A" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePointeroverBorderBrush" Color="#7FD184" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" Color="#FFC772" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverBorderBrush" Color="#FD9983" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverForeground" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverForeground" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePointeroverForeground" Color="#7FD184" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverForeground" Color="#FFC772" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverForeground" Color="#FD9983" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" Color="#9DDCF9" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" Color="#C6CACD" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePressedBorderBrush" Color="#A6E1A8" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" Color="#FFDDA1" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedBorderBrush" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedForeground" Color="#9DDCF9" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedForeground" Color="#C6CACD" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePressedForeground" Color="#A6E1A8" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedForeground" Color="#FFDDA1" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedForeground" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Opacity="0.35" Color="#F9F9F9" />
+    <StaticResource x:Key="ToggleButtonSecondaryCheckedPressedBackground" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ToggleButtonTertiaryCheckedPressedBackground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ToggleButtonSuccessCheckedPressedBackground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ToggleButtonWarningCheckedPressedBackground" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ToggleButtonDangerCheckedPressedBackground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ToggleButtonCheckedForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ToggleButtonCheckedDisabledBackground" ResourceKey="SemiColorDisabledBackground" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminateBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminateBackground" ResourceKey="SemiColorSecondaryLight" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminateBackground" ResourceKey="SemiColorTertiaryLight" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminateBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminateBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminateBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminateBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminateBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminateBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminatePointeroverForeground" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminatePointeroverForeground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminatePointeroverForeground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminatePointeroverForeground" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminatePointeroverForeground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminatePressedBorderBrush" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminatePressedBorderBrush" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminatePressedForeground" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminatePressedForeground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminatePressedForeground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminatePressedForeground" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminatePressedForeground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ToggleButtonIndeterminateDisabledBorderBrush" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
index e5d733b..db3cd55 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -1,20 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ToggleSwitchDefaultBorderBrush" Color="Transparent" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Opacity="0.20" Color="White" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedPressedBackground" ResourceKey="SemiColorFill2" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.16" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="#7FD184" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="#A6E1A8" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#277731" />
-
-    <SolidColorBrush x:Key="SimpleToggleSwitchContainerUnCheckedForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="SimpleToggleSwitchContainerCheckedForeground" Color="White" />
-
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedDefaultBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedPressedBackground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedDisabledBackground" ResourceKey="SemiColorSuccessDisabled" />
+    <StaticResource x:Key="SimpleToggleSwitchContainerUnCheckedForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="SimpleToggleSwitchContainerCheckedForeground" ResourceKey="SemiColorWhite" />
     <BoxShadows x:Key="ToggleSwitchIndicatorBoxShadow">0 4 6 0 #1A000000, 0 0 1 0 #4D000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
index 5b9f30b..2eaea56 100644
--- a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToolTipBackground" Color="#C6CACD" />
-    <SolidColorBrush x:Key="ToolTipForeground" Color="Black" />
+    <StaticResource x:Key="ToolTipBackground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ToolTipForeground" ResourceKey="SemiColorBlack" />
     <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
index 4ecbd61..c5e1e56 100644
--- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
@@ -1,15 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
+    <StaticResource x:Key="TreeViewItemDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TreeViewItemIconDefaultForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TreeViewItemIconHoverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TreeViewItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
+    <StaticResource x:Key="TreeViewItemPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TreeViewItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="TreeViewItemPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TreeViewItemSelectedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TreeViewItemSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <StaticResource x:Key="TreeViewItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Window.axaml b/src/Semi.Avalonia/Themes/Dark/Window.axaml
index b26cd37..1f95612 100644
--- a/src/Semi.Avalonia/Themes/Dark/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Window.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="WindowDefaultBackground" Color="#16161A" />
-    <SolidColorBrush x:Key="WindowDefaultForeground" Color="#F9F9F9" />
+    <StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/_index.axaml b/src/Semi.Avalonia/Themes/Dark/_index.axaml
index 017f040..b2620b9 100644
--- a/src/Semi.Avalonia/Themes/Dark/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/_index.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Palette.axaml" />
-        <!--  Controls  -->
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Border.axaml" />
diff --git a/src/Semi.Avalonia/Themes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/DarkTheme.axaml
deleted file mode 100644
index 393d404..0000000
--- a/src/Semi.Avalonia/Themes/DarkTheme.axaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml
index 976e2f0..37fa75f 100644
--- a/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBorderBrush" Color="#98CDFD" />
-    <SolidColorBrush x:Key="AdornerLayerSolidBorderBrush" Color="#1C1F23" />
+    <StaticResource x:Key="AdornerLayerBorderBrush" ResourceKey="SemiColorPrimaryLightActive" />
+    <StaticResource x:Key="AdornerLayerSolidBorderBrush" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
index 24d2c0e..c84e0fe 100644
--- a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" />
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="AutoCompleteBoxPopupBoxShadow" ResourceKey="SemiShadowElevated" />
+    <StaticResource x:Key="AutoCompleteBoxPopupBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="AutoCompleteBoxPopupBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml
index 9a473d0..ffe0ab5 100644
--- a/src/Semi.Avalonia/Themes/Light/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Border.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="BorderCardBoxShadow">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
-    <SolidColorBrush x:Key="BorderCardBackground" Color="White" />
-    <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="BorderCardBoxShadow" ResourceKey="SemiShadowElevated" />
+    <StaticResource x:Key="BorderCardBackground" ResourceKey="SemiColorBackground1" />
+    <StaticResource x:Key="BorderCardBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Button.axaml b/src/Semi.Avalonia/Themes/Light/Button.axaml
index 4365120..945a216 100644
--- a/src/Semi.Avalonia/Themes/Light/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Button.axaml
@@ -1,96 +1,77 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ButtonDefaultSuccessForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ButtonDefaultWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonDefaultDangerForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="ButtonDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
-
+    <StaticResource x:Key="ButtonDefaultPrimaryForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonDefaultSecondaryForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonDefaultTertiaryForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="ButtonDefaultSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonDefaultWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonDefaultDangerForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ButtonDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ButtonDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ButtonDefaultPressedBackground" ResourceKey="SemiColorFill2" />
     <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Color="Transparent" />
     <!--  end Light  -->
-
     <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonSolidForeground" Color="White" />
-
-    <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="#004FB3" />
-
-    <SolidColorBrush x:Key="ButtonSolidSecondaryBackground" Color="#0095EE" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBackground" Color="#007BCA" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBackground" Color="#0063A7" />
-
-    <SolidColorBrush x:Key="ButtonSolidTertiaryBackground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPointeroverBackground" Color="#555B61" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPressedBackground" Color="#41464C" />
-
-    <SolidColorBrush x:Key="ButtonSolidSuccessBackground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ButtonSolidSuccessPointeroverBackground" Color="#30953B" />
-    <SolidColorBrush x:Key="ButtonSolidSuccessPressedBackground" Color="#25772F" />
-
-    <SolidColorBrush x:Key="ButtonSolidWarningBackground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPointeroverBackground" Color="#D26700" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPressedBackground" Color="#A84A00" />
-
-    <SolidColorBrush x:Key="ButtonSolidDangerBackground" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBackground" Color="#D52515" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPressedBackground" Color="#B2140C" />
-
-    <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="#004FB3" />
-
-    <SolidColorBrush x:Key="ButtonSolidSecondaryBorderBrush" Color="#0095EE" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBorderBrush" Color="#007BCA" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBorderBrush" Color="#0063A7" />
-
-    <SolidColorBrush x:Key="ButtonSolidTertiaryBorderBrush" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPointeroverBorderBrush" Color="#555B61" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPressedBorderBrush" Color="#41464C" />
-
-    <SolidColorBrush x:Key="ButtonSolidSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="ButtonSolidSuccessPointeroverBorderBrush" Color="#30953B" />
-    <SolidColorBrush x:Key="ButtonSolidSuccessPressedBorderBrush" Color="#25772F" />
-
-    <SolidColorBrush x:Key="ButtonSolidWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPointeroverBorderBrush" Color="#D26700" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPressedBorderBrush" Color="#A84A00" />
-
-    <SolidColorBrush x:Key="ButtonSolidDangerBorderBrush" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#D52515" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#B2140C" />
-
-    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="#E6E8EA" />
+    <StaticResource x:Key="ButtonSolidForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ButtonSolidPrimaryBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonSolidPrimaryPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ButtonSolidSecondaryBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonSolidSecondaryPointeroverBackground" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ButtonSolidSecondaryPressedBackground" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ButtonSolidTertiaryBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonSolidTertiaryPointeroverBackground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonSolidTertiaryPressedBackground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ButtonSolidSuccessBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonSolidSuccessPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ButtonSolidSuccessPressedBackground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ButtonSolidWarningBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonSolidWarningPointeroverBackground" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ButtonSolidWarningPressedBackground" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ButtonSolidDangerBackground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonSolidDangerPointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ButtonSolidDangerPressedBackground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ButtonSolidPrimaryBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonSolidPrimaryPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ButtonSolidSecondaryBorderBrush" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonSolidSecondaryPointeroverBorderBrush" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ButtonSolidSecondaryPressedBorderBrush" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ButtonSolidTertiaryBorderBrush" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonSolidTertiaryPointeroverBorderBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonSolidTertiaryPressedBorderBrush" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ButtonSolidSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonSolidSuccessPointeroverBorderBrush" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ButtonSolidSuccessPressedBorderBrush" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ButtonSolidWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonSolidWarningPointeroverBorderBrush" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ButtonSolidWarningPressedBorderBrush" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ButtonSolidDangerBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonSolidDangerPointeroverBorderBrush" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ButtonSolidDangerPressedBorderBrush" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ButtonSolidDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ButtonSolidDisabledBackground" ResourceKey="SemiColorDisabledBackground" />
     <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Transparent" />
     <!--  end Solid  -->
-
     <!--  Outline -->
     <SolidColorBrush x:Key="ButtonOutlineBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonOutlineBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ButtonOutlinePointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonOutlinePressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonOutlineSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="ButtonOutlineWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonOutlineDangerBorderBrush" Color="#F93920" />
+    <StaticResource x:Key="ButtonOutlineBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="ButtonOutlinePointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ButtonOutlinePressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ButtonOutlineSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonOutlineWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonOutlineDangerBorderBrush" ResourceKey="SemiColorDanger" />
     <!--  end Outline  -->
-
     <!--  Borderless -->
     <SolidColorBrush x:Key="ButtonBorderlessBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonBorderlessBorderBrush" Color="Transparent" />
     <!--  end Borderless  -->
-
-    <SolidColorBrush x:Key="ButtonInputInnerForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="#004FB3" />
+    <StaticResource x:Key="ButtonInputInnerForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ButtonInputInnerPointeroverForeground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonInputInnerPressedForeground" ResourceKey="SemiColorPrimaryActive" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
index 0e7e367..d1c798b 100644
--- a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="White" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonBackground" ResourceKey="SemiColorBackground2" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPressedBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Calendar.axaml b/src/Semi.Avalonia/Themes/Light/Calendar.axaml
index 92a51ef..42727dc 100644
--- a/src/Semi.Avalonia/Themes/Light/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Calendar.axaml
@@ -1,35 +1,29 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CalendarBackground" Color="White" />
-    <SolidColorBrush x:Key="CalendarForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.62" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="White" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="CalendarForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalendarBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="CalendarItemWeekDayNameForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarItemIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarItemCalendarButtonBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="CalendarItemCalendarButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Opacity="0.65" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarItemCalendarButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalendarItemCalendarButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedForeground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="CalendarItemCalendarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonBlackoutForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="CalendarItemCalendarButtonInactiveForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="White" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayBackground" Opacity="0.05" Color="#2E3238" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedForeground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonTodayForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonTodayBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonBlackoutForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonInactiveForeground" ResourceKey="SemiColorText2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
index 293451b..a8b5559 100644
--- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
@@ -1,18 +1,17 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBorderBrush" Color="Transparent" />
+    <StaticResource x:Key="CalendarDatePickerIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalendarDatePickerIconPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
-    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
-
+    <StaticResource x:Key="CalendarDatePickerPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBorderBrush" Color="Transparent" />
+    <StaticResource x:Key="CalendarDatePickerFocusBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalendarDatePickerDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="CalendarDatePickerDisabledIconForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarDatePickerPopupBoxShadows" ResourceKey="SemiShadowElevated" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarDatePickerBorderedDefaultBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="#0062D6" />
+    <StaticResource x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml
index 5846e21..77f474d 100644
--- a/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CaptionButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="#D52515" />
-    <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="#B2140C" />
-    <SolidColorBrush x:Key="CaptionButtonForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="CaptionButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CaptionButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="CaptionButtonClosePointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="CaptionButtonClosePressedBackground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorText2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Carousel.axaml b/src/Semi.Avalonia/Themes/Light/Carousel.axaml
index 4f990b9..608d577 100644
--- a/src/Semi.Avalonia/Themes/Light/Carousel.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Carousel.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
-    <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
+    <SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Color="{StaticResource SemiBlackColor}" />
+    <SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="{StaticResource SemiBlackColor}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
index 7b8f707..d0d6b2e 100644
--- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
@@ -1,36 +1,29 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CheckBoxForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CheckBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="CheckBoxGlyphFill" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxGlyphDisabledFill" Color="White" />
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="CheckBoxForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CheckBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CheckBoxGlyphFill" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="CheckBoxGlyphDisabledFill" ResourceKey="SemiColorWhite" />
     <SolidColorBrush x:Key="CheckBoxDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CheckBoxDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CheckBoxPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckBoxPointeroverBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckBoxPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="#004FB3" />
-
-    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPressedBorderBrush" Color="#004FB3" />
-
-    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#98CDFD" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#98CDFD" />
-
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#98CDFD" />
-    <SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#004FB3" />
+    <StaticResource x:Key="CheckBoxDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="CheckBoxPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CheckBoxPointeroverBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CheckBoxPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CheckBoxPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CheckBoxCheckedDefaultBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CheckBoxCheckedDefaultBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CheckBoxCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CheckBoxCheckedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CheckBoxCheckedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CheckBoxCheckedPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CheckBoxDefaultDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="CheckBoxDefaultDisabledBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="CheckBoxCheckedDisabledBackground" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="CheckBoxCheckedDisabledBorderBrush" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="CheckBoxCardCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="CheckBoxCardCheckedBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CheckBoxCardCheckedDisabledBorderBrush" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="CheckBoxCardPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CheckBoxCardPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CheckBoxCardCheckedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CheckBoxCardCheckedPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
index 5dd62ad..4df35d1 100644
--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -1,48 +1,42 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ComboBoxSelectorBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Opacity="0.02" Color="#2E3238" />
+    <StaticResource x:Key="ComboBoxSelectorBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ComboBoxSelectorPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ComboBoxSelectorFocusBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ComboBoxSelectorPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="ComboBoxSelectorDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="ComboBoxSelectorDisabledBorderBrush" ResourceKey="SemiColorDisabledFill" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#0077FA" />
-
-    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="ComboBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
-    <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
-    <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ComboBoxSelectorFocusBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ComboBoxSelectorPressedBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ComboBoxIconDefaultForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ComboBoxIconPointeroverForeground" ResourceKey="SemiColorText0" />
 
+    <StaticResource x:Key="ComboBoxIconPressedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxIconDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ComboBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ComboBoxPopupBoxShadow" ResourceKey="SemiShadowElevated" />
+    <StaticResource x:Key="ComboBoxPopupBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="ComboBoxPopupBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxItemFocusBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
-
+    <StaticResource x:Key="ComboBoxItemPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ComboBoxItemFocusForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxItemFocusBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ComboBoxItemPressedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxItemPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ComboBoxItemSelectedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxItemSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="ComboBoxItemSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
     <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
-
+    <StaticResource x:Key="ComboBoxItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="#0062D6" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBorderBrush" Color="#0062D6" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedFocusBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBorderBrush" Color="#004FB3" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
index f84359d..4cf39a0 100644
--- a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="DataValidationErrorsBackground" Color="#FEF2ED" />
-    <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Color="#FEF2ED" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Color="#FEDDD2" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Color="#FEDDD2" />
-    <SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Color="#FDB7A5" />
-    <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Color="#FDB7A5" />
-    <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Color="#FEF2ED" />
-    <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#F93920" />
+    <StaticResource x:Key="DataValidationErrorsForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="DataValidationErrorsBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="DataValidationErrorsBorderBrush" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPressedBackground" ResourceKey="SemiColorDangerLightActive" />
+    <StaticResource x:Key="DataValidationErrorsPressedBorderBrush" ResourceKey="SemiColorDangerLightActive" />
+    <StaticResource x:Key="DataValidationErrorsSelectedBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="DataValidationErrorsSelectedBorderBrush" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
index 24d691b..45b9d4a 100644
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -1,32 +1,23 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="White" />
+    <StaticResource x:Key="DateTimePickerPopupBackground" ResourceKey="SemiColorBackground3" />
     <SolidColorBrush x:Key="DateTimePickerPopupBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#1C1F23" />
-
+    <StaticResource x:Key="DateTimePickerFlyoutButtonForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPressedForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
-
-    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
-
-
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="DateTimePickerSeparatorBackground" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerButtonBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="DateTimePickerButtonBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="DateTimePickerButtonForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DateTimePickerIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="DateTimePickerEmptyForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="DateTimePickerButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
-    
-    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
+    <StaticResource x:Key="DateTimePickerButtonDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="DateTimePickerButtonDisabledIconForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="DateTimePickerFlyoutBoxShadow" ResourceKey="SemiShadowElevated" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Expander.axaml b/src/Semi.Avalonia/Themes/Light/Expander.axaml
index 15b20ad..fb8f9fb 100644
--- a/src/Semi.Avalonia/Themes/Light/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Expander.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ExpanderSeparatorBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="ExpanderHeaderForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ExpanderHeaderDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ExpanderContentForeground" Opacity="0.8" Color="#1C1F23" />
+    <StaticResource x:Key="ExpanderHeaderHoverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ExpanderHeaderPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ExpanderContentForeground" ResourceKey="SemiColorText1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
index 85ef491..e3d2b46 100644
--- a/src/Semi.Avalonia/Themes/Light/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="FlyoutBackground" Color="White" />
-    <SolidColorBrush x:Key="FlyoutForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
+    <StaticResource x:Key="FlyoutBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="FlyoutForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="FlyoutBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="FlyoutBorderBoxShadow" ResourceKey="SemiShadowElevated" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml
index 2667522..ffd69e9 100644
--- a/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="GridSplitterBackground" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="#CBE7FE" />
+    <StaticResource x:Key="GridSplitterBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="GridSplitterPreviewBackground" ResourceKey="SemiColorPrimaryLightActive" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
index 501435b..888e10d 100644
--- a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="HeaderedContentControlBackground" Color="White" />
-    <SolidColorBrush x:Key="HeaderedContentControlBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="HeaderedContentControlBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="HeaderedContentControlBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
index c7356e7..843a43b 100644
--- a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="HyperlinkButtonPointeroverForeground" Color="#0062D6" />
-    <SolidColorBrush x:Key="HyperlinkButtonPressedForeground" Color="#004FB3" />
-    <SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="#9E28B3" />
+    <StaticResource x:Key="HyperlinkButtonForeground" ResourceKey="SemiColorLink" />
+    <StaticResource x:Key="HyperlinkButtonPointeroverForeground" ResourceKey="SemiColorLinkPointerover" />
+    <StaticResource x:Key="HyperlinkButtonPressedForeground" ResourceKey="SemiColorLinkActive" />
+    <StaticResource x:Key="HyperlinkButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="HyperlinkButtonVisitedForeground" ResourceKey="SemiColorLinkVisited" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
index 5cc327d..e9c34e9 100644
--- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
@@ -1,15 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- ListBox -->
-    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
+    <StaticResource x:Key="ListBoxItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
+    <StaticResource x:Key="ListBoxItemPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ListBoxItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ListBoxItemPressedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ListBoxItemPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ListBoxItemSelectedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ListBoxItemSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="ListBoxItemSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <StaticResource x:Key="ListBoxItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml
index b00dcac..7209c6a 100644
--- a/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ManagedFileChooserIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ManagedFileChooserTextForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml
index 254beca..e56bf75 100644
--- a/src/Semi.Avalonia/Themes/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml
@@ -1,26 +1,21 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuBackground" Color="Transparent"/>
-
+    <StaticResource x:Key="MenuFlyoutScrollViewerIconForeground" ResourceKey="SemiColorText2" />
+    <SolidColorBrush x:Key="MenuBackground" Color="Transparent" />
     <!--  MenuFlyout  -->
-    <SolidColorBrush x:Key="MenuFlyoutBackground" Color="White" />
-    <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
-
+    <StaticResource x:Key="MenuFlyoutBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="MenuFlyoutBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="MenuFlyoutBorderBoxShadow" ResourceKey="SemiShadowElevated" />
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="MenuItemForeground" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.09" Color="#2E3238" />
-
-    <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="Gray" />
-    <SolidColorBrush x:Key="MenuItemExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemExpandIconOpenForeground" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="MenuItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemDisabledExpandIconForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="MenuItemForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="MenuItemSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="MenuItemPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="MenuItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="MenuItemPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="MenuItemInputGestureTextForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="MenuItemExpandIconForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="MenuItemExpandIconOpenForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="MenuItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="MenuItemDisabledInputGestureTextForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="MenuItemDisabledExpandIconForeground" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
index e1c5732..a6eb4a9 100644
--- a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
@@ -1,21 +1,20 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="NotificationCardBackground" Color="White" />
-    <SolidColorBrush x:Key="NotificationCardInformationIconForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#F93920" />
-    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
-    <SolidColorBrush x:Key="NotificationCardTitleForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="NotificationCardMessageForeground" Opacity="0.8" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="White" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBorderBrush" Color="#F93920" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBackground" Color="#FEF2ED" />
+    <StaticResource x:Key="NotificationCardBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="NotificationCardBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="NotificationCardInformationIconForeground" ResourceKey="SemiColorInformation" />
+    <StaticResource x:Key="NotificationCardSuccessIconForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="NotificationCardWarningIconForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="NotificationCardErrorIconForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="NotificationCardBoxShadows" ResourceKey="SemiShadowElevated" />
+    <StaticResource x:Key="NotificationCardTitleForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="NotificationCardMessageForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="NotificationCardLightBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="NotificationCardLightInformationBorderBrush" ResourceKey="SemiColorInformation" />
+    <StaticResource x:Key="NotificationCardLightInformationBackground" ResourceKey="SemiColorInformationLight" />
+    <StaticResource x:Key="NotificationCardLightSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="NotificationCardLightSuccessBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="NotificationCardLightWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="NotificationCardLightWarningBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="NotificationCardLightErrorBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="NotificationCardLightErrorBackground" ResourceKey="SemiColorDangerLight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs b/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs
deleted file mode 100644
index e391acb..0000000
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Semi.Avalonia.Light;
-
-public class Palette: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
index ff03bf3..a8885fd 100644
--- a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
@@ -1,15 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ProgressBarSecondaryForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="ProgressBarTertiaryForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ProgressBarDangerForeground" Color="#F93920" />
+    <StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ProgressBarTertiaryForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ProgressBarSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ProgressBarWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ProgressBarDangerForeground" ResourceKey="SemiColorDanger" />
     <!-- Error style is obsolete, use Danger instead -->
-    <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#F93920" />
+    <StaticResource x:Key="ProgressBarErrorForeground" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
index 87ef1d9..c232295 100644
--- a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
@@ -1,49 +1,41 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- RadioButton -->
-    <SolidColorBrush x:Key="RadioButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
+    <StaticResource x:Key="RadioButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Opacity="0.05" Color="#2E3238" />
-
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
-
-
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#98CDFD" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#98CDFD" />
-    <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
-
-    <SolidColorBrush x:Key="RadioButtonForeground" Color="#1C1F23" />
+    <StaticResource x:Key="RadioButtonUncheckIconPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="RadioButtonUncheckIconPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="RadioButtonUncheckIconDisabledBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="RadioButtonUncheckIconDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="RadioButtonUncheckIconPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="RadioButtonUncheckIconPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="RadioButtonUncheckIconDisabledBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="RadioButtonCheckIconDefaultBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="RadioButtonCheckIconPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="RadioButtonCheckIconPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="RadioButtonCheckIconDisabledBackground" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="RadioButtonCheckIconDefaultBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="RadioButtonCheckIconPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="RadioButtonCheckIconPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="RadioButtonCheckIconDisabledBorderBrush" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="RadioButtonDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.05" Color="#2E3238" />
-
+    <StaticResource x:Key="RadioButtonDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="RadioButtonGroupBackground" ResourceKey="SemiColorFill0" />
     <!-- ButtonRadioButton -->
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="White" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
+    <StaticResource x:Key="RadioButtonButtonUncheckedForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="RadioButtonButtonCheckedBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="RadioButtonButtonCheckedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="RadioButtonButtonCheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <!-- CardRadioButton -->
     <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="RadioButtonCardCheckedBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="RadioButtonCardCheckDefaultBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="RadioButtonCardCheckPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="RadioButtonCardCheckPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="RadioButtonCardUncheckPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="RadioButtonCardUncheckPressedBackground" ResourceKey="SemiColorFill1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml
index e67b05b..eec276e 100644
--- a/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="#0077FA" />
+    <StaticResource x:Key="RefreshVisualizerIconForeground" ResourceKey="SemiColorPrimary" />
     <SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml
index e4f881d..29ff2aa 100644
--- a/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="ScrollBarButtonDefaultForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="ScrollBarButtonPointeroverForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ScrollBarThumbForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="ScrollBarThumbPointeroverForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="ScrollBarBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Slider.axaml b/src/Semi.Avalonia/Themes/Light/Slider.axaml
index bb1d311..f6bf1e0 100644
--- a/src/Semi.Avalonia/Themes/Light/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Slider.axaml
@@ -1,13 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SliderTrackForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="SliderTrackBackground" Opacity="0.05" Color="#2E3238" />
-
+    <StaticResource x:Key="SliderTrackForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="SliderTrackBackground" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="SliderTickForeground" Color="#C6CACD" />
-    <SolidColorBrush x:Key="SliderThumbBackground" Color="White" />
-    <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#004FB3" />
-
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="SliderThumbBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="SliderThumbPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="SliderThumbPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
     <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#C6CACD" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#CBE7FE" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#F9F9F9" />
diff --git a/src/Semi.Avalonia/Themes/Light/SplitView.axaml b/src/Semi.Avalonia/Themes/Light/SplitView.axaml
index fc36c21..f135caf 100644
--- a/src/Semi.Avalonia/Themes/Light/SplitView.axaml
+++ b/src/Semi.Avalonia/Themes/Light/SplitView.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SplitViewSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="SplitViewMaskBrush" Opacity="0.2" Color="#555B61"  />
-    <SolidColorBrush x:Key="SplitViewPaneBackground" Color="White" />
+    <StaticResource x:Key="SplitViewSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="SplitViewMaskBrush" ResourceKey="SemiColorOverlayBackground" />
+    <StaticResource x:Key="SplitViewPaneBackground" ResourceKey="SemiColorBackground0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TabItem.axaml b/src/Semi.Avalonia/Themes/Light/TabItem.axaml
index 4e08d73..dc8da64 100644
--- a/src/Semi.Avalonia/Themes/Light/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TabItem.axaml
@@ -1,11 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Line  -->
     <SolidColorBrush x:Key="TabItemLinePipeBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TabItemLinePipeSelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="TabItemLinePipePressedBorderBrush" Opacity="0.13" Color="#2E3238" />
-
-    <SolidColorBrush x:Key="TabItemLineHeaderForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="#1C1F23" />
+    <StaticResource x:Key="TabItemLinePipeSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="TabItemLinePipePointeroverBorderBrush" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TabItemLinePipePressedBorderBrush" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="TabItemLineHeaderForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TabItemLineHeaderPointeroverForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="TabItemLineHeaderSelectedForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TextBlock.axaml b/src/Semi.Avalonia/Themes/Light/TextBlock.axaml
index 0cda42b..c117b05 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBlock.axaml
@@ -1,17 +1,16 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockMarkBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.08" Color="#1C1F23" />
-
+    <StaticResource x:Key="TextBlockDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TextBlockSecondaryForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="TextBlockTertiaryForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TextBlockQuaternaryForeground" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="TextBlockSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="TextBlockWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="TextBlockDangerForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="TextBlockDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="TextBlockMarkBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="TextBlockCodeForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TextBlockCodeBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TextBlockCodeBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.8" Color="#0041C5" />
-    <SolidColorBrush x:Key="TextBlockSelectionForeground" Color="White" />
+    <StaticResource x:Key="TextBlockSelectionForeground" ResourceKey="SemiColorWhite" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
index 08d6fa4..d46e735 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -1,24 +1,20 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TextBoxTextCaretBrush" Color="Black" />
-
+    <StaticResource x:Key="TextBoxTextCaretBrush" ResourceKey="SemiColorBlack" />
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="TextBoxDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="TextBoxPointeroverBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="TextBoxForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.62" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="TextBoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="TextBoxPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="TextBoxFocusBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="TextBoxForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TextBoxInnerForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TextBoxDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="TextBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="Transparent" />
-
     <SolidColorBrush x:Key="TextBoxBorderedDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxBorderedDefaultBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="TextBoxBorderedDefaultBorderBrush" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxBorderedPointeroverBorderBrush" Color="#0062D6" />
-
-    <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="#0059D6" />
-    <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="White" />
+    <StaticResource x:Key="TextBoxBorderedPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <SolidColorBrush x:Key="TextBoxSelectionBackground" Opacity="0.8" Color="#0041C5" />
+    <StaticResource x:Key="TextBoxSelectionForeground" ResourceKey="SemiColorWhite" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
index b2e2767..07ce7e9 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
@@ -1,88 +1,75 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="ToggleButtonDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ToggleButtonDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ToggleButtonDefaultPressedBackground" ResourceKey="SemiColorFill2" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
+    <StaticResource x:Key="ToggleButtonDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />
-
-    <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultSuccessForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDangerForeground" Color="#F93920" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#0077FA" />
+    <StaticResource x:Key="ToggleButtonDefaultPrimaryForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ToggleButtonDefaultSecondaryForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ToggleButtonDefaultTertiaryForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="ToggleButtonDefaultSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ToggleButtonDefaultWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ToggleButtonDefaultDangerForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedBackground" ResourceKey="SemiColorPrimary" />
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#0095EE" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessCheckedBackground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedBackground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonDangerCheckedBackground" Color="#F93920" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" Color="#007BCA" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" Color="#555B61" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessCheckedPointeroverBackground" Color="#30953B" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#D26700" />
-    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPointeroverBackground" Color="#D52515" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedForeground" Color="White" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#004FB3" />
+    <StaticResource x:Key="ToggleButtonSecondaryCheckedBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ToggleButtonTertiaryCheckedBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ToggleButtonSuccessCheckedBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ToggleButtonWarningCheckedBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ToggleButtonDangerCheckedBackground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSuccessCheckedPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ToggleButtonWarningCheckedPointeroverBackground" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ToggleButtonDangerCheckedPointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPressedForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#0063A7" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#41464C" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessCheckedPressedBackground" Color="#25772F" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="#A84A00" />
-    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPressedBackground" Color="#B2140C" />
-
-    <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="White" />
-    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledBackground" Color="#E6E8EA" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBackground" Color="#E9F7FD" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBackground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminateBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminateBackground" Color="#FEF2ED" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" Color="#0095EE" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminateBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminateBorderBrush" Color="#F93920" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" Color="#007BCA" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" Color="#555B61" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePointeroverBorderBrush" Color="#30953B" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" Color="#D26700" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverBorderBrush" Color="#D52515" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverForeground" Color="#007BCA" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverForeground" Color="#555B61" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePointeroverForeground" Color="#30953B" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverForeground" Color="#D26700" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverForeground" Color="#D52515" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" Color="#0063A7" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" Color="#41464C" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePressedBorderBrush" Color="#25772F" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" Color="#A84A00" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedBorderBrush" Color="#B2140C" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" Color="#004FB3" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedForeground" Color="#0063A7" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedForeground" Color="#41464C" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePressedForeground" Color="#25772F" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedForeground" Color="#A84A00" />
-    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedForeground" Color="#B2140C" />
-
-    <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ToggleButtonSecondaryCheckedPressedBackground" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ToggleButtonTertiaryCheckedPressedBackground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ToggleButtonSuccessCheckedPressedBackground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ToggleButtonWarningCheckedPressedBackground" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ToggleButtonDangerCheckedPressedBackground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ToggleButtonCheckedForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ToggleButtonCheckedDisabledBackground" ResourceKey="SemiColorDisabledBackground" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminateBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminateBackground" ResourceKey="SemiColorSecondaryLight" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminateBackground" ResourceKey="SemiColorTertiaryLight" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminateBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminateBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminateBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminateBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminateBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminateBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminatePointeroverForeground" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminatePointeroverForeground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminatePointeroverForeground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminatePointeroverForeground" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminatePointeroverForeground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminatePressedBorderBrush" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminatePressedBorderBrush" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ToggleButtonSecondaryIndeterminatePressedForeground" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ToggleButtonTertiaryIndeterminatePressedForeground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ToggleButtonSuccessIndeterminatePressedForeground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ToggleButtonWarningIndeterminatePressedForeground" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ToggleButtonDangerIndeterminatePressedForeground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ToggleButtonIndeterminateDisabledBorderBrush" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
index 3a00f8c..db3cd55 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
@@ -1,20 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ToggleSwitchDefaultBorderBrush" Color="Transparent" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedPressedBackground" ResourceKey="SemiColorFill2" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.09" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="#30953B" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="#25772F" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#A4E0A7" />
-
-    <SolidColorBrush x:Key="SimpleToggleSwitchContainerUnCheckedForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="SimpleToggleSwitchContainerCheckedForeground" Color="White" />
-
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedDefaultBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedPressedBackground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedDisabledBackground" ResourceKey="SemiColorSuccessDisabled" />
+    <StaticResource x:Key="SimpleToggleSwitchContainerUnCheckedForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="SimpleToggleSwitchContainerCheckedForeground" ResourceKey="SemiColorWhite" />
     <BoxShadows x:Key="ToggleSwitchIndicatorBoxShadow">0 4 6 0 #1A000000, 0 0 1 0 #4D000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Tooltip.axaml b/src/Semi.Avalonia/Themes/Light/Tooltip.axaml
index 4a81dce..0f2ef79 100644
--- a/src/Semi.Avalonia/Themes/Light/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Tooltip.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToolTipBackground" Color="#41464C" />
-    <SolidColorBrush x:Key="ToolTipForeground" Color="White" />
+    <StaticResource x:Key="ToolTipBackground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ToolTipForeground" ResourceKey="SemiColorWhite" />
     <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TreeView.axaml b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
index c4cc03c..c5e1e56 100644
--- a/src/Semi.Avalonia/Themes/Light/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
@@ -1,15 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
+    <StaticResource x:Key="TreeViewItemDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TreeViewItemIconDefaultForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TreeViewItemIconHoverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TreeViewItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="#EAF5FF" />
+    <StaticResource x:Key="TreeViewItemPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TreeViewItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="TreeViewItemPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TreeViewItemSelectedForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="TreeViewItemSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <StaticResource x:Key="TreeViewItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Window.axaml b/src/Semi.Avalonia/Themes/Light/Window.axaml
index b2e8f39..1f95612 100644
--- a/src/Semi.Avalonia/Themes/Light/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Window.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="WindowDefaultBackground" Color="White" />
-    <SolidColorBrush x:Key="WindowDefaultForeground" Color="#1C1F23" />
+    <StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/_index.axaml b/src/Semi.Avalonia/Themes/Light/_index.axaml
index c747222..6ce2972 100644
--- a/src/Semi.Avalonia/Themes/Light/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Light/_index.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Palette.axaml" />
-        <!--  Controls  -->
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Border.axaml" />
diff --git a/src/Semi.Avalonia/Themes/LightTheme.axaml b/src/Semi.Avalonia/Themes/LightTheme.axaml
deleted file mode 100644
index aeae5cc..0000000
--- a/src/Semi.Avalonia/Themes/LightTheme.axaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Palette.axaml b/src/Semi.Avalonia/Themes/Shared/Palette.axaml
deleted file mode 100644
index d1981be..0000000
--- a/src/Semi.Avalonia/Themes/Shared/Palette.axaml
+++ /dev/null
@@ -1,2 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/_index.axaml b/src/Semi.Avalonia/Themes/Shared/_index.axaml
index 7d03eff..20cdaf7 100644
--- a/src/Semi.Avalonia/Themes/Shared/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Palette.axaml" />
-        <!--  Controls  -->
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Border.axaml" />
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
similarity index 74%
rename from src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml
rename to src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
index 28b911a..a2583be 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
@@ -7,7 +7,4 @@
     <Color x:Key="HighlightColor">#8EE3F0</Color>
     <Color x:Key="ButtonTextColor">#FFFFFF</Color>
     <Color x:Key="ButtonFaceColor">#202020</Color>
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
-    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
similarity index 74%
rename from src/Semi.Avalonia/Themes/HighContrast/Desert.axaml
rename to src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
index 60c1a26..80bd582 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
@@ -7,7 +7,4 @@
     <Color x:Key="HighlightColor">#903909</Color>
     <Color x:Key="ButtonTextColor">#202020</Color>
     <Color x:Key="ButtonFaceColor">#FFFAEF</Color>
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
-    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
similarity index 74%
rename from src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml
rename to src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
index 6d4f033..6474bdf 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
@@ -7,7 +7,4 @@
     <Color x:Key="HighlightColor">#A1BFDE</Color>
     <Color x:Key="ButtonTextColor">#B6F6F0</Color>
     <Color x:Key="ButtonFaceColor">#2D3236</Color>
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
-    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml b/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
similarity index 74%
rename from src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml
rename to src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
index f62d65c..a2c9c9c 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
@@ -7,7 +7,4 @@
     <Color x:Key="HighlightColor">#D6B4FD</Color>
     <Color x:Key="ButtonTextColor">#FFEE32</Color>
     <Color x:Key="ButtonFaceColor">#000000</Color>
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
-    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml
similarity index 95%
rename from src/Semi.Avalonia/Themes/Dark/Palette.axaml
rename to src/Semi.Avalonia/Tokens/Palette/Dark.axaml
index 9d52d2e..75b0621 100644
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml
+++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml
@@ -1,5 +1,7 @@
-<ResourceDictionary x:Class="Semi.Avalonia.Dark.Palette" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary x:Class="Semi.Avalonia.Tokens.Palette.Dark" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Color Resources  -->
+    <Color x:Key="SemiWhiteColor">White</Color>
+    <Color x:Key="SemiBlackColor">Black</Color>
     <Color x:Key="SemiRed0Color">#6C090B</Color>
     <Color x:Key="SemiRed1Color">#901110</Color>
     <Color x:Key="SemiRed2Color">#B42019</Color>
@@ -166,7 +168,8 @@
     <Color x:Key="SemiBackground3Color">#43444A</Color>
     <Color x:Key="SemiBackground4Color">#4F5159</Color>
 
-    <SolidColorBrush x:Key="SemiRed0" Color="{StaticResource SemiRed0Color}" />
+    <SolidColorBrush x:Key="SemiWhite" Color="{StaticResource SemiWhiteColor}" />
+    <SolidColorBrush x:Key="SemiBlack" Color="{StaticResource SemiBlackColor}" />
     <SolidColorBrush x:Key="SemiRed1" Color="{StaticResource SemiRed1Color}" />
     <SolidColorBrush x:Key="SemiRed2" Color="{StaticResource SemiRed2Color}" />
     <SolidColorBrush x:Key="SemiRed3" Color="{StaticResource SemiRed3Color}" />
@@ -327,10 +330,11 @@
     <SolidColorBrush x:Key="SemiGrey8" Color="{StaticResource SemiGrey8Color}" />
     <SolidColorBrush x:Key="SemiGrey9" Color="{StaticResource SemiGrey9Color}" />
 
+    <SolidColorBrush x:Key="SemiColorWhite" Color="{StaticResource SemiWhiteColor}" />
+    <SolidColorBrush x:Key="SemiColorBlack" Color="{StaticResource SemiBlackColor}" />
     <!--  Primary  -->
     <SolidColorBrush x:Key="SemiColorPrimary" Color="{StaticResource SemiBlue5Color}" />
     <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="{StaticResource SemiBlue6Color}" />
-    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorPrimaryActive" Color="{StaticResource SemiBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="{StaticResource SemiBlue2Color}" />
     <SolidColorBrush x:Key="SemiColorPrimaryLight" Opacity="0.2" Color="{StaticResource SemiBlue5Color}" />
@@ -339,7 +343,6 @@
     <!--  Secondary  -->
     <SolidColorBrush x:Key="SemiColorSecondary" Color="{StaticResource SemiLightBlue5Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="{StaticResource SemiLightBlue6Color}" />
-    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryActive" Color="{StaticResource SemiLightBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryLight" Opacity="0.2" Color="{StaticResource SemiLightBlue5Color}" />
@@ -348,7 +351,6 @@
     <!--  Tertiary  -->
     <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
     <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="{StaticResource SemiGrey6Color}" />
-    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
     <SolidColorBrush x:Key="SemiColorTertiaryActive" Color="{StaticResource SemiGrey7Color}" />
     <SolidColorBrush x:Key="SemiColorTertiaryLight" Opacity="0.2" Color="{StaticResource SemiGrey5Color}" />
     <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiGrey5Color}" />
@@ -356,7 +358,6 @@
     <!--  Information  -->
     <SolidColorBrush x:Key="SemiColorInformation" Color="{StaticResource SemiBlue5Color}" />
     <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="{StaticResource SemiBlue6Color}" />
-    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorInformationActive" Color="{StaticResource SemiBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="{StaticResource SemiBlue2Color}" />
     <SolidColorBrush x:Key="SemiColorInformationLight" Opacity="0.2" Color="{StaticResource SemiBlue5Color}" />
@@ -365,7 +366,6 @@
     <!--  Success  -->
     <SolidColorBrush x:Key="SemiColorSuccess" Color="{StaticResource SemiGreen5Color}" />
     <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="{StaticResource SemiGreen6Color}" />
-    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
     <SolidColorBrush x:Key="SemiColorSuccessActive" Color="{StaticResource SemiGreen7Color}" />
     <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="{StaticResource SemiGreen2Color}" />
     <SolidColorBrush x:Key="SemiColorSuccessLight" Opacity="0.2" Color="{StaticResource SemiGreen5Color}" />
@@ -374,7 +374,6 @@
     <!--  Warning  -->
     <SolidColorBrush x:Key="SemiColorWarning" Color="{StaticResource SemiOrange5Color}" />
     <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="{StaticResource SemiOrange6Color}" />
-    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
     <SolidColorBrush x:Key="SemiColorWarningActive" Color="{StaticResource SemiOrange7Color}" />
     <SolidColorBrush x:Key="SemiColorWarningLight" Opacity="0.2" Color="{StaticResource SemiOrange5Color}" />
     <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Opacity="0.3" Color="{StaticResource SemiOrange5Color}" />
@@ -382,7 +381,6 @@
     <!--  Danger  -->
     <SolidColorBrush x:Key="SemiColorDanger" Color="{StaticResource SemiRed5Color}" />
     <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="{StaticResource SemiRed6Color}" />
-    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
     <SolidColorBrush x:Key="SemiColorDangerActive" Color="{StaticResource SemiRed7Color}" />
     <SolidColorBrush x:Key="SemiColorDangerLight" Opacity="0.2" Color="{StaticResource SemiRed5Color}" />
     <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Opacity="0.3" Color="{StaticResource SemiRed5Color}" />
@@ -408,12 +406,17 @@
     <SolidColorBrush x:Key="SemiColorBackground4" Color="{StaticResource SemiBackground4Color}" />
 
     <!--  Fill  -->
-    <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="SemiColorFill1" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="SemiColorFill2" Opacity="0.20" Color="White" />
+    <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.12" Color="{StaticResource SemiWhiteColor}" />
+    <SolidColorBrush x:Key="SemiColorFill1" Opacity="0.16" Color="{StaticResource SemiWhiteColor}" />
+    <SolidColorBrush x:Key="SemiColorFill2" Opacity="0.20" Color="{StaticResource SemiWhiteColor}" />
 
     <!--  Border  -->
-    <SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="White" />
+    <SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="{StaticResource SemiWhiteColor}" />
+    <SolidColorBrush x:Key="SemiColorFocusBorder" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorNavBackground" Color="{StaticResource SemiBackground1Color}" />
+    <SolidColorBrush x:Key="SemiColorOverlayBackground" Opacity="0.6" Color="{StaticResource SemiBackground0Color}" />
+    <SolidColorBrush x:Key="SemiColorHighlightBackground" Color="{StaticResource SemiYellow4Color}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource SemiBlackColor}" />
 
     <!--  Disabled  -->
     <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
@@ -425,4 +428,13 @@
     <!--  Shadow  -->
     <BoxShadows x:Key="SemiColorShadow">0 0 #0A000000</BoxShadows>
     <BoxShadows x:Key="SemiShadowElevated">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
+
+    <!-- Obsolete -->
+    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs
new file mode 100644
index 0000000..3debf2a
--- /dev/null
+++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs
@@ -0,0 +1,5 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Tokens.Palette;
+
+public class Dark : ResourceDictionary;
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Tokens/Palette/Light.axaml
similarity index 96%
rename from src/Semi.Avalonia/Themes/Light/Palette.axaml
rename to src/Semi.Avalonia/Tokens/Palette/Light.axaml
index af79721..a489b3c 100644
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml
@@ -1,5 +1,7 @@
-<ResourceDictionary x:Class="Semi.Avalonia.Light.Palette" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary x:Class="Semi.Avalonia.Tokens.Palette.Light" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Color Resources  -->
+    <Color x:Key="SemiWhiteColor">White</Color>
+    <Color x:Key="SemiBlackColor">Black</Color>
     <Color x:Key="SemiRed0Color">#FEF2ED</Color>
     <Color x:Key="SemiRed1Color">#FEDDD2</Color>
     <Color x:Key="SemiRed2Color">#FDB7A5</Color>
@@ -166,6 +168,8 @@
     <Color x:Key="SemiBackground3Color">White</Color>
     <Color x:Key="SemiBackground4Color">White</Color>
 
+    <SolidColorBrush x:Key="SemiWhite" Color="{StaticResource SemiWhiteColor}" />
+    <SolidColorBrush x:Key="SemiBlack" Color="{StaticResource SemiBlackColor}" />
     <SolidColorBrush x:Key="SemiRed0" Color="{StaticResource SemiRed0Color}" />
     <SolidColorBrush x:Key="SemiRed1" Color="{StaticResource SemiRed1Color}" />
     <SolidColorBrush x:Key="SemiRed2" Color="{StaticResource SemiRed2Color}" />
@@ -327,10 +331,11 @@
     <SolidColorBrush x:Key="SemiGrey8" Color="{StaticResource SemiGrey8Color}" />
     <SolidColorBrush x:Key="SemiGrey9" Color="{StaticResource SemiGrey9Color}" />
 
+    <SolidColorBrush x:Key="SemiColorWhite" Color="{StaticResource SemiWhiteColor}" />
+    <SolidColorBrush x:Key="SemiColorBlack" Color="{StaticResource SemiBlackColor}" />
     <!--  Primary  -->
     <SolidColorBrush x:Key="SemiColorPrimary" Color="{StaticResource SemiBlue5Color}" />
     <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="{StaticResource SemiBlue6Color}" />
-    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorPrimaryActive" Color="{StaticResource SemiBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="{StaticResource SemiBlue2Color}" />
     <SolidColorBrush x:Key="SemiColorPrimaryLight" Color="{StaticResource SemiBlue0Color}" />
@@ -339,7 +344,6 @@
     <!--  Secondary  -->
     <SolidColorBrush x:Key="SemiColorSecondary" Color="{StaticResource SemiLightBlue5Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="{StaticResource SemiLightBlue6Color}" />
-    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryActive" Color="{StaticResource SemiLightBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryLight" Color="{StaticResource SemiLightBlue0Color}" />
@@ -348,7 +352,6 @@
     <!--  Tertiary  -->
     <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
     <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="{StaticResource SemiGrey6Color}" />
-    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
     <SolidColorBrush x:Key="SemiColorTertiaryActive" Color="{StaticResource SemiGrey7Color}" />
     <SolidColorBrush x:Key="SemiColorTertiaryLight" Color="{StaticResource SemiGrey0Color}" />
     <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Color="{StaticResource SemiGrey1Color}" />
@@ -356,7 +359,6 @@
     <!--  Information  -->
     <SolidColorBrush x:Key="SemiColorInformation" Color="{StaticResource SemiBlue5Color}" />
     <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="{StaticResource SemiBlue6Color}" />
-    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorInformationActive" Color="{StaticResource SemiBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="{StaticResource SemiBlue2Color}" />
     <SolidColorBrush x:Key="SemiColorInformationLight" Color="{StaticResource SemiBlue0Color}" />
@@ -365,7 +367,6 @@
     <!--  Success  -->
     <SolidColorBrush x:Key="SemiColorSuccess" Color="{StaticResource SemiGreen5Color}" />
     <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="{StaticResource SemiGreen6Color}" />
-    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
     <SolidColorBrush x:Key="SemiColorSuccessActive" Color="{StaticResource SemiGreen7Color}" />
     <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="{StaticResource SemiGreen2Color}" />
     <SolidColorBrush x:Key="SemiColorSuccessLight" Color="{StaticResource SemiGreen0Color}" />
@@ -374,7 +375,6 @@
     <!--  Warning  -->
     <SolidColorBrush x:Key="SemiColorWarning" Color="{StaticResource SemiOrange5Color}" />
     <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="{StaticResource SemiOrange6Color}" />
-    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
     <SolidColorBrush x:Key="SemiColorWarningActive" Color="{StaticResource SemiOrange7Color}" />
     <SolidColorBrush x:Key="SemiColorWarningLight" Color="{StaticResource SemiOrange0Color}" />
     <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Color="{StaticResource SemiOrange1Color}" />
@@ -382,7 +382,6 @@
     <!--  Danger  -->
     <SolidColorBrush x:Key="SemiColorDanger" Color="{StaticResource SemiRed5Color}" />
     <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="{StaticResource SemiRed6Color}" />
-    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
     <SolidColorBrush x:Key="SemiColorDangerActive" Color="{StaticResource SemiRed7Color}" />
     <SolidColorBrush x:Key="SemiColorDangerLight" Color="{StaticResource SemiRed0Color}" />
     <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Color="{StaticResource SemiRed1Color}" />
@@ -414,6 +413,11 @@
 
     <!--  Border  -->
     <SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorFocusBorder" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorNavBackground" Color="{StaticResource SemiBackground1Color}" />
+    <SolidColorBrush x:Key="SemiColorOverlayBackground" Opacity="0.6" Color="#16161A" />
+    <SolidColorBrush x:Key="SemiColorHighlightBackground" Color="{StaticResource SemiYellow2Color}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource SemiWhiteColor}" />
 
     <!--  Disabled  -->
     <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
@@ -425,4 +429,13 @@
     <!--  Shadow  -->
     <BoxShadows x:Key="SemiColorShadow">0 0 #0A000000</BoxShadows>
     <BoxShadows x:Key="SemiShadowElevated">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
+
+    <!-- Obsolete -->
+    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs b/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs
new file mode 100644
index 0000000..44a15af
--- /dev/null
+++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs
@@ -0,0 +1,5 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Tokens.Palette;
+
+public class Light : ResourceDictionary;
\ No newline at end of file