diff --git a/demo/Semi.Avalonia.Demo.Desktop/App.axaml b/demo/Semi.Avalonia.Demo.Desktop/App.axaml
index 1bcd897..18e42be 100644
--- a/demo/Semi.Avalonia.Demo.Desktop/App.axaml
+++ b/demo/Semi.Avalonia.Demo.Desktop/App.axaml
@@ -4,6 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Semi.Avalonia.Demo.Desktop">
     <Application.Styles>
-        <StyleInclude Source="avares://Semi.Avalonia/Themes/LightTheme.axaml" />
+        <StyleInclude Source="avares://Semi.Avalonia/Themes/DarkTheme.axaml" />
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/Border.axaml b/src/Semi.Avalonia/Controls/Border.axaml
index 6d56000..26a01f6 100644
--- a/src/Semi.Avalonia/Controls/Border.axaml
+++ b/src/Semi.Avalonia/Controls/Border.axaml
@@ -26,10 +26,10 @@
         <Setter Property="Border.BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" />
         <Setter Property="Border.Margin" Value="{DynamicResource ThicknessCardMargin}" />
         <Style Selector="^.Shadow">
-            <Setter Property="Border.BoxShadow" Value="0 0 14 #1A000000" />
+            <Setter Property="Border.BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
         <Style Selector="^.Hover:pointerover">
-            <Setter Property="Border.BoxShadow" Value="0 0 14 #1A000000" />
+            <Setter Property="Border.BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
 
     </ControlTheme>
diff --git a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
index e0ace81..346ed1a 100644
--- a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
@@ -81,7 +81,6 @@
                             <RepeatButton
                                 Name="PART_DecreaseButton"
                                 Grid.Row="1"
-                                Foreground="Black"
                                 Theme="{StaticResource ButtonSpinnerRepeatButton}">
                                 <PathIcon
                                     Width="8"
diff --git a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
index 791c189..afdd762 100644
--- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
@@ -90,9 +90,11 @@
                                 Theme="{DynamicResource CalendarDatePickerButton}" />
                             <Popup
                                 Name="PART_Popup"
+                                HorizontalOffset="-8"
                                 IsLightDismissEnabled="True"
-                                PlacementTarget="{TemplateBinding}">
-                                <Border Margin="8" BoxShadow="0 0 8 0 #1A000000">
+                                PlacementTarget="{TemplateBinding}"
+                                VerticalOffset="-4">
+                                <Border Margin="8" BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}">
                                     <Calendar
                                         Name="PART_Calendar"
                                         DisplayDate="{TemplateBinding DisplayDate}"
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 66ad9f0..e170212 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -5,7 +5,7 @@
         <Setter Property="MinWidth" Value="296" />
         <Setter Property="MaxHeight" Value="300" />
         <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Background" Value="White" />
+        <Setter Property="Background" Value="{DynamicResource DateTimePickerPopupBackground}" />
         <Setter Property="CornerRadius" Value="6" />
         <Setter Property="Template">
             <ControlTemplate TargetType="DatePickerPresenter">
diff --git a/src/Semi.Avalonia/Controls/NotificationCard.axaml b/src/Semi.Avalonia/Controls/NotificationCard.axaml
index dd24a39..629a823 100644
--- a/src/Semi.Avalonia/Controls/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Controls/NotificationCard.axaml
@@ -19,7 +19,7 @@
                 <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
                     <Border
                         Margin="8"
-                        BoxShadow="0 0 8 0 #1A000000"
+                        BoxShadow="{DynamicResource NotificationCardBoxShadows}"
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <Border
                             Background="{TemplateBinding Background}"
diff --git a/src/Semi.Avalonia/Controls/ProgressBar.axaml b/src/Semi.Avalonia/Controls/ProgressBar.axaml
index 783a00a..7055e2d 100644
--- a/src/Semi.Avalonia/Controls/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Controls/ProgressBar.axaml
@@ -150,7 +150,10 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         IsVisible="{TemplateBinding ShowProgressText}">
-                        <TextBlock FontWeight="{DynamicResource ProgressBarTextFontWeight}" Foreground="{DynamicResource ProgressBarTextForeground}">
+                        <TextBlock
+                            Name="PART_ProgressText"
+                            FontWeight="{DynamicResource ProgressBarTextFontWeight}"
+                            Foreground="{DynamicResource ProgressBarTextForeground}">
                             <TextBlock.Text>
                                 <MultiBinding Converter="{StaticResource StringFormatConverter}">
                                     <TemplateBinding Property="ProgressTextFormat" />
@@ -294,6 +297,9 @@
                 <Setter Property="Border.MinWidth" Value="4" />
                 <Setter Property="Border.HorizontalAlignment" Value="Center" />
             </Style>
+            <Style Selector="^ /template/ TextBlock#PART_ProgressText">
+                <Setter Property="TextBlock.Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+            </Style>
         </Style>
         <Style Selector="^.Right">
             <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
@@ -314,6 +320,9 @@
                 <Setter Property="Border.MinWidth" Value="4" />
                 <Setter Property="Border.HorizontalAlignment" Value="Center" />
             </Style>
+            <Style Selector="^ /template/ TextBlock#PART_ProgressText">
+                <Setter Property="TextBlock.Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+            </Style>
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml
index be40ad5..c7c0229 100644
--- a/src/Semi.Avalonia/Controls/RadioButton.axaml
+++ b/src/Semi.Avalonia/Controls/RadioButton.axaml
@@ -39,7 +39,8 @@
                                 Height="{DynamicResource RadioButtonIconRadius}"
                                 Fill="{DynamicResource RadioButtonUncheckIconDefaultBackground}"
                                 Stroke="{DynamicResource RadioButtonUncheckIconDefaultBorderBrush}"
-                                StrokeThickness="1" UseLayoutRounding="False" />
+                                StrokeThickness="1"
+                                UseLayoutRounding="False" />
 
                             <Ellipse
                                 Name="CheckGlyph"
@@ -48,11 +49,13 @@
                                 Fill="{DynamicResource RadioButtonCheckGlyphFill}"
                                 Opacity="0"
                                 Stroke="{DynamicResource RadioButtonCheckGlyphFill}"
-                                StrokeThickness="0" UseLayoutRounding="False" />
+                                StrokeThickness="0"
+                                UseLayoutRounding="False" />
                         </Grid>
 
                         <ContentPresenter
-                            Name="PART_ContentPresenter" Grid.Column="1"
+                            Name="PART_ContentPresenter"
+                            Grid.Column="1"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
@@ -158,7 +161,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked">
-            <Setter Property="RadioButton.Background" Value="White" />
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
             <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
         </Style>
         <Style Selector="^:unchecked">
@@ -206,7 +209,8 @@
                                 Height="{DynamicResource RadioButtonIconRadius}"
                                 Fill="{DynamicResource RadioButtonUncheckIconDefaultBackground}"
                                 Stroke="{DynamicResource RadioButtonUncheckIconDefaultBorderBrush}"
-                                StrokeThickness="1" UseLayoutRounding="False" />
+                                StrokeThickness="1"
+                                UseLayoutRounding="False" />
 
                             <Ellipse
                                 Name="CheckGlyph"
@@ -215,11 +219,13 @@
                                 Fill="{DynamicResource RadioButtonCheckGlyphFill}"
                                 Opacity="0"
                                 Stroke="{DynamicResource RadioButtonCheckGlyphFill}"
-                                StrokeThickness="0" UseLayoutRounding="False" />
+                                StrokeThickness="0"
+                                UseLayoutRounding="False" />
                         </Grid>
 
                         <ContentPresenter
-                            Name="PART_ContentPresenter" Grid.Column="1"
+                            Name="PART_ContentPresenter"
+                            Grid.Column="1"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 86f6212..cabc5b3 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -94,6 +94,7 @@
         <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="TextBox.FontSize" Value="14" />
         <Setter Property="TextBox.Cursor" Value="IBeam" />
+        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
         <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
         <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
         <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index 6b47b57..811100a 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -5,7 +5,7 @@
         <Setter Property="MinWidth" Value="242" />
         <Setter Property="MaxHeight" Value="300" />
         <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Background" Value="White" />
+        <Setter Property="Background" Value="{DynamicResource DateTimePickerPopupBackground}" />
         <Setter Property="CornerRadius" Value="6" />
         <Setter Property="Template">
             <ControlTemplate TargetType="TimePickerPresenter">
diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
new file mode 100644
index 0000000..b969a17
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="AutoCompleteBoxDefaultBorderBrush" Color="#41464C" />
+    <SolidColorBrush x:Key="AutoCompleteBoxDefaultBackground" Color="Transparent" />
+    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="#35363C" />
+    <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
+    <Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
+    <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
+    <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#E6E8EA" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml
new file mode 100644
index 0000000..a7f0d5c
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml
@@ -0,0 +1,12 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="BorderCardBackground" Color="#232429" />
+    <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <CornerRadius x:Key="RadiusCardCornerRadius">4</CornerRadius>
+    <Thickness x:Key="ThicknessCardPadding">20</Thickness>
+    <Thickness x:Key="ThicknessCardMargin">4</Thickness>
+    <Thickness x:Key="ThicknessCardBorderThickness">1</Thickness>
+    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml
index 0b8abd6..ebd498f 100644
--- a/src/Semi.Avalonia/Themes/Dark/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml
@@ -1,6 +1,85 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <SolidColorBrush x:Key="ButtonDefaultBackground" Color="Red"/>
-    <SolidColorBrush x:Key="ButtonDefaultForeground" Color="White"/>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="using:System">
+    <!--  Add Resources Here  -->
+    <sys:Double x:Key="ButtonDefaultFontSize">14</sys:Double>
+    <FontWeight x:Key="ButtonDefaultFontWeight">600</FontWeight>
+
+    <Thickness x:Key="ButtonDefaultPadding">12 6</Thickness>
+    <Thickness x:Key="ButtonLargePadding">16 10</Thickness>
+    <Thickness x:Key="ButtonSmallPadding">6 2</Thickness>
+
+    <Thickness x:Key="ButtonBorderThickness">1</Thickness>
+
+    <CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
+
+    <!--  Light  -->
+    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Color="#888D92" />
+    <SolidColorBrush x:Key="ButtonDefaultWarningForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ButtonDefaultDangerForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Color="#2E3238" />
+
+    <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" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledBackground" Opacity="0.12" Color="White" />
+
+    <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="Black" />
+    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Color="Gray" />
+
+    <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#7FC1FF" />
+    <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="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="ButtonSolidDisabledBackground" Color="Gray" />
+
+    <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="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="ButtonSolidDisabledBorderBrush" Color="Gray" />
+    <!--  end Solid  -->
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
new file mode 100644
index 0000000..fc13d7a
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <PathGeometry x:Key="ButtonSpinnerIncreaseButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
+    <PathGeometry x:Key="ButtonSpinnerDecreaseButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="#16161A" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.20" Color="White" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+
+    <CornerRadius x:Key="ButtonSpinnerButtonGroupCornerRadius">3</CornerRadius>
+    <Thickness x:Key="ButtonSpinnerButtonGroupBorderThickness">1</Thickness>
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
new file mode 100644
index 0000000..8a3a24e
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
@@ -0,0 +1,50 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="using:System">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="CalendarBackground" Color="#232429" />
+    <SolidColorBrush x:Key="CalendarForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <Thickness x:Key="CalendarBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CalendarCornerRadius">6</CornerRadius>
+    <GridLength x:Key="CalendarItemWeekDayNameHeight">40</GridLength>
+    <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.62" Color="#F9F9F9" />
+    <PathGeometry x:Key="CalendarItemPreviousIconGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</PathGeometry>
+    <PathGeometry x:Key="CalendarItemNextIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
+
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="#232429" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
+    <Thickness x:Key="CalendarItemCalendarButtonBorderThickness">0</Thickness>
+    <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="#232429" />
+    <FontWeight x:Key="CalendarItemCalendarButtonSelectedFontWeight">600</FontWeight>
+    <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" />
+    <CornerRadius x:Key="CalendarItemCalendarButtonCornerRadius">3</CornerRadius>
+
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
+    <CornerRadius x:Key="CalendarItemCalendarDayButtonCornerRadius">3</CornerRadius>
+
+    <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="#232429" />
+
+    <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.62" Color="#F9F9F9" />
+
+    <sys:Double x:Key="CalendarMinWidth">240</sys:Double>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
new file mode 100644
index 0000000..8d816ba
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--    -->
+    <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#F9F9F9" />
+    <PathGeometry x:Key="CalendarDatePickerIconGlyph">M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z</PathGeometry>
+    <SolidColorBrush x:Key="CalendarDatePickerBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="#41464C" />
+    <Thickness x:Key="CalendarDatePickerBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CalendarDatePickerCornerRadius">3</CornerRadius>
+    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CalendarDatePickerDisabledBorderBrush" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
+    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
new file mode 100644
index 0000000..6f17819
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <PathGeometry x:Key="WindowCloseIconGlyph">M13.46,12L19,17.54V19H17.54L12,13.46L6.46,19H5V17.54L10.54,12L5,6.46V5H6.46L12,10.54L17.54,5H19V6.46L13.46,12Z</PathGeometry>
+    <PathGeometry x:Key="WindowMaximizeGlyph">M4,4H20V20H4V4M6,8V18H18V8H6Z</PathGeometry>
+    <PathGeometry x:Key="WindowMinimizeGlyph">M20,14H4V10H20</PathGeometry>
+    <PathGeometry x:Key="WindowRestoreGlyph">M4,8H8V4H20V16H16V20H4V8M16,8V14H18V6H10V8H16M6,12V18H14V12H6Z</PathGeometry>
+    <PathGeometry x:Key="WindowExpandGlyph">M10,21V19H6.41L10.91,14.5L9.5,13.09L5,17.59V14H3V21H10M14.5,10.91L19,6.41V10H21V3H14V5H17.59L13.09,9.5L14.5,10.91Z</PathGeometry>
+    <PathGeometry x:Key="WindowCollapseGlyph">M19.5,3.09L15,7.59V4H13V11H20V9H16.41L20.91,4.5L19.5,3.09M4,13V15H7.59L3.09,19.5L4.5,20.91L9,16.41V20H11V13H4Z</PathGeometry>
+    <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.62" Color="#F9F9F9" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
index b166afb..e483028 100644
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -1,38 +1,38 @@
 <ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="CheckboxForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CheckboxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
-    <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" />
+    <SolidColorBrush x:Key="CheckboxGlyphFill" Color="#16161A" />
+    <SolidColorBrush x:Key="CheckboxGlyphDisabledFill" Color="#16161A" />
 
     <SolidColorBrush x:Key="CheckboxDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CheckboxDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CheckboxPointOverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckboxPointOverBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckboxPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="CheckboxPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="CheckboxDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CheckboxPointOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CheckboxPointOverBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CheckboxPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CheckboxPressedBorderBrush" Color="#A9D7FF" />
 
-    <SolidColorBrush x:Key="CheckboxCheckedDefaultBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckboxCheckedDefaultBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckboxCheckedPointOverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="CheckboxCheckedPointOverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="CheckboxCheckedPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="CheckboxCheckedPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="CheckboxCheckedDefaultBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedDefaultBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedPointOverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedPressedBorderBrush" Color="#A9D7FF" />
 
-    <SolidColorBrush x:Key="CheckboxDefaultDisabledBackground" Opacity="0.04" 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="CheckboxDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CheckboxDefaultDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CheckboxCheckedDisabledBackground" Color="#135cb8" />
+    <SolidColorBrush x:Key="CheckboxCheckedDisabledBorderBrush" Color="#135cb8" />
 
     <sys:Double x:Key="CheckboxFontSize">14</sys:Double>
     <sys:Double x:Key="CheckboxBoxWidth">16</sys:Double>
     <sys:Double x:Key="CheckboxBoxHeight">16</sys:Double>
     <FontWeight x:Key="CheckboxFontWeight">400</FontWeight>
 
-    <CornerRadius x:Key="CornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="CheckboxBoxCornerRadius">3</CornerRadius>
     <Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness>
     <Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
new file mode 100644
index 0000000..b7f63ae
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -0,0 +1,40 @@
+<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="ComboBoxSelectorPressedBackground" Opacity="0.20" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPointerOverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#A9D7FF" />
+
+    <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
+
+    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ComboBoxIconPointerOverForeground" 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" />
+
+    <Thickness x:Key="ComboBoxItemDefaultPadding">8 4</Thickness>
+    <Thickness x:Key="ComboBoxSelectorDefaultPadding">8 0</Thickness>
+
+    <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="#35363C" />
+    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
+
+    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxItemPointerOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#053170" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedPointerOverBackground" Color="#0A4694" />
+
+    <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <PathGeometry x:Key="ComboBoxIcon">
+        M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z
+    </PathGeometry>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Dark.axaml b/src/Semi.Avalonia/Themes/Dark/Dark.axaml
index b4add3a..d108546 100644
--- a/src/Semi.Avalonia/Themes/Dark/Dark.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Dark.axaml
@@ -3,8 +3,42 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Palette.axaml" />
         <!--  Controls  -->
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Border.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Button.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Calendar.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/CaptionButtons.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/CheckBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ComboBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DatePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DropdownButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Expander.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/GridSplitter.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Label.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ListBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Menu.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/NotificationCard.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/NumericUpDown.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ProgressBar.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/RadioButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ScrollViewer.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Slider.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/SplitButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/SplitView.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TabControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TabItem.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TextBlock.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TextBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TimePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ToggleButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Tooltip.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TreeView.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Window.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Flyout.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/DatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/DatePicker.axaml
new file mode 100644
index 0000000..6964b5d
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/DatePicker.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <PathGeometry x:Key="DatePickerIconGlyph">M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z</PathGeometry>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
new file mode 100644
index 0000000..c7d40b7
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -0,0 +1,42 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="#35363C" />
+    <Thickness x:Key="DateTimePickerListItemPadding">0 3 0 6</Thickness>
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.20" Color="White" />
+
+    <PathGeometry x:Key="DateTimePickerButtonUpGlyph">M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z</PathGeometry>
+    <PathGeometry x:Key="DateTimePickerButtonDownGlyph">M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z</PathGeometry>
+    <PathGeometry x:Key="DateTimePickerAcceptGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
+    <PathGeometry x:Key="DateTimePickerDismissGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</PathGeometry>
+
+    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
+    <sys:Double x:Key="DateTimePickerListBoxItemHeight">28</sys:Double>
+
+
+    <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="#41464C" />
+    <SolidColorBrush x:Key="DateTimePickerButtonBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="#1C1F23" />
+    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
+
+    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
+    <Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</Thickness>
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/DropdownButton.axaml b/src/Semi.Avalonia/Themes/Dark/DropdownButton.axaml
new file mode 100644
index 0000000..ffedda8
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/DropdownButton.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <PathGeometry x:Key="DropdownButtonIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Expander.axaml b/src/Semi.Avalonia/Themes/Dark/Expander.axaml
new file mode 100644
index 0000000..bcda685
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/Expander.axaml
@@ -0,0 +1,27 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ExpanderIconForeground" Opacity="0.62" Color="#F9F9F9" />
+    <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" />
+
+    <FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
+    <sys:Double x:Key="ExpanderIconSize">8</sys:Double>
+
+    <CornerRadius x:Key="ExpanderHeaderCornerRadius">3</CornerRadius>
+    <Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
+    <Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
+    <Thickness x:Key="ExpanderEndIconMargin">0 0 8 0</Thickness>
+    <Thickness x:Key="ExpanderContentMargin">16 4 16 8</Thickness>
+    <Thickness x:Key="ExpanderFrontIconMargin">8 0 0 0</Thickness>
+    <Thickness x:Key="ExpanderDownContentBorderThickness">0 0 0 1</Thickness>
+    <Thickness x:Key="ExpanderUpContentBorderThickness">0 1 0 0</Thickness>
+    <Thickness x:Key="ExpanderLeftContentBorderThickness">1 0 0 0</Thickness>
+    <Thickness x:Key="ExpanderRightContentBorderThickness">0 0 1 0</Thickness>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
new file mode 100644
index 0000000..d88a2fc
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
@@ -0,0 +1,18 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="FlyoutBackground" Color="#35363C" />
+    <SolidColorBrush x:Key="FlyoutForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <FontWeight x:Key="FlyoutFontWeight">400</FontWeight>
+    <Thickness x:Key="FlyoutBorderThickness">1</Thickness>
+    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <sys:Double x:Key="FlyoutMinHeight">100</sys:Double>
+    <sys:Double x:Key="FlyoutMinWidth">100</sys:Double>
+    <sys:Double x:Key="FlyoutMaxHeight">600</sys:Double>
+    <sys:Double x:Key="FlyoutMaxWidth">600</sys:Double>
+    <CornerRadius x:Key="FlyoutCornerRadius">6</CornerRadius>
+    <Thickness x:Key="FlyoutPadding">8</Thickness>
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
new file mode 100644
index 0000000..68006be
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="GridSplitterBackground" Opacity="0.4" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="#0A4694" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml
new file mode 100644
index 0000000..ca78364
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml
@@ -0,0 +1,109 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <!--  Typography related resources are combined with TextBlock  -->
+
+    <Thickness x:Key="LabelTagBorderThickness">1</Thickness>
+    <Thickness x:Key="LabelTagSmallPadding">8 2</Thickness>
+    <Thickness x:Key="LabelTagLargePadding">8 4</Thickness>
+    <sys:Double x:Key="LabelTagSmallHeight">20</sys:Double>
+    <sys:Double x:Key="LabelTagLargeHeight">24</sys:Double>
+    <sys:Double x:Key="LabelTagFontSize">12</sys:Double>
+    <CornerRadius x:Key="LabelTagSquareCornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="LabelTagCircleCornerRadius">9999</CornerRadius>
+
+    <SolidColorBrush x:Key="LabelTagLightAmberForeground" Color="#FCF6D2" />
+    <SolidColorBrush x:Key="LabelTagLightAmberBackground" Opacity="0.15" Color="#F5CA50" />
+    <SolidColorBrush x:Key="LabelTagLightBlueForeground" Color="#D4ECFF" />
+    <SolidColorBrush x:Key="LabelTagLightBlueBackground" Opacity="0.15" Color="#54A9FF" />
+    <SolidColorBrush x:Key="LabelTagLightCyanForeground" Color="#C6EFF1" />
+    <SolidColorBrush x:Key="LabelTagLightCyanBackground" Opacity="0.15" Color="#38BBC6" />
+    <SolidColorBrush x:Key="LabelTagLightGreenForeground" Color="#D0F0D1" />
+    <SolidColorBrush x:Key="LabelTagLightGreenBackground" Opacity="0.15" Color="#5DC264" />
+    <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#888D92" />
+    <SolidColorBrush x:Key="LabelTagLightIndigoForeground" Color="#D1D8F1" />
+    <SolidColorBrush x:Key="LabelTagLightIndigoBackground" Opacity="0.15" Color="#5F71C5" />
+    <SolidColorBrush x:Key="LabelTagLightLightBlueForeground" Color="#CEEEFC" />
+    <SolidColorBrush x:Key="LabelTagLightLightBlueBackground" Opacity="0.15" Color="#40B4F3" />
+    <SolidColorBrush x:Key="LabelTagLightLightGreenForeground" Color="#E4F1D1" />
+    <SolidColorBrush x:Key="LabelTagLightLightGreenBackground" Opacity="0.15" Color="#97C65F" />
+    <SolidColorBrush x:Key="LabelTagLightLimeForeground" Color="#AEDC3A" />
+    <SolidColorBrush x:Key="LabelTagLightLimeBackground" Opacity="0.15" Color="#E5F6C9" />
+    <SolidColorBrush x:Key="LabelTagLightOrangeForeground" Color="#FFEFD0" />
+    <SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagLightPinkForeground" Color="#FBD3DC" />
+    <SolidColorBrush x:Key="LabelTagLightPinkBackground" Opacity="0.15" Color="#EF5686" />
+    <SolidColorBrush x:Key="LabelTagLightPurpleForeground" Color="#EFCEF0" />
+    <SolidColorBrush x:Key="LabelTagLightPurpleBackground" Opacity="0.15" Color="#B553C2" />
+    <SolidColorBrush x:Key="LabelTagLightRedForeground" Color="#FEE0D5" />
+    <SolidColorBrush x:Key="LabelTagLightRedBackground" Opacity="0.15" Color="#FC725A" />
+    <SolidColorBrush x:Key="LabelTagLightTealForeground" Color="#C4F0E8" />
+    <SolidColorBrush x:Key="LabelTagLightTealBackground" Opacity="0.15" Color="#33C2B0" />
+    <SolidColorBrush x:Key="LabelTagLightVioletForeground" Color="#8865D4" />
+    <SolidColorBrush x:Key="LabelTagLightVioletBackground" Opacity="0.15" Color="#DDD4F4" />
+    <SolidColorBrush x:Key="LabelTagLightYellowForeground" Color="#FEFBD0" />
+    <SolidColorBrush x:Key="LabelTagLightYellowBackground" Opacity="0.15" Color="#FDDE43" />
+    <SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="#000000" />
+    <SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#41464C" />
+
+    <SolidColorBrush x:Key="LabelTagGhostAmberBorderBrush" Color="#F2B726" />
+    <SolidColorBrush x:Key="LabelTagGhostAmberForeground" Color="#F5CA50" />
+    <SolidColorBrush x:Key="LabelTagGhostBlueBorderBrush" Color="#2990FF" />
+    <SolidColorBrush x:Key="LabelTagGhostBlueForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="LabelTagGhostCyanBorderBrush" Color="#13A8B8" />
+    <SolidColorBrush x:Key="LabelTagGhostCyanForeground" Color="#38BBC6" />
+    <SolidColorBrush x:Key="LabelTagGhostGreenBorderBrush" Color="#3EB349" />
+    <SolidColorBrush x:Key="LabelTagGhostGreenForeground" Color="#5DC264" />
+    <SolidColorBrush x:Key="LabelTagGhostGreyBorderBrush" Color="#6B7075" />
+    <SolidColorBrush x:Key="LabelTagGhostGreyForeground" Color="#888D92" />
+    <SolidColorBrush x:Key="LabelTagGhostIndigoBorderBrush" Color="#4053B7" />
+    <SolidColorBrush x:Key="LabelTagGhostIndigoForeground" Color="#5F71C5" />
+    <SolidColorBrush x:Key="LabelTagGhostLightBlueBorderBrush" Color="#139FF0" />
+    <SolidColorBrush x:Key="LabelTagGhostLightBlueForeground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="LabelTagGhostLightGreenBorderBrush" Color="#7FB840" />
+    <SolidColorBrush x:Key="LabelTagGhostLightGreenForeground" Color="#97C65F" />
+    <SolidColorBrush x:Key="LabelTagGhostLimeBorderBrush" Color="#A2D311" />
+    <SolidColorBrush x:Key="LabelTagGhostLimeForeground" Color="#AEDC3A" />
+    <SolidColorBrush x:Key="LabelTagGhostOrangeBorderBrush" Color="#FF9214" />
+    <SolidColorBrush x:Key="LabelTagGhostOrangeForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagGhostPinkBorderBrush" Color="#EB2F71" />
+    <SolidColorBrush x:Key="LabelTagGhostPinkForeground" Color="#EF5686" />
+    <SolidColorBrush x:Key="LabelTagGhostPurpleBorderBrush" Color="#A033B3" />
+    <SolidColorBrush x:Key="LabelTagGhostPurpleForeground" Color="#B553C2" />
+    <SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="#FB4932" />
+    <SolidColorBrush x:Key="LabelTagGhostRedForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="LabelTagGhostTealBorderBrush" Color="#0EB3A1" />
+    <SolidColorBrush x:Key="LabelTagGhostTealForeground" Color="#33C2B0" />
+    <SolidColorBrush x:Key="LabelTagGhostVioletBorderBrush" Color="#7246C9" />
+    <SolidColorBrush x:Key="LabelTagGhostVioletForeground" Color="#8865D4" />
+    <SolidColorBrush x:Key="LabelTagGhostYellowBorderBrush" Color="#FCCE14" />
+    <SolidColorBrush x:Key="LabelTagGhostYellowForeground" Color="#FDDE43" />
+    <SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="#41464C" />
+    <SolidColorBrush x:Key="LabelTagGhostWhiteForeground" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="LabelTagSolidForeground" Color="#000000" />
+    <SolidColorBrush x:Key="LabelTagSolidAmberBackground" Color="#F5CA50" />
+    <SolidColorBrush x:Key="LabelTagSolidBlueBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="LabelTagSolidCyanBackground" Color="#38BBC6" />
+    <SolidColorBrush x:Key="LabelTagSolidGreenBackground" Color="#5DC264" />
+    <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#888D92" />
+    <SolidColorBrush x:Key="LabelTagSolidIndigoBackground" Color="#5F71C5" />
+    <SolidColorBrush x:Key="LabelTagSolidLightBlueBackground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="LabelTagSolidLightGreenBackground" Color="#97C65F" />
+    <SolidColorBrush x:Key="LabelTagSolidLimeBackground" Color="#AEDC3A" />
+    <SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="LabelTagSolidPinkBackground" Color="#EF5686" />
+    <SolidColorBrush x:Key="LabelTagSolidPurpleBackground" Color="#B553C2" />
+    <SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="#FC725A" />
+    <SolidColorBrush x:Key="LabelTagSolidTealBackground" Color="#33C2B0" />
+    <SolidColorBrush x:Key="LabelTagSolidVioletBackground" Color="#8865D4" />
+    <SolidColorBrush x:Key="LabelTagSolidYellowBackground" Color="#FDDE43" />
+
+    <SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="#000000" />
+    <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#41464C" />
+    <SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#F9F9F9" />
+
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
new file mode 100644
index 0000000..000712e
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Thickness x:Key="ListBoxItemDefaultPadding">8 4</Thickness>
+
+    <SolidColorBrush x:Key="ListBoxItemDefaultForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ListBoxItemIconDefaultForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ListBoxItemIconHoverForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Color="#053170" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="#0A4694" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <CornerRadius x:Key="ListBoxItemCornerRadius">3</CornerRadius>
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
new file mode 100644
index 0000000..fd95927
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ManagedFileChooserSeparatorBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <PathGeometry x:Key="ManagedFileChooserUpButtonGlyph">M20 18V20H13.5C9.91 20 7 17.09 7 13.5V7.83L3.91 10.92L2.5 9.5L8 4L13.5 9.5L12.09 10.91L9 7.83V13.5C9 16 11 18 13.5 18H20Z</PathGeometry>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
new file mode 100644
index 0000000..67dfba6
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -0,0 +1,46 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <!--  Add Resources Here  -->
+
+    <PathGeometry x:Key="MenuScrollViewerUpButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
+    <PathGeometry x:Key="MenuScrollViewerDownButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
+    <PathGeometry x:Key="MenuItemExpandIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
+    <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Opacity="0.62" Color="#F9F9F9" />
+
+    <!--  MenuFlyout  -->
+    <SolidColorBrush x:Key="MenuFlyoutBackground" Color="#35363C" />
+    <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
+    <Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
+    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
+    <sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double>
+    <sys:Double x:Key="MenuFlyoutMinWidth">100</sys:Double>
+    <sys:Double x:Key="MenuFlyoutMaxHeight">400</sys:Double>
+    <sys:Double x:Key="MenuFlyoutMaxWidth">600</sys:Double>
+
+    <!--  MenuItem  -->
+    <SolidColorBrush x:Key="MenuItemBackground" Color="#35363C" />
+    <SolidColorBrush x:Key="MenuItemForeground" Color="#F9F9F9" />
+    <Thickness x:Key="MenuItemPadding">16 8</Thickness>
+
+    <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
+    <sys:Double x:Key="MenuItemSeparatorHeight">1</sys:Double>
+    <Thickness x:Key="MenuItemSeparatorMargin">2</Thickness>
+    <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.16" Color="White" />
+
+    <Thickness x:Key="MenuItemIconMargin">0 0 12 0</Thickness>
+    <Thickness x:Key="MenuItemInputGestureTextMargin">4 0</Thickness>
+
+    <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="Gray" />
+    <SolidColorBrush x:Key="MenuItemExpandIconForeground" Opacity="0.62" Color="#F9F9F9" />
+    <Thickness x:Key="MenuItemExpandIconMargin">4 0</Thickness>
+
+    <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" />
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
new file mode 100644
index 0000000..ef1c5d7
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
@@ -0,0 +1,20 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="NotificationCardForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+    <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" />
+    <sys:Double x:Key="NotificationCardWidth">320</sys:Double>
+    <Thickness x:Key="NotificationCardBorderThickness">1</Thickness>
+    <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
+    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <Geometry x:Key="NotificationCardInformationIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</Geometry>
+    <Geometry x:Key="NotificationCardSuccessIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</Geometry>
+    <Geometry x:Key="NotificationCardWarningIconPathData">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</Geometry>
+    <Geometry x:Key="NotificationCardErrorIconPathData">M23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12ZM13.5 17.5C13.5 16.6716 12.8284 16 12 16C11.1716 16 10.5 16.6716 10.5 17.5C10.5 18.3284 11.1716 19 12 19C12.8284 19 13.5 18.3284 13.5 17.5ZM12 5C10.9138 5 10.0507 5.91244 10.1109 6.99692L10.4168 12.5023C10.4635 13.3426 11.1584 14 12 14C12.8416 14 13.5365 13.3426 13.5832 12.5023L13.8891 6.99692C13.9493 5.91244 13.0862 5 12 5Z</Geometry>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/NumericUpDown.axaml b/src/Semi.Avalonia/Themes/Dark/NumericUpDown.axaml
new file mode 100644
index 0000000..9017e8d
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/NumericUpDown.axaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
new file mode 100644
index 0000000..10e2057
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#54A9FF" />
+    <CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
+    <SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
+    <FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
+    <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#5DC264" />
+    <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#FC725A" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
new file mode 100644
index 0000000..8ca35e3
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
@@ -0,0 +1,69 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <sys:Double x:Key="RadioButtonIconRadius">16</sys:Double>
+    <sys:Double x:Key="RadioButtonGlyphRadius">6</sys:Double>
+    <sys:Double x:Key="RadioButtonFontSize">14</sys:Double>
+    <Thickness x:Key="RadioButtonIconMargin">0 2 8 0</Thickness>
+
+
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBackground" 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="RadioButtonUncheckIconPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
+
+
+    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#135cb8" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#135cb8" />
+
+    <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="#16161A" />
+
+    <SolidColorBrush x:Key="RadioButtonForeground" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.12" Color="White" />
+
+    <CornerRadius x:Key="RadioButtonGroupCornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="RadioButtonButtonCornerRadius">3</CornerRadius>
+
+    <FontWeight x:Key="RadioButtonButtonFontWeight">600</FontWeight>
+    <Thickness x:Key="RadioButtonButtonSmallPadding">16 2</Thickness>
+    <Thickness x:Key="RadioButtonButtonDefaultPadding">16 4</Thickness>
+    <Thickness x:Key="RadioButtonButtonLargePadding">24 6</Thickness>
+
+    <sys:Double x:Key="RadioButtonButtonSmallFontSize">12</sys:Double>
+    <sys:Double x:Key="RadioButtonButtonDefaultFontSize">12</sys:Double>
+    <sys:Double x:Key="RadioButtonButtonLargeFontSize">14</sys:Double>
+
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="#43444A" />
+
+    <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>
+
+    <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#053170" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckDisabledBorderBrush" Color="#135cb8" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckPointOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckDisabledBackground" Opacity="0.12" Color="White" />
+
+    <CornerRadius x:Key="RadioButtonCardCornerRadius">3</CornerRadius>
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
new file mode 100644
index 0000000..fbb4bbc
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
@@ -0,0 +1,12 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <sys:Double x:Key="ScrollBarThickness">12</sys:Double>
+    <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
+    <SolidColorBrush x:Key="ScrollBarButtonDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointerOverForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ScrollBarBackground" Opacity="0.12" Color="White" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
new file mode 100644
index 0000000..884cd00
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
@@ -0,0 +1,28 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="SliderTrackForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="SliderTrackBackground" Opacity="0.12" Color="White" />
+    <sys:Double x:Key="SliderTrackWidth">4</sys:Double>
+    <CornerRadius x:Key="SliderTrackCornerRadius">3</CornerRadius>
+    <sys:Double x:Key="SliderThumbWidth">16</sys:Double>
+    <sys:Double x:Key="SliderThumbHeight">16</sys:Double>
+    <CornerRadius x:Key="SliderThumbCornerRadius">24</CornerRadius>
+    <Thickness x:Key="SliderBorderThickness">0</Thickness>
+    <BoxShadows x:Key="SliderThumbBoxShadow">0 0 1 1 #1AFFFFFF</BoxShadows>
+
+    <sys:Double x:Key="SliderTickHorizontalHeight">4</sys:Double>
+    <sys:Double x:Key="SliderTickVerticalWidth">4</sys:Double>
+    <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" />
+    <Thickness x:Key="SliderThumbBorderThickness">2</Thickness>
+
+    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#0A4694" />
+    <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#0A4694" />
+    <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#1C1F23" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/SplitButton.axaml b/src/Semi.Avalonia/Themes/Dark/SplitButton.axaml
new file mode 100644
index 0000000..8ef2922
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/SplitButton.axaml
@@ -0,0 +1,8 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <!--  Add Resources Here  -->
+    <PathGeometry x:Key="SplitButtonIconGlyph">M20.5598 9.65618L12.7546 18.6322C12.3559 19.0906 11.644 19.0906 11.2453 18.6322L3.4401 9.65618C2.8773 9.00895 3.33701 8 4.19471 8L19.8052 8C20.6629 8 21.1226 9.00895 20.5598 9.65618Z</PathGeometry>
+    <sys:Double x:Key="SplitButtonSeparatorWidth">1</sys:Double>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
new file mode 100644
index 0000000..3d12d13
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
@@ -0,0 +1,13 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="using:System">
+    <!--  Add Resources Here  -->
+    <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
+    <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
+    <sys:TimeSpan x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</sys:TimeSpan>
+    <sys:TimeSpan x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</sys:TimeSpan>
+    <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
+    <SolidColorBrush x:Key="SplitViewSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="SplitViewPaneBackground" Color="Black" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
index 9017e8d..05f09c4 100644
--- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
@@ -1,3 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
+    <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.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Opacity="0.8" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="TabItemLineHeaderBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverBackground" Color="Transparent" />
+    <FontWeight x:Key="TabItemSelectedFontWeight">600</FontWeight>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
new file mode 100644
index 0000000..9719a89
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
@@ -0,0 +1,42 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#5DC264" />
+    <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBlockMarkBackground" Color="#053170" />
+    <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.1" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.2" Color="#E6E8EA" />
+
+    <SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.2" Color="#54A9FF" />
+
+    <sys:Double x:Key="TextBlockCodeFontSize">12</sys:Double>
+
+    <sys:Double x:Key="TextBlockFontSize">14</sys:Double>
+    <sys:Double x:Key="TextBlockTitleH1FontSize">32</sys:Double>
+    <sys:Double x:Key="TextBlockTitleH2FontSize">28</sys:Double>
+    <sys:Double x:Key="TextBlockTitleH3FontSize">24</sys:Double>
+    <sys:Double x:Key="TextBlockTitleH4FontSize">20</sys:Double>
+    <sys:Double x:Key="TextBlockTitleH5FontSize">18</sys:Double>
+    <sys:Double x:Key="TextBlockTitleH6FontSize">16</sys:Double>
+    <FontWeight x:Key="TextBlockFontWeight">400</FontWeight>
+    <FontWeight x:Key="TextBlockTitleFontWeight">600</FontWeight>
+    <FontWeight x:Key="TextBlockLinkFontWeight">600</FontWeight>
+    <FontWeight x:Key="TextBlockStrongFontWeight">600</FontWeight>
+
+    <Thickness x:Key="TextBlockTitleH1Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH2Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH3Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH4Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH5Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH6Margin">0</Thickness>
+    <Thickness x:Key="TextBlockParagraphMargin">0</Thickness>
+    <Thickness x:Key="TextBlockCodeBorder">1</Thickness>
+    <CornerRadius x:Key="TextBlockCodeCornerRadius">2</CornerRadius>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
new file mode 100644
index 0000000..b6fd870
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
@@ -0,0 +1,55 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="TextBoxTextCaretBrush" Color="White" />
+
+    <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="#41464C" />
+    <SolidColorBrush x:Key="TextBoxDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="TextBoxPointerOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="TextBoxForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBoxWatermarkForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.62" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="TextBoxButtonDefaultForeground" Opacity="0.2" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverForeground" Opacity="0.4" Color="#E6E8EA" />
+
+    <SolidColorBrush x:Key="TextBoxDisabledBackground" Opacity="0.04" Color="#403238" />
+    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="#2E3238" />
+
+    <SolidColorBrush x:Key="TextBoxBorderlessDefaultBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="TextBoxBorderlessDefaultBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxBorderlessPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="TextBoxBorderlessPointeroverBorderBrush" Color="Transparent" />
+
+    <sys:Double x:Key="TextBoxDefaultHeight">30</sys:Double>
+    <sys:Double x:Key="TextBoxSmallHeight">22</sys:Double>
+    <sys:Double x:Key="TextBoxLargeHeight">38</sys:Double>
+    <sys:Double x:Key="TextBoxWrapperDefaultHeight">32</sys:Double>
+    <sys:Double x:Key="TextBoxWrapperSmallHeight">24</sys:Double>
+    <sys:Double x:Key="TextBoxWrapperLargeHeight">40</sys:Double>
+
+    <CornerRadius x:Key="TextBoxDefaultCornerRadius">3</CornerRadius>
+
+    <CornerRadius x:Key="TextBoxPrefixCornerRadius">3 0 0 3</CornerRadius>
+    <CornerRadius x:Key="TextBoxSuffixCornerRadius">0 3 3 0</CornerRadius>
+    <CornerRadius x:Key="TextBoxSuffixContentCornerRadius">3 0 0 3</CornerRadius>
+    <CornerRadius x:Key="TextBoxPrefixContentCornerRadius">0 3 3 0</CornerRadius>
+    <CornerRadius x:Key="TextBoxBothContentCornerRadius">0 0 0 0</CornerRadius>
+
+    <Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 8 0</Thickness>
+    <Thickness x:Key="TextBoxInnerRightContentPadding">8 0 0 0</Thickness>
+    <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
+    <Thickness x:Key="TextBoxBorderThickness">1</Thickness>
+
+    <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="#0059D6" />
+    <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="White" />
+
+    <StreamGeometry x:Key="TextBoxClearButtonData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
+    <StreamGeometry x:Key="PasswordBoxRevealButtonData">M12 4C5 4 1 10 1 12C1 14 5 20 12 20C19 20 23 14 23 12C23 10 19 4 12 4ZM17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12ZM12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z</StreamGeometry>
+    <StreamGeometry x:Key="PasswordBoxHideButtonData">M2.02949 4.67856C2.7593 4.28654 3.66871 4.56038 4.06073 5.29018C6.21313 9.29726 8.83179 11.5 12.0001 11.5C15.1685 11.5 17.7871 9.29726 19.9395 5.29018C20.3315 4.56038 21.241 4.28655 21.9708 4.67856C22.7006 5.07058 22.9744 5.97999 22.5824 6.7098C21.9049 7.97104 21.1385 9.15419 20.2743 10.199L23.2001 14.1C23.6971 14.7627 23.5628 15.7029 22.9001 16.2C22.2373 16.697 21.2971 16.5627 20.8001 15.9L18.1186 12.3246C17.448 12.8501 16.7322 13.2957 15.9687 13.6441L17.4046 17.4733C17.6955 18.249 17.3025 19.1136 16.5268 19.4045C15.7511 19.6954 14.8865 19.3024 14.5956 18.5267L13.0956 14.5267C13.0852 14.4988 13.0756 14.4709 13.0669 14.4428C12.7193 14.4806 12.3638 14.5 12.0001 14.5C11.6365 14.5 11.281 14.4806 10.9333 14.4428C10.9246 14.4709 10.9151 14.4988 10.9046 14.5267L9.40463 18.5267C9.11375 19.3024 8.24913 19.6954 7.47345 19.4045C6.69777 19.1136 6.30476 18.249 6.59564 17.4733L8.03159 13.6441C7.26806 13.2957 6.55223 12.8501 5.88163 12.3246L3.20009 15.9C2.70303 16.5627 1.76283 16.697 1.10009 16.2C0.437347 15.7029 0.303032 14.7627 0.800088 14.1L3.72589 10.1989C2.86177 9.15415 2.09533 7.97101 1.41787 6.70979C1.02585 5.97999 1.29969 5.07057 2.02949 4.67856Z</StreamGeometry>
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/TimePicker.axaml b/src/Semi.Avalonia/Themes/Dark/TimePicker.axaml
new file mode 100644
index 0000000..8f0f635
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/TimePicker.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <!--  Add Resources Here  -->
+    <PathGeometry x:Key="TimePickerIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM13.5 6.5V11.3787L17.0607 14.9393C17.6464 15.5251 17.6464 16.4749 17.0607 17.0607C16.4749 17.6464 15.5251 17.6464 14.9393 17.0607L10.9393 13.0607C10.658 12.7794 10.5 12.3978 10.5 12V6.5C10.5 5.67157 11.1716 5 12 5C12.8284 5 13.5 5.67157 13.5 6.5Z</PathGeometry>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
new file mode 100644
index 0000000..94627a2
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
@@ -0,0 +1,72 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+    <sys:Double x:Key="ToggleButtonDefaultFontSize">14</sys:Double>
+    <FontWeight x:Key="ToggleButtonDefaultFontWeight">600</FontWeight>
+
+    <Thickness x:Key="ToggleButtonDefaultPadding">12 6</Thickness>
+    <Thickness x:Key="ToggleButtonLargePadding">16 10</Thickness>
+    <Thickness x:Key="ToggleButtonSmallPadding">6 2</Thickness>
+    <Thickness x:Key="ToggleButtonBorderThickness">1</Thickness>
+    <CornerRadius x:Key="ToggleButtonCornerRadius">3</CornerRadius>
+
+    <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" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Opacity="0.12" Color="White" />
+
+    <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />
+
+    <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Color="#888D92" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultErrorForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Color="#2E3238" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#40B4F3" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#888D92" />
+    <SolidColorBrush x:Key="ToggleButtonWarningCheckedBackground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ToggleButtonErrorCheckedBackground" Color="#FC725A" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" Color="#6EC8F6" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#FFC772" />
+    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPointeroverBackground" Color="#FD9983" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#9DDCF9" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#C6CACD" />
+    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="#FFDDA1" />
+    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPressedBackground" Color="#FDBEAC" />
+
+    <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="Black" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBackground" Color="#053170" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBackground" Color="#003761" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBackground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBackground" Color="#551F03" />
+    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBackground" Color="#6C090B" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" Color="#40B4F3" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" Color="#888D92" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBorderBrush" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBorderBrush" Color="#FC725A" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" Color="#6EC8F6" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" Color="#FFC772" />
+    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePointeroverBorderBrush" Color="#FD9983" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" Color="#9DDCF9" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" Color="#C6CACD" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" Color="#FFDDA1" />
+    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePressedBorderBrush" Color="#FDBEAC" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
new file mode 100644
index 0000000..d2da732
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -0,0 +1,33 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <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" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />
+
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.09" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5FB346" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointerOverBackground" Color="#7FD184" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="#A6E1A8" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#277731" />
+
+    <SolidColorBrush x:Key="ToggleSwitchIndicatorBorderBrush" Opacity="0.09" Color="#F9F9F9" />
+    <sys:Double x:Key="SizeSwitchDefaultHeight">24</sys:Double>
+    <sys:Double x:Key="SizeSwitchSmallHeight">16</sys:Double>
+    <sys:Double x:Key="SizeSwitchLargeHeight">32</sys:Double>
+    <sys:Double x:Key="SizeSwitchDefaultWidth">40</sys:Double>
+    <sys:Double x:Key="SizeSwitchSmallWidth">26</sys:Double>
+    <sys:Double x:Key="SizeSwitchLargeWidth">54</sys:Double>
+    <sys:Double x:Key="SizeSwitchIndicatorDefaultWidth">18</sys:Double>
+    <sys:Double x:Key="SizeSwitchIndicatorSmallWidth">12</sys:Double>
+    <sys:Double x:Key="SizeSwitchIndicatorLargeWidth">24</sys:Double>
+
+    <sys:Double x:Key="SizeSwitchDefaultFontSize">12</sys:Double>
+    <sys:Double x:Key="SizeSwitchLargeFontSize">14</sys:Double>
+
+    <Thickness x:Key="ToggleSwitchHeaderMargin">8 4</Thickness>
+    <Thickness x:Key="ToggleSwitchOnContentMargin">8 4</Thickness>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
new file mode 100644
index 0000000..7f3ab09
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
@@ -0,0 +1,14 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <!--  Add Resources Here  -->
+    <PathGeometry x:Key="ToolTipTriangleGlyph">M24 0V1C20 1 18.5 2 16.5 4C14.5 6 14 7 12 7C10 7 9.5 6 7.5 4C5.5 2 4 1 0 1V0H24Z</PathGeometry>
+    <SolidColorBrush x:Key="ToolTipBackground" Color="#C6CACD" />
+    <SolidColorBrush x:Key="ToolTipForeground" Color="Black" />
+    <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
+    <CornerRadius x:Key="ToolTipCornerRadius">6</CornerRadius>
+    <Thickness x:Key="ToolTipPadding">12 8</Thickness>
+    <sys:Double x:Key="ToolTipMaxWidth">320</sys:Double>
+    <Thickness x:Key="ToolTipBorderThickness">0</Thickness>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
new file mode 100644
index 0000000..f9e584a
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
@@ -0,0 +1,25 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <sys:Double x:Key="TreeViewItemIndent">20</sys:Double>
+    <sys:Double x:Key="TreeViewItemIconSize">8</sys:Double>
+    <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
+
+    <StreamGeometry x:Key="ExpanderIconData">M9.65618 3.44015L18.6322 11.2454C19.0906 11.644 19.0906 12.356 18.6322 12.7546L9.65618 20.5598C9.00895 21.1226 8 20.6629 8 19.8052V4.19475C8 3.33705 9.00895 2.87734 9.65618 3.44015Z</StreamGeometry>
+
+    <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+
+    <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeViewItemPointerOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="#053170" />
+    <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+
+    <Thickness x:Key="TreeViewItemIconMargin">8 0</Thickness>
+    <Thickness x:Key="TreeViewItemPadding">0 4 0 4</Thickness>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Window.axaml b/src/Semi.Avalonia/Themes/Dark/Window.axaml
index 878105d..3edcca5 100644
--- a/src/Semi.Avalonia/Themes/Dark/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Window.axaml
@@ -1,6 +1,5 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <SolidColorBrush x:Key="WindowDefaultBackground" Color="Black"/>
-    <SolidColorBrush x:Key="WindowDefaultForeground" Color="White"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="WindowDefaultBackground" Color="#16161A" />
+    <SolidColorBrush x:Key="WindowDefaultForeground" Color="#F9F9F9" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml
index 1f3a45c..fbdd48f 100644
--- a/src/Semi.Avalonia/Themes/Light/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Border.axaml
@@ -1,5 +1,6 @@
 <ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
     <SolidColorBrush x:Key="BorderCardBackground">White</SolidColorBrush>
     <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
@@ -7,4 +8,5 @@
     <Thickness x:Key="ThicknessCardPadding">20</Thickness>
     <Thickness x:Key="ThicknessCardMargin">4</Thickness>
     <Thickness x:Key="ThicknessCardBorderThickness">1</Thickness>
+    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1A000000</BoxShadows>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
index 62d30b1..e486791 100644
--- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
@@ -11,5 +11,5 @@
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBorderBrush" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
-
+    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1A000000</BoxShadows>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
index 60d75c7..4b4c9b0 100644
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -3,13 +3,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
     <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="White" />
+    <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="White" />
     <Thickness x:Key="DateTimePickerListItemPadding">0 3 0 6</Thickness>
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="White" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
 
diff --git a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
index 67accb6..a8ae94d 100644
--- a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
@@ -12,6 +12,7 @@
     <sys:Double x:Key="NotificationCardWidth">320</sys:Double>
     <Thickness x:Key="NotificationCardBorderThickness">1</Thickness>
     <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
+    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
     <Geometry x:Key="NotificationCardInformationIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</Geometry>
     <Geometry x:Key="NotificationCardSuccessIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</Geometry>
     <Geometry x:Key="NotificationCardWarningIconPathData">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</Geometry>
diff --git a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
index 92a40c2..7af4b8d 100644
--- a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
@@ -2,8 +2,9 @@
     <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#0077FA" />
     <CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
-    <SolidColorBrush x:Key="ProgressBarBackground" Color="LightGray" />
+    <SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.5" Color="#2E3238" />
     <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
     <FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
     <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#3BB346" />
diff --git a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
index 63f99cc..18d6a77 100644
--- a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
@@ -1,5 +1,6 @@
 <ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
     <sys:Double x:Key="RadioButtonIconRadius">16</sys:Double>
     <sys:Double x:Key="RadioButtonGlyphRadius">6</sys:Double>
@@ -7,7 +8,7 @@
     <Thickness x:Key="RadioButtonIconMargin">0 2 8 0</Thickness>
 
 
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="White" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Opacity="0.05" Color="#2E3238" />
@@ -48,6 +49,7 @@
     <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#0077FA" />
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#1C1F23" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="White" />
 
     <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>
 
diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
index d9609be..c00388e 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -2,6 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="TextBoxTextCaretBrush" Color="Black" />
+
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="#C6CACD" />
     <SolidColorBrush x:Key="TextBoxDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.05" Color="#E6E8EA" />
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
index b5b8a3e..062aa0b 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
@@ -2,34 +2,22 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <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" />
+    <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" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />
 
-    <SolidColorBrush
-        x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush"
-        Opacity="0.09"
-        Color="#1C1F23" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.09" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5FB346" />
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointerOverBackground" Color="#30953B" />
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="#25772F" />
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#A4E0A7" />
 
-    <SolidColorBrush
-        x:Key="ToggleSwitchIndicatorBorderBrush"
-        Opacity="0.09"
-        Color="#1C1F23" />
+    <SolidColorBrush x:Key="ToggleSwitchIndicatorBorderBrush" Opacity="0.09" Color="#1C1F23" />
+
+    <BoxShadows x:Key="ToggleSwitchKnobBoxShadows">0 0 1 1 #222E3238</BoxShadows>
+
     <sys:Double x:Key="SizeSwitchDefaultHeight">24</sys:Double>
     <sys:Double x:Key="SizeSwitchSmallHeight">16</sys:Double>
     <sys:Double x:Key="SizeSwitchLargeHeight">32</sys:Double>
diff --git a/src/Semi.Avalonia/Themes/Light/Window.axaml b/src/Semi.Avalonia/Themes/Light/Window.axaml
index 53a8b3c..79237c5 100644
--- a/src/Semi.Avalonia/Themes/Light/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Window.axaml
@@ -1,6 +1,5 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <SolidColorBrush x:Key="WindowDefaultBackground" Color="White"/>
-    <SolidColorBrush x:Key="WindowDefaultForeground" Color="Black"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="WindowDefaultBackground" Color="White" />
+    <SolidColorBrush x:Key="WindowDefaultForeground" Color="#1C1F23" />
 </ResourceDictionary>