From fdd047b0d6929e573e58e092a17799518c6f6aee Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Sun, 7 Apr 2024 20:49:51 +0800
Subject: [PATCH] feat: opacity related.

---
 .../Default/Light/AutoCompleteBox.axaml       |  2 +-
 .../Themes/Schemes/Default/Light/Border.axaml |  4 +-
 .../Themes/Schemes/Default/Light/Button.axaml | 10 ++--
 .../Schemes/Default/Light/ButtonSpinner.axaml | 10 ++--
 .../Schemes/Default/Light/Calendar.axaml      | 34 +++++------
 .../Default/Light/CalendarDatePicker.axaml    | 10 ++--
 .../Default/Light/CaptionButtons.axaml        |  6 +-
 .../Schemes/Default/Light/CheckBox.axaml      | 14 ++---
 .../Schemes/Default/Light/ComboBox.axaml      | 24 ++++----
 .../Default/Light/DateTimePickerShared.axaml  | 16 ++---
 .../Schemes/Default/Light/Expander.axaml      | 10 ++--
 .../Themes/Schemes/Default/Light/Flyout.axaml |  2 +-
 .../Schemes/Default/Light/GridSplitter.axaml  |  4 +-
 .../Light/HeaderedContentControl.axaml        |  2 +-
 .../Default/Light/HyperlinkButton.axaml       |  2 +-
 .../Schemes/Default/Light/ListBox.axaml       | 48 +++++++--------
 .../Themes/Schemes/Default/Light/Menu.axaml   | 16 ++---
 .../Default/Light/NotificationCard.axaml      |  2 +-
 .../Schemes/Default/Light/ProgressBar.axaml   |  2 +-
 .../Schemes/Default/Light/RadioButton.axaml   | 58 +++++++++----------
 .../Schemes/Default/Light/ScrollViewer.axaml  |  8 +--
 .../Themes/Schemes/Default/Light/Slider.axaml |  2 +-
 .../Schemes/Default/Light/SplitView.axaml     |  2 +-
 .../Schemes/Default/Light/TabItem.axaml       |  8 +--
 .../Schemes/Default/Light/TextBlock.axaml     |  8 +--
 .../Schemes/Default/Light/TextBox.axaml       | 16 ++---
 .../Schemes/Default/Light/ToggleButton.axaml  | 10 ++--
 .../Schemes/Default/Light/ToggleSwitch.axaml  | 10 ++--
 .../Schemes/Default/Light/TreeView.axaml      | 10 ++--
 29 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/AutoCompleteBox.axaml
index 782fff4..1d411f9 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1A000000</BoxShadows>
     <StaticResource x:Key="AutoCompleteBoxPopupBackground" ResourceKey="SemiColorBackground2" />
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="AutoCompleteBoxPopupBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Border.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Border.axaml
index 7390ccc..fbdb71e 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Border.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="BorderCardBackground" ResourceKey="SemiColorBackground1" />
-    <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1A000000</BoxShadows>
+    <StaticResource x:Key="BorderCardBackground" ResourceKey="SemiColorBackground1" />
+    <StaticResource x:Key="BorderCardBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
index 082f983..c487eb6 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
@@ -6,12 +6,12 @@
     <StaticResource x:Key="ButtonDefaultSuccessForeground" ResourceKey="SemiColorSuccess" />
     <StaticResource x:Key="ButtonDefaultWarningForeground" ResourceKey="SemiColorWarning" />
     <StaticResource x:Key="ButtonDefaultDangerForeground" ResourceKey="SemiColorDanger" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ButtonDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
-    <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" Color="#E6E8EA" />
+    <StaticResource x:Key="ButtonDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ButtonDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ButtonDefaultPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="ButtonDefaultDisabledBackground" ResourceKey="SemiColorDisabledBackground" />
 
     <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ButtonSpinner.axaml
index c8a51fd..5f1295c 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/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="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" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonDisabledBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Calendar.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Calendar.axaml
index 6716f2d..d7496a7 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Calendar.axaml
@@ -1,35 +1,35 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CalendarBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="CalendarItemWeekDayNameForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalendarItemIconForeground" ResourceKey="SemiColorText2" />
 
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="{StaticResource SemiBlue5Color}" />
+    <StaticResource x:Key="CalendarItemCalendarButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalendarItemCalendarButtonPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedBackground" ResourceKey="SemiColorInformation" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Opacity="0.65" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarItemCalendarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonBlackoutForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonInactiveForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonPressedBackground" ResourceKey="SemiColorFill2" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedBackground" Color="{StaticResource SemiBlue5Color}" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedBackground" ResourceKey="SemiColorInformation" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="White" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayForeground" Color="{StaticResource SemiBlue5Color}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonTodayForeground" ResourceKey="SemiColorInformation" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonTodayBackground" ResourceKey="SemiColorFill0" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonBlackoutForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonInactiveForeground" ResourceKey="SemiColorText2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
index ac0d591..28db5ce 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
@@ -1,16 +1,16 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarDatePickerIconForeground" ResourceKey="SemiColorText2" />
     <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" />
+    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalendarDatePickerPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CalendarDatePickerFocusBorderBrush" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <StaticResource x:Key="CalendarDatePickerDisabledBackground" ResourceKey="SemiColorDisabledFill" />
     <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" />
+    <StaticResource x:Key="CalendarDatePickerBorderedDefaultBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
     <StaticResource x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CaptionButtons.axaml
index be1d83b..fa888c7 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CaptionButtons.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CaptionButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="CaptionButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CaptionButtonPressedBackground" ResourceKey="SemiColorFill2" />
     <StaticResource x:Key="CaptionButtonClosePointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
     <StaticResource x:Key="CaptionButtonClosePressedBackground" ResourceKey="SemiColorDangerPressed" />
-    <SolidColorBrush x:Key="CaptionButtonForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorText2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CheckBox.axaml
index 43403c2..f94f50a 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CheckBox.axaml
@@ -1,13 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CheckBoxForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CheckBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="CheckBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <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="CheckBoxPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="CheckBoxDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="CheckBoxPointeroverBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="CheckBoxPointeroverBorderBrush" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="CheckBoxPressedBackground" ResourceKey="SemiColorInformationPressed" />
     <StaticResource x:Key="CheckBoxPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
@@ -19,16 +19,16 @@
     <StaticResource x:Key="CheckBoxCheckedPressedBackground" ResourceKey="SemiColorInformationPressed" />
     <StaticResource x:Key="CheckBoxCheckedPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
 
-    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="CheckBoxDefaultDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="CheckBoxDefaultDisabledBorderBrush" ResourceKey="SemiColorBorder" />
     <StaticResource x:Key="CheckBoxCheckedDisabledBackground" ResourceKey="SemiColorInformationDisabled" />
     <StaticResource x:Key="CheckBoxCheckedDisabledBorderBrush" ResourceKey="SemiColorInformationDisabled" />
 
     <StaticResource x:Key="CheckBoxCardCheckedBackground" ResourceKey="SemiColorInformationLight" />
     <StaticResource x:Key="CheckBoxCardCheckedBorderBrush" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="CheckBoxCardCheckedDisabledBorderBrush" ResourceKey="SemiColorInformationDisabled" />
-    <SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#FF2E3238" />
+    <StaticResource x:Key="CheckBoxCardPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CheckBoxCardPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CheckBoxCardCheckedPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
     <StaticResource x:Key="CheckBoxCardCheckedPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ComboBox.axaml
index 8343352..24fe95a 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ComboBox.axaml
@@ -1,36 +1,36 @@
 <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.02" Color="#2E3238" />
+    <StaticResource x:Key="ComboBoxSelectorBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ComboBoxSelectorPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ComboBoxSelectorPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="ComboBoxSelectorDisabledBackground" ResourceKey="SemiColorDisabledFill" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
     <StaticResource x:Key="ComboBoxSelectorPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
 
-    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="ComboBoxIconDefaultForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ComboBoxIconDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
-    <SolidColorBrush x:Key="ComboBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ComboBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <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" />
+    <StaticResource x:Key="ComboBoxPopupBorderBrush" ResourceKey="SemiColorBorder" />
 
     <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="ComboBoxItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ComboBoxItemPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="ComboBoxItemSelectedBackground" ResourceKey="SemiColorInformationLight" />
     <StaticResource x:Key="ComboBoxItemSelectedPointeroverBackground" ResourceKey="SemiColorInformationLightPointerover" />
 
     <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <StaticResource x:Key="ComboBoxItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
 
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
+    <StaticResource x:Key="ComboBoxSelectorBorderedBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="Transparent" />
     <StaticResource x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
index fda9d3c..326b4f8 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
@@ -1,26 +1,26 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="White" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPressedBackground" ResourceKey="SemiColorFill2" />
 
-    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="DateTimePickerSeparatorBackground" ResourceKey="SemiColorBorder" />
 
 
     <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerButtonBackground" Opacity="0.05" Color="#FF2E3238" />
+    <StaticResource x:Key="DateTimePickerButtonBackground" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="DateTimePickerIconForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
+    <StaticResource x:Key="DateTimePickerButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <StaticResource x:Key="DateTimePickerButtonDisabledBackground" ResourceKey="SemiColorDisabledFill" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Expander.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Expander.axaml
index 15b20ad..c3569e7 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Expander.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="ExpanderSeparatorBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ExpanderHeaderDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ExpanderContentForeground" Opacity="0.8" Color="#1C1F23" />
+    <StaticResource x:Key="ExpanderHeaderHoverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ExpanderHeaderPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ExpanderContentForeground" ResourceKey="SemiColorText1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Flyout.axaml
index 7e7d9fd..2a7cdbd 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Flyout.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="FlyoutBackground" Color="White" />
     <SolidColorBrush x:Key="FlyoutForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="FlyoutBorderBrush" ResourceKey="SemiColorBorder" />
     <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/GridSplitter.axaml
index e5fb119..2d2fd8d 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/GridSplitter.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="GridSplitterBackground" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="{StaticResource SemiBlue1Color}" />
+    <StaticResource x:Key="GridSplitterBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="GridSplitterPreviewBackground" ResourceKey="SemiColorInformationLightPointerover" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/HeaderedContentControl.axaml
index ce87252..f5c2091 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/HeaderedContentControl.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="HeaderedContentControlDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="HeaderedContentControlDefaultBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="HeaderedContentControlDefaultBorderBrush" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/HyperlinkButton.axaml
index 571ef32..76dad7a 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/HyperlinkButton.axaml
@@ -2,6 +2,6 @@
     <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="HyperlinkButtonDefaultBackground" Color="Transparent" />
     <StaticResource x:Key="HyperlinkButtonOverForeground" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Color="#1C1F23" Opacity="0.35" />
+    <StaticResource x:Key="HyperlinkButtonDisabledForeground" ResourceKey="SemiColorDisabledText"  />
     <SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="#681DA8" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ListBox.axaml
index 420a241..deed77d 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ListBox.axaml
@@ -1,27 +1,27 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- ListBox -->
-    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="ListBoxItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ListBoxItemPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="ListBoxItemSelectedBackground" ResourceKey="SemiColorInformationLight" />
     <StaticResource x:Key="ListBoxItemSelectedPointeroverBackground" ResourceKey="SemiColorInformationLightPointerover" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <StaticResource x:Key="ListBoxItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
 
     <!-- RadioGroupListBox -->
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemRadioGroupDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDisabledBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="ListBoxItemRadioGroupUncheckIconPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ListBoxItemRadioGroupUncheckIconPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ListBoxItemRadioGroupUncheckIconDisabledBackground" ResourceKey="SemiColorFill0" />
 
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemRadioGroupUncheckIconDefaultBorderBrush" ResourceKey="SemiColorText3" />
     <StaticResource x:Key="ListBoxItemRadioGroupUncheckIconPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
     <StaticResource x:Key="ListBoxItemRadioGroupUncheckIconPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemRadioGroupUncheckIconDisabledBorderBrush" ResourceKey="SemiColorBorder" />
 
 
     <StaticResource x:Key="ListBoxItemRadioGroupCheckIconDefaultBackground" ResourceKey="SemiColorInformation" />
@@ -37,15 +37,15 @@
 
     <SolidColorBrush x:Key="ListBoxItemRadioGroupForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemRadioGroupDefaultBorderBrush" ResourceKey="SemiColorText3" />
 
     <!-- ButtonRadioGroupListBox -->
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemRadioGroupButtonUncheckedForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="ListBoxItemRadioGroupButtonUncheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ListBoxItemRadioGroupButtonUncheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <StaticResource x:Key="ListBoxItemRadioGroupButtonCheckedForeground" ResourceKey="SemiColorInformation" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedBackground" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemRadioGroupButtonCheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <!-- CardRadioGroupListBox -->
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBackground" Color="Transparent" />
@@ -54,19 +54,19 @@
     <StaticResource x:Key="ListBoxItemRadioGroupCardCheckDefaultBorderBrush" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="ListBoxItemRadioGroupCardCheckPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
     <StaticResource x:Key="ListBoxItemRadioGroupCardCheckPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardUncheckPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardUncheckPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="ListBoxItemRadioGroupCardUncheckPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ListBoxItemRadioGroupCardUncheckPressedBackground" ResourceKey="SemiColorFill1" />
 
     <!-- CheckGroupListBox -->
     <SolidColorBrush x:Key="ListBoxItemCheckForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemCheckDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemCheckDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="ListBoxItemCheckGlyphFill" Color="White" />
     <SolidColorBrush x:Key="ListBoxItemCheckGlyphDisabledFill" Color="White" />
 
     <SolidColorBrush x:Key="ListBoxItemCheckDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemCheckDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ListBoxItemCheckPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="ListBoxItemCheckDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="ListBoxItemCheckPointeroverBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="ListBoxItemCheckPointeroverBorderBrush" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="ListBoxItemCheckPressedBackground" ResourceKey="SemiColorInformationPressed" />
     <StaticResource x:Key="ListBoxItemCheckPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
@@ -78,8 +78,8 @@
     <StaticResource x:Key="ListBoxItemCheckCheckedPressedBackground" ResourceKey="SemiColorInformationPressed" />
     <StaticResource x:Key="ListBoxItemCheckCheckedPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
 
-    <SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemCheckDefaultDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="ListBoxItemCheckDefaultDisabledBorderBrush" ResourceKey="SemiColorBorder" />
     <StaticResource x:Key="ListBoxItemCheckCheckedDisabledBackground" ResourceKey="SemiColorInformationDisabled" />
     <StaticResource x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" ResourceKey="SemiColorInformationDisabled" />
 
@@ -87,8 +87,8 @@
     <StaticResource x:Key="ListBoxItemCheckCardCheckedBackground" ResourceKey="SemiColorInformationLight" />
     <StaticResource x:Key="ListBoxItemCheckCardCheckedBorderBrush" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" ResourceKey="SemiColorInformationDisabled" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Opacity="0.09" Color="#FF2E3238" />
+    <StaticResource x:Key="ListBoxItemCheckCardPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ListBoxItemCheckCardPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
     <StaticResource x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml
index b2347f8..7232765 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml
@@ -1,24 +1,24 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="MenuFlyoutScrollViewerIconForeground" ResourceKey="SemiColorText2" />
 
     <!--  MenuFlyout  -->
     <SolidColorBrush x:Key="MenuFlyoutBackground" Color="White" />
-    <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="MenuFlyoutBorderBrush" ResourceKey="SemiColorBorder" />
     <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
 
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="White" />
     <SolidColorBrush x:Key="MenuItemForeground" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="MenuItemSeparatorBackground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="MenuItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="MenuItemPressedBackground" ResourceKey="SemiColorFill1" />
 
     <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="Gray" />
-    <SolidColorBrush x:Key="MenuItemExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="MenuItemExpandIconForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="MenuItemExpandIconOpenForeground" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="MenuItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="MenuItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="#1C1F23" />
-    <SolidColorBrush x:Key="MenuItemDisabledExpandIconForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="MenuItemDisabledExpandIconForeground" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/NotificationCard.axaml
index 82f0cae..fbd394b 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/NotificationCard.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="NotificationCardForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="NotificationCardBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="NotificationCardBackground" Color="White" />
     <StaticResource x:Key="NotificationCardInformationIconForeground" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="NotificationCardSuccessIconForeground" ResourceKey="SemiColorSuccess" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ProgressBar.axaml
index fc9eeca..ff8e79a 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ProgressBar.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
     <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/RadioButton.axaml
index b6a14e7..4099142 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/RadioButton.axaml
@@ -1,49 +1,49 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- RadioButton -->
-    <SolidColorBrush x:Key="RadioButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="RadioButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="RadioButtonUncheckIconPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="RadioButtonUncheckIconPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="RadioButtonUncheckIconDisabledBackground" ResourceKey="SemiColorFill0" />
 
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="{StaticResource SemiBlue6Color}" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="{StaticResource SemiBlue7Color}" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="RadioButtonUncheckIconDefaultBorderBrush" ResourceKey="SemiColorText3" />
+    <StaticResource x:Key="RadioButtonUncheckIconPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
+    <StaticResource x:Key="RadioButtonUncheckIconPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
+    <StaticResource x:Key="RadioButtonUncheckIconDisabledBorderBrush" ResourceKey="SemiColorBorder" />
 
 
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="{StaticResource SemiBlue5Color}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="{StaticResource SemiBlue6Color}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="{StaticResource SemiBlue7Color}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="{StaticResource SemiBlue2Color}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="{StaticResource SemiBlue5Color}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="{StaticResource SemiBlue6Color}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="{StaticResource SemiBlue7Color}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="{StaticResource SemiBlue2Color}" />
+    <StaticResource x:Key="RadioButtonCheckIconDefaultBackground" ResourceKey="SemiColorInformation" />
+    <StaticResource x:Key="RadioButtonCheckIconPointeroverBackground" ResourceKey="SemiColorInformationPointerover" />
+    <StaticResource x:Key="RadioButtonCheckIconPressedBackground" ResourceKey="SemiColorInformationPressed" />
+    <StaticResource x:Key="RadioButtonCheckIconDisabledBackground" ResourceKey="SemiColorInformationDisabled" />
+    <StaticResource x:Key="RadioButtonCheckIconDefaultBorderBrush" ResourceKey="SemiColorInformation" />
+    <StaticResource x:Key="RadioButtonCheckIconPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
+    <StaticResource x:Key="RadioButtonCheckIconPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
+    <StaticResource x:Key="RadioButtonCheckIconDisabledBorderBrush" ResourceKey="SemiColorInformationDisabled" />
     <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
 
     <SolidColorBrush x:Key="RadioButtonForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="RadioButtonDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="RadioButtonDefaultBorderBrush" ResourceKey="SemiColorText3" />
 
-    <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="RadioButtonGroupBackground" ResourceKey="SemiColorFill0" />
 
     <!-- ButtonRadioButton -->
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="{StaticResource SemiBlue5Color}" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="RadioButtonButtonCheckedForeground" ResourceKey="SemiColorInformation" />
     <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="White" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="RadioButtonButtonCheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <!-- CardRadioButton -->
     <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="{StaticResource SemiBlue0Color}" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="{StaticResource SemiBlue5Color}" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="{StaticResource SemiBlue6Color}" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="{StaticResource SemiBlue7Color}" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="RadioButtonCardCheckedBackground" ResourceKey="SemiColorInformationLight" />
+    <StaticResource x:Key="RadioButtonCardCheckDefaultBorderBrush" ResourceKey="SemiColorInformation" />
+    <StaticResource x:Key="RadioButtonCardCheckPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
+    <StaticResource x:Key="RadioButtonCardCheckPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
+    <StaticResource x:Key="RadioButtonCardUncheckPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="RadioButtonCardUncheckPressedBackground" ResourceKey="SemiColorFill1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ScrollViewer.axaml
index e4f881d..277090e 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ScrollViewer.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="ScrollBarButtonDefaultForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ScrollBarButtonPointeroverForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ScrollBarThumbForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ScrollBarThumbPointeroverForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="ScrollBarBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Slider.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Slider.axaml
index 7bd0810..9b5eef3 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Slider.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="SliderTrackForeground" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="SliderTrackBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="SliderTrackBackground" ResourceKey="SemiColorFill0" />
 
     <SolidColorBrush x:Key="SliderTickForeground" Color="#C6CACD" />
     <SolidColorBrush x:Key="SliderThumbBackground" Color="White" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/SplitView.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/SplitView.axaml
index d9ddecb..3da1d38 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/SplitView.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/SplitView.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SplitViewSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="SplitViewSeparatorBackground" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="SplitViewMaskBrush" Opacity="0.2" Color="{StaticResource SemiGrey6Color}"  />
     <SolidColorBrush x:Key="SplitViewPaneBackground" Color="White" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TabItem.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TabItem.axaml
index 2784f91..53186e3 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TabItem.axaml
@@ -2,10 +2,10 @@
     <!--  Line  -->
     <SolidColorBrush x:Key="TabItemLinePipeBackground" Color="Transparent" />
     <StaticResource x:Key="TabItemLinePipeSelectedBackground" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="TabItemLinePipePressedBorderBrush" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="TabItemLinePipePointeroverBorderBrush" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TabItemLinePipePressedBorderBrush" ResourceKey="SemiColorFill2" />
 
-    <SolidColorBrush x:Key="TabItemLineHeaderForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Opacity="0.8" Color="#1C1F23" />
+    <StaticResource x:Key="TabItemLineHeaderForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TabItemLineHeaderPointeroverForeground" ResourceKey="SemiColorText1" />
     <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="#1C1F23" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml
index 97ff4f3..562e09a 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="TextBlockSecondaryForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="TextBlockTertiaryForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="TextBlockQuaternaryForeground" ResourceKey="SemiColorText3" />
     <StaticResource x:Key="TextBlockSuccessForeground" ResourceKey="SemiColorSuccess" />
     <StaticResource x:Key="TextBlockWarningForeground" ResourceKey="SemiColorWarning" />
     <StaticResource x:Key="TextBlockDangerForeground" ResourceKey="SemiColorDanger" />
-    <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="TextBlockDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#1C1F23" />
     <StaticResource x:Key="TextBlockMarkBackground" ResourceKey="SemiColorInformationLight" />
     <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.1" Color="#2E3238" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBox.axaml
index a532796..2159100 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBox.axaml
@@ -2,22 +2,22 @@
     <SolidColorBrush x:Key="TextBoxTextCaretBrush" Color="Black" />
 
     <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" />
+    <StaticResource x:Key="TextBoxDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="TextBoxPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TextBoxPressedBackground" ResourceKey="SemiColorFill2" />
     <StaticResource x:Key="TextBoxFocusBorderBrush" ResourceKey="SemiColorInformation" />
     <SolidColorBrush x:Key="TextBoxForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="TextBoxInnerForeground" ResourceKey="SemiColorText2" />
 
-    <SolidColorBrush x:Key="TextBoxButtonDefaultForeground" Opacity="0.08" Color="#FF1C1F23" />
+    <StaticResource x:Key="TextBoxButtonDefaultForeground" ResourceKey="SemiColorBorder" />
     <StaticResource x:Key="TextBoxButtonPointeroverForeground" ResourceKey="SemiColorInformation" />
 
-    <SolidColorBrush x:Key="TextBoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#FF1C1F23" />
+    <StaticResource x:Key="TextBoxDisabledBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="TextBoxDisabledForeground" ResourceKey="SemiColorText3" />
     <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="Transparent" />
 
     <SolidColorBrush x:Key="TextBoxBorderedDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxBorderedDefaultBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
+    <StaticResource x:Key="TextBoxBorderedDefaultBorderBrush" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBackground" Color="Transparent" />
     <StaticResource x:Key="TextBoxBorderedPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
 
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleButton.axaml
index 66a36b1..2338cd7 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleButton.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="ToggleButtonDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ToggleButtonDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ToggleButtonDefaultPressedBackground" ResourceKey="SemiColorFill2" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Color="#E6E8EA" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ToggleButtonDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />
 
@@ -80,5 +80,5 @@
     <StaticResource x:Key="ToggleButtonWarningIndeterminatePressedForeground" ResourceKey="SemiColorWarningPressed" />
     <StaticResource x:Key="ToggleButtonDangerIndeterminatePressedForeground" ResourceKey="SemiColorDangerPressed" />
 
-    <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="ToggleButtonIndeterminateDisabledBorderBrush" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleSwitch.axaml
index ec31198..f0e7668 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleSwitch.axaml
@@ -1,15 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedPressedBackground" ResourceKey="SemiColorFill2" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />
 
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.09" Color="#1C1F23" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" ResourceKey="SemiColorFill1" />
 
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5FB346" />
     <StaticResource x:Key="ToggleSwitchContainerCheckedPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
     <StaticResource x:Key="ToggleSwitchContainerCheckedPressedBackground" ResourceKey="SemiColorSuccessPressed" />
     <StaticResource x:Key="ToggleSwitchContainerCheckedDisabledBackground" ResourceKey="SemiColorSuccessDisabled" />
 
-    <SolidColorBrush x:Key="ToggleSwitchIndicatorBorderBrush" Opacity="0.09" Color="#1C1F23" />
+    <StaticResource x:Key="ToggleSwitchIndicatorBorderBrush" ResourceKey="SemiColorFill1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TreeView.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TreeView.axaml
index 853f2f3..6dca4db 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TreeView.axaml
@@ -1,13 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="TreeViewItemIconDefaultForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <StaticResource x:Key="TreeViewItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <StaticResource x:Key="TreeViewItemPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="TreeViewItemPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="TreeViewItemSelectedBackground" ResourceKey="SemiColorInformationLight" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <StaticResource x:Key="TreeViewItemSelectedDisabledBackground" ResourceKey="SemiColorDisabledFill" />
 </ResourceDictionary>
\ No newline at end of file