diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml
index 25d26fc..4d61729 100644
--- a/src/Semi.Avalonia/Themes/Dark/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
     <SolidColorBrush x:Key="BorderCardBackground" Color="#232429" />
     <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="White" />
-    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
index 6ede30c..86a3abd 100644
--- a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="#FF35363C" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="#35363C" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.04" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.04" Color="#2E3238" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="White" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
index cfebfd2..4898489 100644
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -21,14 +21,14 @@
 
     <SolidColorBrush x:Key="CheckBoxDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="CheckBoxDefaultDisabledBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#135cb8" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#135cb8" />
+    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#135CB8" />
+    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#135CB8" />
 
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#FF135CB8" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#135CB8" />
     <SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#FF7FC1FF" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#FFA9D7FF" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#A9D7FF" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
index 45a1849..40df42c 100644
--- a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Opacity="0.4" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FFFC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Opacity="0.4" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FC725A" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
index f49e412..d0761c0 100644
--- a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
@@ -1,13 +1,7 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <SolidColorBrush Color="#F9F9F9" x:Key="HyperlinkButtonForeground" />
-    <SolidColorBrush Color="Transparent" x:Key="HyperlinkButtonDefaultBackground" />
-    <SolidColorBrush Color="#54A9FF" x:Key="HyperlinkButtonOverForeground" />
-    <SolidColorBrush
-        Color="#F9F9F9"
-        Opacity="0.35"
-        x:Key="HyperlinkButtonDisabledForeground" />
-
-    <SolidColorBrush Color="#681DA8" x:Key="HyperlinkButtonVisitedForeground" />
-</ResourceDictionary>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#F9F9F9"  />
+    <SolidColorBrush x:Key="HyperlinkButtonDefaultBackground" Color="Transparent"  />
+    <SolidColorBrush x:Key="HyperlinkButtonOverForeground" Color="#54A9FF"  />
+    <SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9"   />
+    <SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="#681DA8"  />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
index 39f448f..01b9e96 100644
--- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
@@ -5,8 +5,8 @@
     <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" Opacity="0.2" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
 
@@ -27,11 +27,11 @@
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDefaultBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPointeroverBackground" Color="#7FC1FF" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBackground" Color="#135cb8" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBackground" Color="#135CB8" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDefaultBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPressedBorderBrush" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBorderBrush" Color="#135cb8" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBorderBrush" Color="#135CB8" />
 
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckGlyphFill" Color="White" />
 
@@ -50,7 +50,7 @@
     <!-- CardRadioGroupListBox -->
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckDefaultBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPressedBorderBrush" Color="#A9D7FF" />
@@ -80,15 +80,15 @@
 
     <SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBackground" Color="#135cb8" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" Color="#135cb8" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBackground" Color="#135CB8" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" Color="#135CB8" />
 
     <!-- CardCheckGroupListBox -->
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="#FF135CB8" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="#135CB8" />
     <SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="#FF7FC1FF" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="#FFA9D7FF" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="#A9D7FF" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
index d66c981..1bb73ab 100644
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
@@ -336,8 +336,7 @@
     <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryLight" Opacity="0.2" Color="{StaticResource SemiLightBlue5Color}" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Opacity="0.3"
-                     Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiLightBlue5Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Opacity="0.4" Color="{StaticResource SemiLightBlue5Color}" />
     <!--  Tertiary  -->
     <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
@@ -390,11 +389,11 @@
     <SolidColorBrush x:Key="SemiColorLinkVisited" Color="{StaticResource SemiBlue5Color}" />
 
     <!--  Background  -->
-    <SolidColorBrush x:Key="SemiColorBackground0" Color="#FF16161A" />
-    <SolidColorBrush x:Key="SemiColorBackground1" Color="#FF232429" />
-    <SolidColorBrush x:Key="SemiColorBackground2" Color="#FF35363C" />
-    <SolidColorBrush x:Key="SemiColorBackground3" Color="#FF43444A" />
-    <SolidColorBrush x:Key="SemiColorBackground4" Color="#FF4F5159" />
+    <SolidColorBrush x:Key="SemiColorBackground0" Color="#16161A" />
+    <SolidColorBrush x:Key="SemiColorBackground1" Color="#232429" />
+    <SolidColorBrush x:Key="SemiColorBackground2" Color="#35363C" />
+    <SolidColorBrush x:Key="SemiColorBackground3" Color="#43444A" />
+    <SolidColorBrush x:Key="SemiColorBackground4" Color="#4F5159" />
 
     <!--  Fill  -->
     <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.12" Color="White" />
@@ -408,6 +407,6 @@
     <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
     <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="{StaticResource SemiGrey1Color}" />
     <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
-    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.04" Color="{StaticResource SemiGrey8Color}" />
 
+    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.04" Color="{StaticResource SemiGrey8Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
index 9370769..fe1e7b0 100644
--- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
@@ -16,11 +16,11 @@
     <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="#7FC1FF" />
     <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#135cb8" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#135CB8" />
     <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#135cb8" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#135CB8" />
     <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
 
     <SolidColorBrush x:Key="RadioButtonForeground" Color="#F9F9F9" />
@@ -40,7 +40,7 @@
     <!-- CardRadioButton -->
     <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Opacity="0.2" Color="#54A9FF" />
     <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#A9D7FF" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
index a020cce..4f446cf 100644
--- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
@@ -8,7 +8,7 @@
     <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#A9D7FF" />
 
-    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#FF41464C" />
+    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#41464C" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#0A4694" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#1C1F23" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml
index affef76..eb19ed2 100644
--- a/src/Semi.Avalonia/Themes/Light/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Border.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1A000000</BoxShadows>
     <SolidColorBrush x:Key="BorderCardBackground" Color="White" />
     <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1A000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
index 5183887..c8a51fd 100644
--- a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
@@ -5,4 +5,4 @@
     <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" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
index fccdc95..19a5b83 100644
--- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
@@ -2,15 +2,15 @@
     <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#FF0077FA" />
+    <SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
     <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1A000000</BoxShadows>
 
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="#0062D6" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
index 4218bd6..8d0eb3d 100644
--- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
@@ -26,11 +26,11 @@
     <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#98CDFD" />
     <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#98CDFD" />
 
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Color="#FFEAF5FF" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#FF98CDFD" />
-    <SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#FF0062D6" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#FF004FB3" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#98CDFD" />
+    <SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#0062D6" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#004FB3" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
index 9a3dcc7..e5641df 100644
--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -30,7 +30,7 @@
     <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
 
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
index 1116060..f84359d 100644
--- a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FFF93920" />
-    <SolidColorBrush x:Key="DataValidationErrorsBackground" Color="#FFFEF2ED" />
-    <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Color="#FFFEF2ED" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Color="#FFFEDDD2" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Color="#FFFEDDD2" />
-    <SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Color="#FFFDB7A5" />
-    <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Color="#FFFDB7A5" />
-    <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Color="#FFFEF2ED" />
-    <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FFF93920" />
+    <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="DataValidationErrorsBackground" Color="#FEF2ED" />
+    <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Color="#FEF2ED" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Color="#FEDDD2" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Color="#FEDDD2" />
+    <SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Color="#FDB7A5" />
+    <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Color="#FDB7A5" />
+    <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Color="#FEF2ED" />
+    <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#F93920" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
index cd685fb..5c70384 100644
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -15,13 +15,13 @@
 
 
     <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerButtonBackground" Opacity="0.05" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="DateTimePickerButtonBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
diff --git a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
index f6ab0be..08ee311 100644
--- a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
@@ -1,13 +1,7 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <SolidColorBrush Color="#1C1F23" x:Key="HyperlinkButtonForeground" />
-    <SolidColorBrush Color="Transparent" x:Key="HyperlinkButtonDefaultBackground" />
-    <SolidColorBrush Color="#0077FA" x:Key="HyperlinkButtonOverForeground" />
-    <SolidColorBrush
-        Color="#1C1F23"
-        Opacity="0.35"
-        x:Key="HyperlinkButtonDisabledForeground" />
-
-    <SolidColorBrush Color="#681DA8" x:Key="HyperlinkButtonVisitedForeground" />
-</ResourceDictionary>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="HyperlinkButtonDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="HyperlinkButtonOverForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="#681DA8" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Label.axaml b/src/Semi.Avalonia/Themes/Light/Label.axaml
index 082d195..5826e49 100644
--- a/src/Semi.Avalonia/Themes/Light/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Label.axaml
@@ -33,7 +33,7 @@
     <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#2E3238" />
     <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#6B7075" />
     <SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="White" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#C6CACD" />
 
     <SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="#FA664C" />
@@ -71,7 +71,7 @@
     <SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="#C6CACD" />
     <SolidColorBrush x:Key="LabelTagGhostWhiteForeground" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="LabelTagSolidForeground" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="LabelTagSolidForeground" Color="White" />
     <SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="#F93920" />
     <SolidColorBrush x:Key="LabelTagSolidPinkBackground" Color="#E91E63" />
     <SolidColorBrush x:Key="LabelTagSolidPurpleBackground" Color="#9E28B3" />
@@ -89,7 +89,7 @@
     <SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FC8800" />
     <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#6B7075" />
 
-    <SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="White" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#C6CACD" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#1C1F23" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
index bec09ca..4305590 100644
--- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
@@ -50,7 +50,7 @@
     <!-- CardRadioGroupListBox -->
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Color="#FFEAF5FF" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckDefaultBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPressedBorderBrush" Color="#004FB3" />
@@ -84,11 +84,11 @@
     <SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" Color="#98CDFD" />
 
     <!-- CardCheckGroupListBox -->
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Color="#FFEAF5FF" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="#FF98CDFD" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="#FF0062D6" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="#FF004FB3" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="#98CDFD" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="#0062D6" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="#004FB3" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml
index a452166..63aa057 100644
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml
@@ -407,5 +407,6 @@
     <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
     <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="{StaticResource SemiGrey1Color}" />
     <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
+    <!-- Official Opacity=0.04 -->
     <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.02" Color="{StaticResource SemiGrey8Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
index 935597a..87ef1d9 100644
--- a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
@@ -40,7 +40,7 @@
     <!-- CardRadioButton -->
     <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#FFEAF5FF" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#004FB3" />
diff --git a/src/Semi.Avalonia/Themes/Light/Slider.axaml b/src/Semi.Avalonia/Themes/Light/Slider.axaml
index f949737..bb1d311 100644
--- a/src/Semi.Avalonia/Themes/Light/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Slider.axaml
@@ -8,7 +8,7 @@
     <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#FFC6CACD" />
+    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#C6CACD" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#CBE7FE" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#F9F9F9" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
index dfcc1ed..92ba58c 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -3,21 +3,21 @@
 
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="TextBoxForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.62" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="TextBoxButtonDefaultForeground" Opacity="0.08" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="TextBoxButtonDefaultForeground" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBoxButtonPointeroverForeground" Color="#0077FA" />
 
     <SolidColorBrush x:Key="TextBoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="Transparent" />
 
     <SolidColorBrush x:Key="TextBoxBorderedDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxBorderedDefaultBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="TextBoxBorderedDefaultBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBorderBrush" Color="#0062D6" />