From 9fdd67f609af32c88fc17115967ad4c4c4c35d85 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Sun, 7 Apr 2024 21:39:17 +0800
Subject: [PATCH] feat: Default foreground & background.

---
 .../Themes/Schemes/Default/Base.axaml              |  4 ++--
 .../Schemes/Default/Light/ButtonSpinner.axaml      |  2 +-
 .../Themes/Schemes/Default/Light/Calendar.axaml    | 14 +++++++-------
 .../Schemes/Default/Light/CalendarDatePicker.axaml |  4 ++--
 .../Themes/Schemes/Default/Light/CheckBox.axaml    |  2 +-
 .../Themes/Schemes/Default/Light/ComboBox.axaml    |  8 ++++----
 .../Default/Light/DateTimePickerShared.axaml       |  8 ++++----
 .../Themes/Schemes/Default/Light/Expander.axaml    |  2 +-
 .../Themes/Schemes/Default/Light/Flyout.axaml      |  4 ++--
 .../Schemes/Default/Light/HyperlinkButton.axaml    |  2 +-
 .../Themes/Schemes/Default/Light/Label.axaml       | 12 ++++++------
 .../Themes/Schemes/Default/Light/ListBox.axaml     |  6 +++---
 .../Schemes/Default/Light/ManagedFileChooser.axaml |  2 +-
 .../Themes/Schemes/Default/Light/Menu.axaml        |  8 ++++----
 .../Schemes/Default/Light/NotificationCard.axaml   |  4 ++--
 .../Themes/Schemes/Default/Light/ProgressBar.axaml |  4 ++--
 .../Themes/Schemes/Default/Light/RadioButton.axaml |  4 ++--
 .../Themes/Schemes/Default/Light/SplitView.axaml   |  2 +-
 .../Themes/Schemes/Default/Light/TabItem.axaml     |  2 +-
 .../Themes/Schemes/Default/Light/TextBlock.axaml   |  2 +-
 .../Themes/Schemes/Default/Light/TextBox.axaml     |  2 +-
 .../Themes/Schemes/Default/Light/TreeView.axaml    |  4 ++--
 .../Themes/Schemes/Default/Light/Window.axaml      |  4 ++--
 23 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Base.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Base.axaml
index 2489219..361ac77 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Base.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Base.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
-            <SolidColorBrush x:Key="DefaultForeground" Color="#1C1F23" />
+            <StaticResource x:Key="DefaultForeground" ResourceKey="SemiColorText0" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
-            <SolidColorBrush x:Key="DefaultForeground" Color="#F9F9F9" />
+            <StaticResource x:Key="DefaultForeground" ResourceKey="SemiColorText0" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
     <x:Double x:Key="DefaultFontSize">14</x:Double>
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ButtonSpinner.axaml
index 5f1295c..125440e 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ButtonSpinner.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="White" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonBackground" ResourceKey="SemiColorBackground2" />
     <StaticResource x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="ButtonSpinnerRepeatButtonPressedBackground" ResourceKey="SemiColorFill2" />
     <StaticResource x:Key="ButtonSpinnerRepeatButtonDisabledBackground" ResourceKey="SemiColorFill0" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Calendar.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Calendar.axaml
index d7496a7..7566706 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Calendar.axaml
@@ -1,22 +1,22 @@
 <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" />
+    <StaticResource x:Key="CalendarBackground" ResourceKey="SemiColorBackground1" />
+    <StaticResource x:Key="CalendarForeground" ResourceKey="SemiColorText0" />
     <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" />
+    <StaticResource x:Key="CalendarItemCalendarButtonBackground" ResourceKey="SemiColorBackground1" />
+    <StaticResource x:Key="CalendarItemCalendarButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
     <StaticResource x:Key="CalendarItemCalendarButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CalendarItemCalendarButtonPressedBackground" ResourceKey="SemiColorFill2" />
     <StaticResource x:Key="CalendarItemCalendarButtonSelectedBackground" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="White" />
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedForeground" ResourceKey="SemiColorBackground1" />
     <StaticResource x:Key="CalendarItemCalendarButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <StaticResource x:Key="CalendarItemCalendarButtonBlackoutForeground" ResourceKey="SemiColorDisabledText" />
     <StaticResource x:Key="CalendarItemCalendarButtonInactiveForeground" ResourceKey="SemiColorDisabledText" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
 
@@ -24,7 +24,7 @@
     <StaticResource x:Key="CalendarItemCalendarDayButtonPressedBackground" ResourceKey="SemiColorFill2" />
 
     <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedBackground" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="White" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedForeground" ResourceKey="SemiColorBackground1" />
 
     <StaticResource x:Key="CalendarItemCalendarDayButtonTodayForeground" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="CalendarItemCalendarDayButtonTodayBackground" ResourceKey="SemiColorFill0" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
index 28db5ce..e68a6ed 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="CalendarDatePickerIconForeground" ResourceKey="SemiColorText2" />
-    <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#1C1F23" />
+    <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalendarDatePickerIconPointeroverForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="CalendarDatePickerPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CalendarDatePickerFocusBorderBrush" ResourceKey="SemiColorInformation" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CheckBox.axaml
index f94f50a..c37be8e 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CheckBox.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CheckBoxForeground" Color="#1C1F23" />
+    <StaticResource x:Key="CheckBoxForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="CheckBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="CheckBoxGlyphFill" Color="White" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ComboBox.axaml
index 24fe95a..a6d8d98 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ComboBox.axaml
@@ -8,17 +8,17 @@
     <StaticResource x:Key="ComboBoxSelectorPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
 
     <StaticResource x:Key="ComboBoxIconDefaultForeground" ResourceKey="SemiColorText2" />
-    <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ComboBoxIconPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ComboBoxIconPressedForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="ComboBoxIconDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <StaticResource x:Key="ComboBoxDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1A000000</BoxShadows>
-    <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="White" />
+    <StaticResource x:Key="ComboBoxPopupBackground" ResourceKey="SemiColorBackground2" />
     <StaticResource x:Key="ComboBoxPopupBorderBrush" ResourceKey="SemiColorBorder" />
 
-    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SemiColorText0" />
 
     <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
     <StaticResource x:Key="ComboBoxItemPointeroverBackground" ResourceKey="SemiColorFill0" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
index 326b4f8..11f8968 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="White" />
+    <StaticResource x:Key="DateTimePickerPopupBackground" ResourceKey="SemiColorBackground2" />
     <StaticResource x:Key="DateTimePickerFlyoutButtonForeground" ResourceKey="SemiColorText2" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#1C1F23" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPressedForeground" ResourceKey="SemiColorText0" />
 
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="Transparent" />
     <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
@@ -14,7 +14,7 @@
 
     <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
     <StaticResource x:Key="DateTimePickerButtonBackground" ResourceKey="SemiColorFill0" />
-    <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="#1C1F23" />
+    <StaticResource x:Key="DateTimePickerButtonForeground" ResourceKey="SemiColorText0" />
 
     <StaticResource x:Key="DateTimePickerIconForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Expander.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Expander.axaml
index c3569e7..fb8f9fb 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Expander.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="ExpanderSeparatorBorderBrush" ResourceKey="SemiColorBorder" />
-    <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ExpanderHeaderForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="ExpanderHeaderDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="Transparent" />
     <StaticResource x:Key="ExpanderHeaderHoverBackground" ResourceKey="SemiColorFill0" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Flyout.axaml
index 2a7cdbd..78e701a 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" />
+    <StaticResource x:Key="FlyoutBackground" ResourceKey="SemiColorBackground2" />
+    <StaticResource x:Key="FlyoutForeground" ResourceKey="SemiColorText0" />
     <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/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/HyperlinkButton.axaml
index 76dad7a..51fbfab 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/HyperlinkButton.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#1C1F23" />
+    <StaticResource x:Key="HyperlinkButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="HyperlinkButtonDefaultBackground" Color="Transparent" />
     <StaticResource x:Key="HyperlinkButtonOverForeground" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="HyperlinkButtonDisabledForeground" ResourceKey="SemiColorDisabledText"  />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Label.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Label.axaml
index 99aa5ae..fc45923 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Label.axaml
@@ -32,8 +32,8 @@
     <SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="{StaticResource SemiOrange5Color}" />
     <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="{StaticResource SemiGrey8Color}" />
     <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="{StaticResource SemiGrey5Color}" />
-    <SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="#FFFFFF" />
+    <StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="SemiColorText0" />
+    <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="White" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#C6CACD" />
 
     <SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="{StaticResource SemiRed4Color}" />
@@ -69,9 +69,9 @@
     <SolidColorBrush x:Key="LabelTagGhostGreyBorderBrush" Color="{StaticResource SemiGrey4Color}" />
     <SolidColorBrush x:Key="LabelTagGhostGreyForeground" Color="{StaticResource SemiGrey5Color}" />
     <SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="#C6CACD" />
-    <SolidColorBrush x:Key="LabelTagGhostWhiteForeground" Color="#1C1F23" />
+    <StaticResource x:Key="LabelTagGhostWhiteForeground" ResourceKey="SemiColorText0" />
 
-    <SolidColorBrush x:Key="LabelTagSolidForeground" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="LabelTagSolidForeground" Color="White" />
     <SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="{StaticResource SemiRed5Color}" />
     <SolidColorBrush x:Key="LabelTagSolidPinkBackground" Color="{StaticResource SemiPink5Color}" />
     <SolidColorBrush x:Key="LabelTagSolidPurpleBackground" Color="{StaticResource SemiPurple5Color}" />
@@ -89,7 +89,7 @@
     <SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="{StaticResource SemiOrange5Color}" />
     <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="{StaticResource SemiGrey5Color}" />
 
-    <SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="#FFFFFF" />
+    <StaticResource x:Key="LabelTagSolidWhiteBackground" ResourceKey="SemiColorBackground4" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#C6CACD" />
-    <SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#1C1F23" />
+    <StaticResource x:Key="LabelTagSolidWhiteForeground" ResourceKey="SemiColorText0" />
 </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 deed77d..0ec4b28 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ListBox.axaml
@@ -35,7 +35,7 @@
 
     <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckGlyphFill" Color="White" />
 
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemRadioGroupForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupDefaultBackground" Color="Transparent" />
     <StaticResource x:Key="ListBoxItemRadioGroupDefaultBorderBrush" ResourceKey="SemiColorText3" />
 
@@ -44,7 +44,7 @@
     <StaticResource x:Key="ListBoxItemRadioGroupButtonUncheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="ListBoxItemRadioGroupButtonUncheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <StaticResource x:Key="ListBoxItemRadioGroupButtonCheckedForeground" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedBackground" Color="White" />
+    <StaticResource x:Key="ListBoxItemRadioGroupButtonCheckedBackground" ResourceKey="SemiColorBackground3" />
     <StaticResource x:Key="ListBoxItemRadioGroupButtonCheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <!-- CardRadioGroupListBox -->
@@ -58,7 +58,7 @@
     <StaticResource x:Key="ListBoxItemRadioGroupCardUncheckPressedBackground" ResourceKey="SemiColorFill1" />
 
     <!-- CheckGroupListBox -->
-    <SolidColorBrush x:Key="ListBoxItemCheckForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ListBoxItemCheckForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="ListBoxItemCheckDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="ListBoxItemCheckGlyphFill" Color="White" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ManagedFileChooser.axaml
index b00dcac..8f62b7b 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ManagedFileChooser.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ManagedFileChooserTextForeground" ResourceKey="SemiColorText0" />
 </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 7232765..738974a 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml
@@ -2,13 +2,13 @@
     <StaticResource x:Key="MenuFlyoutScrollViewerIconForeground" ResourceKey="SemiColorText2" />
 
     <!--  MenuFlyout  -->
-    <SolidColorBrush x:Key="MenuFlyoutBackground" Color="White" />
+    <StaticResource x:Key="MenuFlyoutBackground" ResourceKey="SemiColorBackground2" />
     <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" />
+    <StaticResource x:Key="MenuItemBackground" ResourceKey="SemiColorBackground2" />
+    <StaticResource x:Key="MenuItemForeground" ResourceKey="SemiColorText0" />
 
     <StaticResource x:Key="MenuItemSeparatorBackground" ResourceKey="SemiColorBorder" />
     <StaticResource x:Key="MenuItemPointeroverBackground" ResourceKey="SemiColorFill0" />
@@ -16,7 +16,7 @@
 
     <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="Gray" />
     <StaticResource x:Key="MenuItemExpandIconForeground" ResourceKey="SemiColorText2" />
-    <SolidColorBrush x:Key="MenuItemExpandIconOpenForeground" Color="#1C1F23" />
+    <StaticResource x:Key="MenuItemExpandIconOpenForeground" ResourceKey="SemiColorText0" />
 
     <StaticResource x:Key="MenuItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="#1C1F23" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/NotificationCard.axaml
index fbd394b..5ea4083 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/NotificationCard.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="NotificationCardForeground" Color="#1C1F23" />
+    <StaticResource x:Key="NotificationCardForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="NotificationCardBorderBrush" ResourceKey="SemiColorBorder" />
-    <SolidColorBrush x:Key="NotificationCardBackground" Color="White" />
+    <StaticResource x:Key="NotificationCardBackground" ResourceKey="SemiColorBackground3" />
     <StaticResource x:Key="NotificationCardInformationIconForeground" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="NotificationCardSuccessIconForeground" ResourceKey="SemiColorSuccess" />
     <StaticResource x:Key="NotificationCardWarningIconForeground" ResourceKey="SemiColorWarning" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ProgressBar.axaml
index ff8e79a..5b1dbb5 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ProgressBar.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
-    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#1C1F23" />
+    <StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
     <StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/RadioButton.axaml
index 4099142..b9aa20c 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/RadioButton.axaml
@@ -23,7 +23,7 @@
     <StaticResource x:Key="RadioButtonCheckIconDisabledBorderBrush" ResourceKey="SemiColorInformationDisabled" />
     <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
 
-    <SolidColorBrush x:Key="RadioButtonForeground" Color="#1C1F23" />
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="RadioButtonDefaultBackground" Color="Transparent" />
     <StaticResource x:Key="RadioButtonDefaultBorderBrush" ResourceKey="SemiColorText3" />
 
@@ -34,7 +34,7 @@
     <StaticResource x:Key="RadioButtonButtonUncheckedPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="RadioButtonButtonUncheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
     <StaticResource x:Key="RadioButtonButtonCheckedForeground" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="White" />
+    <StaticResource x:Key="RadioButtonButtonCheckedBackground" ResourceKey="SemiColorBackground3" />
     <StaticResource x:Key="RadioButtonButtonCheckedDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <!-- CardRadioButton -->
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/SplitView.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/SplitView.axaml
index 3da1d38..45ec717 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">
     <StaticResource x:Key="SplitViewSeparatorBackground" ResourceKey="SemiColorBorder" />
     <SolidColorBrush x:Key="SplitViewMaskBrush" Opacity="0.2" Color="{StaticResource SemiGrey6Color}"  />
-    <SolidColorBrush x:Key="SplitViewPaneBackground" Color="White" />
+    <StaticResource x:Key="SplitViewPaneBackground" ResourceKey="SemiColorBackground0" />
 </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 53186e3..a91b4b0 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TabItem.axaml
@@ -7,5 +7,5 @@
 
     <StaticResource x:Key="TabItemLineHeaderForeground" ResourceKey="SemiColorText2" />
     <StaticResource x:Key="TabItemLineHeaderPointeroverForeground" ResourceKey="SemiColorText1" />
-    <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="#1C1F23" />
+    <StaticResource x:Key="TabItemLineHeaderSelectedForeground" ResourceKey="SemiColorText0" />
 </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 562e09a..678ab18 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="#1C1F23" />
+    <StaticResource x:Key="TextBlockDefaultForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="TextBlockSecondaryForeground" ResourceKey="SemiColorText1" />
     <StaticResource x:Key="TextBlockTertiaryForeground" ResourceKey="SemiColorText2" />
     <StaticResource x:Key="TextBlockQuaternaryForeground" ResourceKey="SemiColorText3" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBox.axaml
index 2159100..2e840df 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBox.axaml
@@ -6,7 +6,7 @@
     <StaticResource x:Key="TextBoxPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="TextBoxPressedBackground" ResourceKey="SemiColorFill2" />
     <StaticResource x:Key="TextBoxFocusBorderBrush" ResourceKey="SemiColorInformation" />
-    <SolidColorBrush x:Key="TextBoxForeground" Color="#1C1F23" />
+    <StaticResource x:Key="TextBoxForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="TextBoxInnerForeground" ResourceKey="SemiColorText2" />
 
     <StaticResource x:Key="TextBoxButtonDefaultForeground" ResourceKey="SemiColorBorder" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TreeView.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TreeView.axaml
index 6dca4db..4759c4a 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TreeView.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="#1C1F23" />
+    <StaticResource x:Key="TreeViewItemDefaultForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="TreeViewItemIconDefaultForeground" ResourceKey="SemiColorText2" />
-    <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#1C1F23" />
+    <StaticResource x:Key="TreeViewItemIconHoverForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="TreeViewItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Window.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Window.axaml
index b2e8f39..1f95612 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Window.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="WindowDefaultBackground" Color="White" />
-    <SolidColorBrush x:Key="WindowDefaultForeground" Color="#1C1F23" />
+    <StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file