diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
index 2a44670..5b26f66 100644
--- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
@@ -2,11 +2,11 @@
     <SolidColorBrush x:Key="AutoCompleteBoxDefaultBorderBrush" Color="#C6CACD" />
     <SolidColorBrush x:Key="AutoCompleteBoxDefaultBackground" Color="Transparent" />
     <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1A000000</BoxShadows>
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" />
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="Black" />
+    <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="#2E3238" />
+    <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
index 1f3a45c..b001b7f 100644
--- a/src/Semi.Avalonia/Themes/Dark/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml
@@ -1,8 +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">
-    <SolidColorBrush x:Key="BorderCardBackground">White</SolidColorBrush>
-    <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BorderCardBackground">Black</SolidColorBrush>
+    <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>
diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml
index f68fd53..6994d61 100644
--- a/src/Semi.Avalonia/Themes/Dark/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml
@@ -15,17 +15,17 @@
     <CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
 
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#0095EE" />
+    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#40B4F3" />
     <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Color="#6B7075" />
     <SolidColorBrush x:Key="ButtonDefaultWarningForeground" Color="#FC8800" />
     <SolidColorBrush x:Key="ButtonDefaultDangerForeground" Color="#F93920" />
     <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Color="#E6E8EA" />
 
-    <SolidColorBrush x:Key="ButtonDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonDefaultBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Opacity="0.13" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledBackground" Opacity="0.05" Color="#E6E8EA" />
 
     <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
@@ -38,11 +38,11 @@
     <SolidColorBrush x:Key="ButtonSolidForeground" Color="White" />
     <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Color="Gray" />
 
-    <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#0062D6" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="ButtonSolidSecondaryBackground" Color="#0095EE" />
+    <SolidColorBrush x:Key="ButtonSolidSecondaryBackground" Color="#40B4F3" />
     <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBackground" Color="#007BCA" />
     <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBackground" Color="#0063A7" />
 
@@ -60,11 +60,11 @@
 
     <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="Gray" />
 
-    <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="ButtonSolidSecondaryBorderBrush" Color="#0095EE" />
+    <SolidColorBrush x:Key="ButtonSolidSecondaryBorderBrush" Color="#40B4F3" />
     <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBorderBrush" Color="#007BCA" />
     <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBorderBrush" Color="#0063A7" />
 
diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
index 714d5b8..3cfb4d3 100644
--- a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
@@ -3,11 +3,11 @@
     <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="White" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.13" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.05" Color="#E6E8EA" />
+    <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>
diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
index d25ef4a..4aa6729 100644
--- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
@@ -4,47 +4,47 @@
     xmlns:sys="using:System">
     <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="CalendarBackground" Color="White" />
-    <SolidColorBrush x:Key="CalendarForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <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="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <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="White" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
     <Thickness x:Key="CalendarItemCalendarButtonBorderThickness">0</Thickness>
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Opacity="0.13" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="White" />
     <FontWeight x:Key="CalendarItemCalendarButtonSelectedFontWeight">600</FontWeight>
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Opacity="0.65" Color="#1C1F23" />
+    <SolidColorBrush x:Key="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="#1C1F23" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
     <CornerRadius x:Key="CalendarItemCalendarDayButtonCornerRadius">3</CornerRadius>
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Opacity="0.13" Color="#E6E8EA" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="White" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayBackground" Opacity="0.05" Color="#E6E8EA" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Opacity="0.62" Color="#1C1F23" />
+    <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
index 62d30b1..6ae2492 100644
--- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--    -->
-    <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#1C1F23" />
+    <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="#C6CACD" />
@@ -10,6 +10,6 @@
     <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#004FB3" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBorderBrush" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
 
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
index b73f10b..10733d6 100644
--- a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
@@ -6,9 +6,9 @@
     <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.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CaptionButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CaptionButtonPressedBackground" Opacity="0.13" Color="#E6E8EA" />
     <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="#D52515" />
     <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="#B2140C" />
-    <SolidColorBrush x:Key="CaptionButtonForeground" Opacity="0.62" Color="#1C1F23" />
+    <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 e59a87c..77e869e 100644
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -2,28 +2,28 @@
     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="#1C1F23" />
-    <SolidColorBrush x:Key="CheckboxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CheckboxForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CheckboxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="CheckboxGlyphFill" Color="White" />
     <SolidColorBrush x:Key="CheckboxGlyphDisabledFill" Color="White" />
 
     <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="CheckboxDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CheckboxPointOverBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CheckboxPointOverBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="CheckboxPressedBackground" Color="#004FB3" />
     <SolidColorBrush x:Key="CheckboxPressedBorderBrush" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="CheckboxCheckedDefaultBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckboxCheckedDefaultBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="CheckboxCheckedDefaultBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedDefaultBorderBrush" Color="#54A9FF" />
     <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="CheckboxDefaultDisabledBackground" Opacity="0.04" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckboxDefaultDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CheckboxDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CheckboxDefaultDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CheckboxCheckedDisabledBackground" Color="#98CDFD" />
     <SolidColorBrush x:Key="CheckboxCheckedDisabledBorderBrush" Color="#98CDFD" />
 
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 8f50dac..5c4a737 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -1,39 +1,39 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ComboBoxSelectorBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointerOverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#2E3238" />
+    <SolidColorBrush x:Key="ComboBoxSelectorBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPointerOverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.13" Color="#E6E8EA" />
+    <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="#004FB3" />
 
     <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
 
-    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconPointerOverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="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="#1C1F23" />
+    <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 #1A000000</BoxShadows>
     <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="#F9F9F9" />
     <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
 
-    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemPointerOverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ComboBoxItemPointerOverBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#E6E8EA" />
     <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="ComboBoxItemSelectedPointerOverBackground" Color="#CBE7FE" />
 
     <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#2E3238" />
+    <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>
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index 60d75c7..2b54f84 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -5,34 +5,34 @@
     <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" 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="DateTimePickerFlyoutButtonForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="White" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.13" Color="#E6E8EA" />
 
     <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="#1C1F23" />
+    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
     <sys:Double x:Key="DateTimePickerListBoxItemHeight">28</sys:Double>
 
 
     <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="#C6CACD" />
     <SolidColorBrush x:Key="DateTimePickerButtonBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#F9F9F9" />
 
-    <SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
+    <SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
+    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
 
     <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 8 0 #1A000000</BoxShadows>
     <Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Dark/Expander.axaml b/src/Semi.Avalonia/Themes/Dark/Expander.axaml
index a4dc506..cf87c4a 100644
--- a/src/Semi.Avalonia/Themes/Dark/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Expander.axaml
@@ -1,14 +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">
-    <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ExpanderIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <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.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ExpanderContentForeground" Opacity="0.8" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ExpanderContentForeground" Opacity="0.8" Color="#F9F9F9" />
 
     <FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
     <sys:Double x:Key="ExpanderIconSize">8</sys:Double>
diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
index bad27c3..a1a0f91 100644
--- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
@@ -3,8 +3,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
     <SolidColorBrush x:Key="FlyoutBackground" Color="White" />
-    <SolidColorBrush x:Key="FlyoutForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <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 #1A000000</BoxShadows>
diff --git a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
index d422063..68f7d2e 100644
--- a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
@@ -1,5 +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.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="GridSplitterBackground" Opacity="0.08" Color="#F9F9F9" />
     <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="#CBE7FE" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml
index 4ad4f42..4f8d2b3 100644
--- a/src/Semi.Avalonia/Themes/Dark/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml
@@ -15,17 +15,17 @@
     <SolidColorBrush x:Key="LabelTagLightAmberForeground" Color="#784606" />
     <SolidColorBrush x:Key="LabelTagLightAmberBackground" Opacity="0.15" Color="#F0B114" />
     <SolidColorBrush x:Key="LabelTagLightBlueForeground" Color="#003D8F" />
-    <SolidColorBrush x:Key="LabelTagLightBlueBackground" Opacity="0.15" Color="#0077FA" />
+    <SolidColorBrush x:Key="LabelTagLightBlueBackground" Opacity="0.15" Color="#54A9FF" />
     <SolidColorBrush x:Key="LabelTagLightCyanForeground" Color="#004D5B" />
     <SolidColorBrush x:Key="LabelTagLightCyanBackground" Opacity="0.15" Color="#05A4B6" />
     <SolidColorBrush x:Key="LabelTagLightGreenForeground" Color="#1B5924" />
     <SolidColorBrush x:Key="LabelTagLightGreenBackground" Opacity="0.15" Color="#3BB346" />
-    <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#2E3238" />
+    <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#E6E8EA" />
     <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#6B7075" />
     <SolidColorBrush x:Key="LabelTagLightIndigoForeground" Color="#1F2878" />
     <SolidColorBrush x:Key="LabelTagLightIndigoBackground" Opacity="0.15" Color="#3F51B5" />
     <SolidColorBrush x:Key="LabelTagLightLightBlueForeground" Color="#004B83" />
-    <SolidColorBrush x:Key="LabelTagLightLightBlueBackground" Opacity="0.15" Color="#0095EE" />
+    <SolidColorBrush x:Key="LabelTagLightLightBlueBackground" Opacity="0.15" Color="#40B4F3" />
     <SolidColorBrush x:Key="LabelTagLightLightGreenForeground" Color="#395B1B" />
     <SolidColorBrush x:Key="LabelTagLightLightGreenBackground" Opacity="0.15" Color="#7BB63C" />
     <SolidColorBrush x:Key="LabelTagLightLimeForeground" Color="#9BD100" />
@@ -44,14 +44,14 @@
     <SolidColorBrush x:Key="LabelTagLightVioletBackground" Opacity="0.15" Color="#361C8A" />
     <SolidColorBrush x:Key="LabelTagLightYellowForeground" Color="#7D6A00" />
     <SolidColorBrush x:Key="LabelTagLightYellowBackground" Opacity="0.15" Color="#FAC800" />
-    <SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="#FFFFFF" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#C6CACD" />
 
     <SolidColorBrush x:Key="LabelTagGhostAmberBorderBrush" Color="#F3C341" />
     <SolidColorBrush x:Key="LabelTagGhostAmberForeground" Color="#F0B114" />
     <SolidColorBrush x:Key="LabelTagGhostBlueBorderBrush" Color="#3295FB" />
-    <SolidColorBrush x:Key="LabelTagGhostBlueForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="LabelTagGhostBlueForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="LabelTagGhostCyanBorderBrush" Color="#2CB8C5" />
     <SolidColorBrush x:Key="LabelTagGhostCyanForeground" Color="#05A4B6" />
     <SolidColorBrush x:Key="LabelTagGhostGreenBorderBrush" Color="#5AC262" />
@@ -61,7 +61,7 @@
     <SolidColorBrush x:Key="LabelTagGhostIndigoBorderBrush" Color="#5E6FC4" />
     <SolidColorBrush x:Key="LabelTagGhostIndigoForeground" Color="#3F51B5" />
     <SolidColorBrush x:Key="LabelTagGhostLightBlueBorderBrush" Color="#30ACF1" />
-    <SolidColorBrush x:Key="LabelTagGhostLightBlueForeground" Color="#0095EE" />
+    <SolidColorBrush x:Key="LabelTagGhostLightBlueForeground" Color="#40B4F3" />
     <SolidColorBrush x:Key="LabelTagGhostLightGreenBorderBrush" Color="#93C55B" />
     <SolidColorBrush x:Key="LabelTagGhostLightGreenForeground" Color="#7BB63C" />
     <SolidColorBrush x:Key="LabelTagGhostLimeBorderBrush" Color="#A7DA2C" />
@@ -81,16 +81,16 @@
     <SolidColorBrush x:Key="LabelTagGhostYellowBorderBrush" Color="#FBDA32" />
     <SolidColorBrush x:Key="LabelTagGhostYellowForeground" Color="#FAC800" />
     <SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="#C6CACD" />
-    <SolidColorBrush x:Key="LabelTagGhostWhiteForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="LabelTagGhostWhiteForeground" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="LabelTagSolidForeground" Color="#FFFFFF" />
     <SolidColorBrush x:Key="LabelTagSolidAmberBackground" Color="#F0B114" />
-    <SolidColorBrush x:Key="LabelTagSolidBlueBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="LabelTagSolidBlueBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="LabelTagSolidCyanBackground" Color="#05A4B6" />
     <SolidColorBrush x:Key="LabelTagSolidGreenBackground" Color="#3BB346" />
     <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#6B7075" />
     <SolidColorBrush x:Key="LabelTagSolidIndigoBackground" Color="#3F51B5" />
-    <SolidColorBrush x:Key="LabelTagSolidLightBlueBackground" Color="#0095EE" />
+    <SolidColorBrush x:Key="LabelTagSolidLightBlueBackground" Color="#40B4F3" />
     <SolidColorBrush x:Key="LabelTagSolidLightGreenBackground" Color="#7BB63C" />
     <SolidColorBrush x:Key="LabelTagSolidLimeBackground" Color="#9BD100" />
     <SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FC8800" />
@@ -103,7 +103,7 @@
 
     <SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="#FFFFFF" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#C6CACD" />
-    <SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#1C1F23" />
+    <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
index 9015aab..79c505d 100644
--- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
@@ -2,18 +2,18 @@
 
     <Thickness x:Key="ListBoxItemDefaultPadding">8 4</Thickness>
 
-    <SolidColorBrush x:Key="ListBoxItemDefaultForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemIconHoverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <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.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.09" Color="#E6E8EA" />
     <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#2E3238" />
+    <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
index f17ad09..fd95927 100644
--- a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
@@ -1,7 +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="#1C1F23" />
-    <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ManagedFileChooserSeparatorBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <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
index b768eb6..95b74b9 100644
--- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -7,11 +7,11 @@
     <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="#1C1F23" />
+    <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Opacity="0.62" Color="#F9F9F9" />
 
     <!--  MenuFlyout  -->
     <SolidColorBrush x:Key="MenuFlyoutBackground" Color="White" />
-    <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <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 #1A000000</BoxShadows>
@@ -23,24 +23,24 @@
 
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="White" />
-    <SolidColorBrush x:Key="MenuItemForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="MenuItemForeground" Color="#F9F9F9" />
     <Thickness x:Key="MenuItemPadding">16 8</Thickness>
 
-    <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
+    <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.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.09" Color="#E6E8EA" />
 
     <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="#1C1F23" />
+    <SolidColorBrush x:Key="MenuItemExpandIconForeground" Opacity="0.62" Color="#F9F9F9" />
     <Thickness x:Key="MenuItemExpandIconMargin">4 0</Thickness>
 
-    <SolidColorBrush x:Key="MenuItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemDisabledExpandIconForeground" Opacity="0.35" Color="#1C1F23" />
+    <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
index 67accb6..3a6b2e3 100644
--- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
@@ -2,10 +2,10 @@
     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="#1C1F23" />
-    <SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="NotificationCardForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="#F9F9F9" />
     <SolidColorBrush x:Key="NotificationCardBackground" Color="White" />
-    <SolidColorBrush x:Key="NotificationCardInformationIconForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="NotificationCardInformationIconForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#3BB346" />
     <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FC8800" />
     <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#F93920" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
index 92a40c2..9b831f4 100644
--- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#54A9FF" />
     <CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
     <SolidColorBrush x:Key="ProgressBarBackground" Color="LightGray" />
-    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#F9F9F9" />
     <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/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
index 63f99cc..468d9e3 100644
--- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
@@ -8,30 +8,30 @@
 
 
     <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="White" />
-    <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" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Opacity="0.05" Color="#E6E8EA" />
 
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
 
 
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBackground" Color="#0062D6" />
     <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#004FB3" />
     <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#98CDFD" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#004FB3" />
     <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#98CDFD" />
 
     <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
 
-    <SolidColorBrush x:Key="RadioButtonForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="RadioButtonForeground" Color="#F9F9F9" />
 
-    <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.05" Color="#E6E8EA" />
 
     <CornerRadius x:Key="RadioButtonGroupCornerRadius">3</CornerRadius>
     <CornerRadius x:Key="RadioButtonButtonCornerRadius">3</CornerRadius>
@@ -45,22 +45,22 @@
     <sys:Double x:Key="RadioButtonButtonDefaultFontSize">12</sys:Double>
     <sys:Double x:Key="RadioButtonButtonLargeFontSize">14</sys:Double>
 
-    <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="RadioButtonButtonCheckedForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#F9F9F9" />
 
     <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>
 
     <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="RadioButtonCardCheckPointOverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#004FB3" />
     <SolidColorBrush x:Key="RadioButtonCardCheckDisabledBorderBrush" Color="#98CDFD" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPointOverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckDisabledBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckPointOverBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckDisabledBackground" Opacity="0.05" Color="#E6E8EA" />
 
     <CornerRadius x:Key="RadioButtonCardCornerRadius">3</CornerRadius>
 
diff --git a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
index c7b67ff..4d75325 100644
--- a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
@@ -4,8 +4,8 @@
     <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="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarButtonPointerOverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarBackground" Opacity="0.05" Color="#2E3238" />
+    <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.05" Color="#E6E8EA" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
index 01d5543..8aed507 100644
--- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
@@ -3,8 +3,8 @@
     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="#0077FA" />
-    <SolidColorBrush x:Key="SliderTrackBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="SliderTrackForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="SliderTrackBackground" Opacity="0.05" Color="#E6E8EA" />
     <sys:Double x:Key="SliderTrackWidth">4</sys:Double>
     <CornerRadius x:Key="SliderTrackCornerRadius">3</CornerRadius>
     <sys:Double x:Key="SliderThumbWidth">16</sys:Double>
@@ -17,7 +17,7 @@
     <sys:Double x:Key="SliderTickVerticalWidth">4</sys:Double>
     <SolidColorBrush x:Key="SliderTickForeground" Color="#C6CACD" />
     <SolidColorBrush x:Key="SliderThumbBackground" Color="White" />
-    <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#004FB3" />
     <Thickness x:Key="SliderThumbBorderThickness">2</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
index c6b235d..7e46440 100644
--- a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
@@ -8,6 +8,6 @@
     <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="#1C1F23" />
+    <SolidColorBrush x:Key="SplitViewSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
     <SolidColorBrush x:Key="SplitViewPaneBackground" Color="White" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
index b8e8b57..baeb254 100644
--- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
@@ -1,13 +1,13 @@
 <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="#0077FA" />
-    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="TabItemLinePipePressedBorderBrush" Opacity="0.13" Color="#2E3238" />
+    <SolidColorBrush x:Key="TabItemLinePipeSelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TabItemLinePipePressedBorderBrush" Opacity="0.13" Color="#E6E8EA" />
 
-    <SolidColorBrush x:Key="TabItemLineHeaderForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="#1C1F23" />
+    <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" />
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
index 4f7474b..c89b8e1 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
@@ -1,20 +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="TextBlockDefaultForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="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="#FC8800" />
     <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#F93920" />
     <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#1C1F23" />
+    <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockMarkBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.1" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.2" Color="#2E3238" />
+    <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="#0077FA" />
+    <SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.2" Color="#54A9FF" />
 
     <sys:Double x:Key="TextBlockCodeFontSize">12</sys:Double>
 
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
index d9609be..101ff65 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
@@ -5,22 +5,22 @@
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="#C6CACD" />
     <SolidColorBrush x:Key="TextBoxDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.05" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="TextBoxPointerOverBorderBrush" Color="#0062D6" />
+    <SolidColorBrush x:Key="TextBoxPointerOverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="TextBoxForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBoxWatermarkForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.62" Color="#1C1F23" />
+    <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="#2E3238" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverForeground" Opacity="0.4" Color="#2E3238" />
+    <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="#1C1F23" />
+    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="#E6E8EA" />
 
-    <SolidColorBrush x:Key="TextBoxBorderlessDefaultBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="TextBoxBorderlessDefaultBackground" Opacity="0.05" Color="#E6E8EA" />
     <SolidColorBrush x:Key="TextBoxBorderlessDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxBorderlessPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="TextBoxBorderlessPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
     <SolidColorBrush x:Key="TextBoxBorderlessPointeroverBorderBrush" Color="Transparent" />
 
     <sys:Double x:Key="TextBoxDefaultHeight">30</sys:Double>
@@ -44,7 +44,7 @@
     <Thickness x:Key="TextBoxBorderThickness">1</Thickness>
 
     <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="#0059D6" />
-    <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="White" />
+    <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="Black" />
 
     <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>
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
index e2bdd00..0bb2165 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
@@ -12,22 +12,22 @@
     <Thickness x:Key="ToggleButtonBorderThickness">1</Thickness>
     <CornerRadius x:Key="ToggleButtonCornerRadius">3</CornerRadius>
 
-    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.13" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Opacity="0.05" Color="#E6E8EA" />
 
     <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />
 
-    <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#0095EE" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#40B4F3" />
     <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Color="#6B7075" />
     <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FC8800" />
     <SolidColorBrush x:Key="ToggleButtonDefaultErrorForeground" Color="#F93920" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Color="#E6E8EA" />
 
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#0095EE" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#40B4F3" />
     <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#6B7075" />
     <SolidColorBrush x:Key="ToggleButtonWarningCheckedBackground" Color="#FC8800" />
     <SolidColorBrush x:Key="ToggleButtonErrorCheckedBackground" Color="#F93920" />
@@ -52,8 +52,8 @@
     <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBackground" Color="#FFF8EA" />
     <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBackground" Color="#FEF2ED" />
 
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" Color="#0095EE" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" Color="#40B4F3" />
     <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" Color="#6B7075" />
     <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBorderBrush" Color="#FC8800" />
     <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBorderBrush" Color="#F93920" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
index b5b8a3e..64a130a 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -5,21 +5,21 @@
     <SolidColorBrush
         x:Key="ToggleSwitchContainerUnCheckedDefaultBackground"
         Opacity="0.05"
-        Color="#2E3238" />
+        Color="#E6E8EA" />
     <SolidColorBrush
         x:Key="ToggleSwitchContainerUnCheckedPointerOverBackground"
         Opacity="0.09"
-        Color="#2E3238" />
+        Color="#E6E8EA" />
     <SolidColorBrush
         x:Key="ToggleSwitchContainerUnCheckedPressedBackground"
         Opacity="0.13"
-        Color="#2E3238" />
+        Color="#E6E8EA" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />
 
     <SolidColorBrush
         x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush"
         Opacity="0.09"
-        Color="#1C1F23" />
+        Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5FB346" />
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointerOverBackground" Color="#30953B" />
@@ -29,7 +29,7 @@
     <SolidColorBrush
         x:Key="ToggleSwitchIndicatorBorderBrush"
         Opacity="0.09"
-        Color="#1C1F23" />
+        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>
diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
index a817083..8b3d29c 100644
--- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
@@ -8,17 +8,17 @@
 
     <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="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <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.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="TreeViewItemPointerOverBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.09" Color="#E6E8EA" />
     <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#2E3238" />
+    <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>