From 32e5e6b5f2f5d29dfbd388ac2e4f2e1ef7c28001 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Mon, 13 Jan 2025 15:06:39 +0800
Subject: [PATCH] feat: replace SolidColorBrush with StaticResource in
 high-contrast themes.

---
 .../Themes/HighContrast/AdornerLayer.axaml    |  4 +-
 .../Themes/HighContrast/AutoCompleteBox.axaml |  4 +-
 .../Themes/HighContrast/Border.axaml          |  4 +-
 .../Themes/HighContrast/Button.axaml          | 57 ++++++--------
 .../Themes/HighContrast/ButtonSpinner.axaml   | 14 ++--
 .../Themes/HighContrast/Calendar.axaml        | 56 ++++++-------
 .../HighContrast/CalendarDatePicker.axaml     | 20 ++---
 .../Themes/HighContrast/CaptionButtons.axaml  | 10 +--
 .../Themes/HighContrast/CheckBox.axaml        | 59 +++++++-------
 .../Themes/HighContrast/ComboBox.axaml        | 68 ++++++++--------
 .../HighContrast/DateTimePickerShared.axaml   | 46 +++++------
 .../Themes/HighContrast/Expander.axaml        | 14 ++--
 .../Themes/HighContrast/Flyout.axaml          |  6 +-
 .../Themes/HighContrast/GridSplitter.axaml    |  4 +-
 .../HighContrast/HeaderedContentControl.axaml |  6 +-
 .../Themes/HighContrast/HyperlinkButton.axaml | 10 +--
 .../Themes/HighContrast/ListBox.axaml         | 23 +++---
 .../HighContrast/ManagedFileChooser.axaml     |  4 +-
 .../Themes/HighContrast/Menu.axaml            | 33 ++++----
 .../HighContrast/NotificationCard.axaml       | 13 ++--
 .../Themes/HighContrast/ProgressBar.axaml     | 12 +--
 .../Themes/HighContrast/RadioButton.axaml     | 78 +++++++++----------
 .../HighContrast/RefreshContainer.axaml       |  2 +-
 .../Themes/HighContrast/ScrollViewer.axaml    |  8 +-
 .../Themes/HighContrast/Slider.axaml          | 22 +++---
 .../Themes/HighContrast/SplitView.axaml       |  4 +-
 .../Themes/HighContrast/TabItem.axaml         | 13 ++--
 .../Themes/HighContrast/TextBlock.axaml       | 15 ++--
 .../Themes/HighContrast/TextBox.axaml         | 31 ++++----
 .../Themes/HighContrast/ToggleButton.axaml    | 56 +++++++------
 .../Themes/HighContrast/ToggleSwitch.axaml    | 28 +++----
 .../Themes/HighContrast/Tooltip.axaml         |  6 +-
 .../Themes/HighContrast/TreeView.axaml        | 25 +++---
 .../Themes/HighContrast/Window.axaml          |  4 +-
 .../Tokens/HighContrast/Aquatic.axaml         |  8 ++
 .../Tokens/HighContrast/Desert.axaml          |  8 ++
 .../Tokens/HighContrast/Dusk.axaml            |  8 ++
 .../Tokens/HighContrast/NightSky.axaml        |  8 ++
 38 files changed, 381 insertions(+), 410 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml
index fe2a724..c7bc7ca 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="AdornerSolidLayerBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="AdornerLayerBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="AdornerSolidLayerBorderBrush" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml
index d1b18c5..63ca5fb 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="AutoCompleteBoxPopupBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="AutoCompleteBoxPopupBorderBrush" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Border.axaml b/src/Semi.Avalonia/Themes/HighContrast/Border.axaml
index 8c393fc..c601309 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Border.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Border.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="BorderCardBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="BorderCardBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="BorderCardBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="BorderCardBorderBrush" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Button.axaml b/src/Semi.Avalonia/Themes/HighContrast/Button.axaml
index a159fd3..cce8c77 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Button.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Button.axaml
@@ -1,48 +1,39 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="ButtonDefaultBackground" Color="{StaticResource ButtonFaceColor}" />
-    <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonDefaultPrimaryForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonDefaultDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ButtonDefaultBackground" ResourceKey="SemiColorButtonFace" />
+    <StaticResource x:Key="ButtonDefaultPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ButtonDefaultPressedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ButtonDefaultBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonDefaultPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
     <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonDefaultDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
     <!--  end Light  -->
-
     <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonSolidForeground" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="{StaticResource ButtonFaceColor}" />
-
-    <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Color="{StaticResource ButtonFaceColor}" />
+    <StaticResource x:Key="ButtonSolidForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ButtonSolidPrimaryBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonSolidPrimaryPointeroverBackground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedBackground" ResourceKey="SemiColorButtonFace" />
+    <StaticResource x:Key="ButtonSolidPrimaryBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonSolidPrimaryPointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonSolidPrimaryPressedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonSolidDisabledBackground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ButtonSolidDisabledForeground" ResourceKey="SemiColorButtonFace" />
     <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Transparent" />
     <!--  end Solid  -->
-
     <!--  Borderless -->
     <SolidColorBrush x:Key="ButtonBorderlessBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonBorderlessBorderBrush" Color="Transparent" />
     <!--  end Borderless  -->
-
     <!--  Outline -->
     <SolidColorBrush x:Key="ButtonOutlineBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonOutlineBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ButtonOutlinePointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ButtonOutlinePressedBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="ButtonOutlineBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ButtonOutlinePointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ButtonOutlinePressedBackground" ResourceKey="SemiColorWindow" />
     <!--  end Outline  -->
-
-    <SolidColorBrush x:Key="ButtonInputInnerForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonInputInnerForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonInputInnerPointeroverForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonInputInnerPressedForeground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml
index a3bbf1b..2ccc6f6 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="{StaticResource ButtonFaceColor}" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonBackground" ResourceKey="SemiColorButtonFace" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonPressedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonDisabledBackground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonSpinnerRepeatButtonBorderBrush" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Calendar.axaml b/src/Semi.Avalonia/Themes/HighContrast/Calendar.axaml
index e82244f..c077a42 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Calendar.axaml
@@ -1,35 +1,29 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CalendarBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="CalendarForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="CalendarBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemIconForeground" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="CalendarBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="CalendarForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CalendarBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CalendarItemWeekDayNameForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CalendarItemIconForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="CalendarItemCalendarButtonForeground" ResourceKey="SemiColorWindowText" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="CalendarItemCalendarButtonPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonPressedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonBlackoutForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CalendarItemCalendarButtonInactiveForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonBackground" ResourceKey="SemiColorWindow" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayBackground" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonPressedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonTodayForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonTodayBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonBlackoutForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonInactiveForeground" ResourceKey="SemiColorGrayText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml
index 3bc7595..6ec00b9 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="CalendarDatePickerIconForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CalendarDatePickerForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CalendarDatePickerIconPointeroverForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalendarDatePickerBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="CalendarDatePickerPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalendarDatePickerPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalendarDatePickerFocusBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalendarDatePickerDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="CalendarDatePickerDisabledIconForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CalendarDatePickerBorderBrush" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/HighContrast/CaptionButtons.axaml
index b44919e..cc1f77a 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/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" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="CaptionButtonPressedBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="CaptionButtonForeground" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="CaptionButtonPointeroverBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="CaptionButtonPressedBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="CaptionButtonClosePointeroverBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="CaptionButtonClosePressedBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml
index 05ed7a2..90ccbfd 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml
@@ -1,34 +1,29 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CheckBoxForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="CheckBoxGlyphFill" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxGlyphDisabledFill" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="CheckBoxDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="CheckBoxDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CheckBoxPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="CheckBoxForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CheckBoxDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CheckBoxGlyphFill" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CheckBoxGlyphDisabledFill" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CheckBoxDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="CheckBoxDefaultBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CheckBoxPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CheckBoxPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CheckBoxPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CheckBoxPressedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CheckBoxCheckedDefaultBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CheckBoxCheckedDefaultBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CheckBoxCheckedPointeroverBackground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CheckBoxCheckedPointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CheckBoxCheckedPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CheckBoxCheckedPressedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CheckBoxDefaultDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="CheckBoxDefaultDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CheckBoxCheckedDisabledBackground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CheckBoxCheckedDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CheckBoxCardCheckedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CheckBoxCardCheckedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CheckBoxCardCheckedDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CheckBoxCardPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CheckBoxCardPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="CheckBoxCardCheckedPointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CheckBoxCardCheckedPressedBorderBrush" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ComboBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/ComboBox.axaml
index bd83982..af69299 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/ComboBox.axaml
@@ -1,39 +1,33 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ComboBoxSelectorBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxIconFocusForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="ComboBoxDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Color="{StaticResource ButtonTextColor}" />
-
-    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="ComboBoxItemBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemFocusBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="ComboBoxSelectorBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ComboBoxSelectorPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ComboBoxSelectorFocusBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ComboBoxSelectorPressedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ComboBoxSelectorDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ComboBoxSelectorDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ComboBoxSelectorBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ComboBoxSelectorPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ComboBoxSelectorFocusBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ComboBoxSelectorPressedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ComboBoxIconDefaultForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ComboBoxIconPointeroverForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ComboBoxIconFocusForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ComboBoxIconPressedForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ComboBoxIconDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ComboBoxDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ComboBoxPopupBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ComboBoxPopupBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ComboBoxItemPointeroverForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ComboBoxItemPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ComboBoxItemFocusForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ComboBoxItemFocusBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ComboBoxItemPressedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ComboBoxItemPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ComboBoxItemSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ComboBoxItemSelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ComboBoxItemSelectedPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ComboBoxItemDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ComboBoxItemSelectedDisabledBackground" ResourceKey="SemiColorWindow" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml
index 2ad6df5..5eb7245 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml
@@ -1,28 +1,22 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="DateTimePickerPopupBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Color="{StaticResource WindowColor}" />
-
-    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Color="{StaticResource WindowTextColor}" />
-
-
-    <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="DateTimePickerButtonBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="DateTimePickerIconForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="DateTimePickerListItemBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="DateTimePickerPopupBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="DateTimePickerPopupBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPressedForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="DateTimePickerFlyoutButtonPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="DateTimePickerSeparatorBackground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="DateTimePickerButtonBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="DateTimePickerButtonBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="DateTimePickerButtonForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="DateTimePickerIconForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="DateTimePickerEmptyForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="DateTimePickerButtonPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="DateTimePickerButtonPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="DateTimePickerButtonDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="DateTimePickerButtonDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="DateTimePickerButtonDisabledIconForeground" ResourceKey="SemiColorGrayText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Expander.axaml b/src/Semi.Avalonia/Themes/HighContrast/Expander.axaml
index 6b50395..d662925 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/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" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ExpanderContentForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="ExpanderSeparatorBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ExpanderHeaderForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ExpanderHeaderDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ExpanderHeaderDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ExpanderHeaderHoverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ExpanderHeaderPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ExpanderContentForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Flyout.axaml b/src/Semi.Avalonia/Themes/HighContrast/Flyout.axaml
index 85cf63b..b1d64a9 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Flyout.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="FlyoutBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="FlyoutForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="FlyoutBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="FlyoutBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="FlyoutForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="FlyoutBorderBrush" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/GridSplitter.axaml b/src/Semi.Avalonia/Themes/HighContrast/GridSplitter.axaml
index c452ddc..82476c9 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/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" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="{StaticResource HotlightColor}" />
+    <StaticResource x:Key="GridSplitterBackground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="GridSplitterPreviewBackground" ResourceKey="SemiColorHotlight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml
index de0dd5e..1b069c0 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="HeaderedContentControlBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="HeaderedContentControlBorderBrush" Color="{StaticResource WindowTextColor}" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="HeaderedContentControlBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="HeaderedContentControlBorderBrush" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
index a1ce552..2639aa5 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="HyperlinkButtonPointeroverForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="HyperlinkButtonPressedForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="HyperlinkButtonForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="HyperlinkButtonPointeroverForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="HyperlinkButtonPressedForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="HyperlinkButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="HyperlinkButtonVisitedForeground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ListBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/ListBox.axaml
index 9b57b53..74e7060 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/ListBox.axaml
@@ -1,15 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- ListBox -->
-    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ListBoxItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Color="{StaticResource HighlightTextColor}" />
+    <StaticResource x:Key="ListBoxItemDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ListBoxItemDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ListBoxItemPointeroverForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ListBoxItemPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ListBoxItemPressedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ListBoxItemPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ListBoxItemSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ListBoxItemSelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ListBoxItemSelectedPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ListBoxItemDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ListBoxItemSelectedDisabledBackground" ResourceKey="SemiColorHighlightText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/HighContrast/ManagedFileChooser.axaml
index 5d95e4f..3ec3edf 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/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" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="ManagedFileChooserIconForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ManagedFileChooserTextForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Menu.axaml b/src/Semi.Avalonia/Themes/HighContrast/Menu.axaml
index c31acdb..45caa00 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Menu.axaml
@@ -1,24 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Color="{StaticResource WindowTextColor}" />
-
+    <StaticResource x:Key="MenuFlyoutScrollViewerIconForeground" ResourceKey="SemiColorWindowText" />
     <!--  MenuFlyout  -->
-    <SolidColorBrush x:Key="MenuFlyoutBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Color="{StaticResource WindowTextColor}" />
-
+    <StaticResource x:Key="MenuFlyoutBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="MenuFlyoutBorderBrush" ResourceKey="SemiColorWindowText" />
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="MenuItemForeground" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="MenuItemSeparatorBackground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="MenuItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="MenuItemPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="MenuItemPressedBackground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="MenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="MenuItemExpandIconOpenForeground" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="MenuItemDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="MenuItemDisabledExpandIconForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="MenuItemForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="MenuItemSeparatorBackground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="MenuItemPointeroverForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="MenuItemPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="MenuItemPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="MenuItemInputGestureTextForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="MenuItemExpandIconForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="MenuItemExpandIconOpenForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="MenuItemDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="MenuItemDisabledInputGestureTextForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="MenuItemDisabledExpandIconForeground" ResourceKey="SemiColorGrayText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml b/src/Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml
index 137082b..3a6cfa9 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml
@@ -1,8 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="NotificationCardBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="NotificationCardBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="NotificationCardTitleForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="NotificationCardMessageForeground" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="{StaticResource WindowColor}" />
-</ResourceDictionary>
+    <StaticResource x:Key="NotificationCardBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="NotificationCardBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="NotificationCardTitleForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="NotificationCardMessageForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="NotificationCardLightBackground" ResourceKey="SemiColorWindow" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml b/src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml
index a50d3f2..f870f09 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ProgressBarBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ProgressBarRootBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/RadioButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/RadioButton.axaml
index 2d38f7b..a3ff0a7 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/RadioButton.axaml
@@ -1,49 +1,41 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- RadioButton -->
-    <SolidColorBrush x:Key="RadioButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Color="{StaticResource WindowColor}" />
-
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-
-
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="RadioButtonForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="RadioButtonDefaultBorderBrush" Color="{StaticResource WindowTextColor}" />
-
+    <StaticResource x:Key="RadioButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="RadioButtonUncheckIconDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="RadioButtonUncheckIconPointeroverBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="RadioButtonUncheckIconPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="RadioButtonUncheckIconDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="RadioButtonUncheckIconDefaultBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="RadioButtonUncheckIconPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="RadioButtonUncheckIconPressedBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="RadioButtonUncheckIconDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="RadioButtonCheckIconDefaultBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="RadioButtonCheckIconPointeroverBackground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="RadioButtonCheckIconPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="RadioButtonCheckIconDisabledBackground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="RadioButtonCheckIconDefaultBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="RadioButtonCheckIconPointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="RadioButtonCheckIconPressedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="RadioButtonCheckIconDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="RadioButtonDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="RadioButtonDefaultBorderBrush" ResourceKey="SemiColorWindowText" />
     <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.12" Color="White" />
-
     <!-- ButtonRadioButton -->
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
+    <StaticResource x:Key="RadioButtonButtonUncheckedForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedPointeroverBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="RadioButtonButtonUncheckedDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="RadioButtonButtonCheckedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="RadioButtonButtonCheckedForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="RadioButtonButtonCheckedDisabledForeground" ResourceKey="SemiColorGrayText" />
     <!-- CardRadioButton -->
-    <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="RadioButtonCardDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="RadioButtonCardDefaultBorderBrush" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="RadioButtonCardCheckedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="RadioButtonCardCheckDefaultBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="RadioButtonCardCheckPointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="RadioButtonCardCheckPressedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="RadioButtonCardUncheckPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="RadioButtonCardUncheckPressedBackground" ResourceKey="SemiColorWindow" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml
index ec07dd6..7d1e54a 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="RefreshVisualizerIconForeground" ResourceKey="SemiColorHighlight" />
     <SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/HighContrast/ScrollViewer.axaml
index 87f6eab..861cf33 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/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" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ScrollBarThumbForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ScrollBarButtonDefaultForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ScrollBarButtonPointeroverForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ScrollBarThumbForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ScrollBarThumbPointeroverForeground" ResourceKey="SemiColorHighlight" />
     <SolidColorBrush x:Key="ScrollBarBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Slider.axaml b/src/Semi.Avalonia/Themes/HighContrast/Slider.axaml
index 48ddf85..2b64641 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Slider.axaml
@@ -1,14 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SliderTrackForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="SliderTrackBackground" Color="{StaticResource HighlightTextColor}" />
-
-    <SolidColorBrush x:Key="SliderTickForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="SliderThumbBackground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="SliderTrackForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="SliderTrackBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="SliderTickForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="SliderThumbBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="SliderThumbPointeroverBorderBrush" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="SliderThumbPressedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="SliderTrackDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="SliderThumbDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="SliderTrackDisabledBackground" ResourceKey="SemiColorWindow" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/SplitView.axaml b/src/Semi.Avalonia/Themes/HighContrast/SplitView.axaml
index 2b37f50..085991a 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/SplitView.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/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" Color="{StaticResource HighlightTextColor}" />
+    <StaticResource x:Key="SplitViewSeparatorBackground" ResourceKey="SemiColorHighlightText" />
     <SolidColorBrush x:Key="SplitViewMaskBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="SplitViewPaneBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="SplitViewPaneBackground" ResourceKey="SemiColorWindow" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml b/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
index 706934d..8e8b0c3 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
@@ -1,11 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Line  -->
     <SolidColorBrush x:Key="TabItemLinePipeBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TabItemLinePipeSelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TabItemLinePipePressedBorderBrush" Color="{StaticResource HotlightColor}" />
-
-    <SolidColorBrush x:Key="TabItemLineHeaderForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="TabItemLinePipeSelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TabItemLinePipePointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TabItemLinePipePressedBorderBrush" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="TabItemLineHeaderForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TabItemLineHeaderPointeroverForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TabItemLineHeaderSelectedForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TextBlock.axaml b/src/Semi.Avalonia/Themes/HighContrast/TextBlock.axaml
index b01b4f4..8a07dcb 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/TextBlock.axaml
@@ -1,10 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="TextBlockDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="TextBlockCodeForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="TextBlockCodeBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="TextBlockSelectionBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TextBlockSelectionForeground" Color="{StaticResource HighlightTextColor}" />
+    <StaticResource x:Key="TextBlockDefaultForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TextBlockDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="TextBlockCodeForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TextBlockCodeBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="TextBlockCodeBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TextBlockSelectionBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TextBlockSelectionForeground" ResourceKey="SemiColorHighlightText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TextBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/TextBox.axaml
index b539b05..fa68573 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/TextBox.axaml
@@ -1,19 +1,16 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TextBoxTextCaretBrush" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="TextBoxDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="TextBoxPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TextBoxPressedBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TextBoxForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="TextBoxInnerForeground" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="TextBoxDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="TextBoxDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="{StaticResource HighlightTextColor}" />
+    <StaticResource x:Key="TextBoxTextCaretBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TextBoxDefaultBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="TextBoxDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="TextBoxPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="TextBoxPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TextBoxPressedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="TextBoxFocusBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TextBoxForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TextBoxInnerForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TextBoxDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="TextBoxDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="TextBoxDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="TextBoxSelectionBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TextBoxSelectionForeground" ResourceKey="SemiColorHighlightText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml
index d652742..d4c78bf 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml
@@ -1,32 +1,30 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledForeground" Color="{StaticResource WindowColor}" />
-
-    <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ToggleButtonDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonDefaultPointeroverBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ToggleButtonDefaultPressedBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ToggleButtonDefaultDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ToggleButtonDefaultDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ToggleButtonCheckedDisabledForeground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonDefaultBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ToggleButtonDefaultPrimaryForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedBackground" ResourceKey="SemiColorHighlight" />
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleButtonSuccessCheckedPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPressedBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledBackground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPressedForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonSecondaryCheckedPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonTertiaryCheckedPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonSuccessCheckedPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonWarningCheckedPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonDangerCheckedPressedBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonPrimaryCheckedPressedBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ToggleButtonCheckedForeground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleButtonCheckedDisabledBackground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminateBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ToggleButtonIndeterminateDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml
index 311b49c..6cee639 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml
@@ -1,18 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToggleSwitchDefaultBorderBrush" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="{StaticResource WindowColor}" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="SimpleToggleSwitchContainerUnCheckedForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="SimpleToggleSwitchContainerCheckedForeground" Color="{StaticResource HighlightTextColor}" />
+    <StaticResource x:Key="ToggleSwitchDefaultBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedDefaultBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedPointeroverBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ToggleSwitchContainerCheckedDisabledBackground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="SimpleToggleSwitchContainerUnCheckedForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="SimpleToggleSwitchContainerCheckedForeground" ResourceKey="SemiColorHighlightText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml b/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
index ec8ebf8..adecc70 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToolTipBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToolTipForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ToolTipBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="ToolTipBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ToolTipForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ToolTipBorderBrush" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TreeView.axaml b/src/Semi.Avalonia/Themes/HighContrast/TreeView.axaml
index f86f697..ed2c1af 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/TreeView.axaml
@@ -1,15 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="TreeViewItemDefaultForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TreeViewItemIconDefaultForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="TreeViewItemIconHoverForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="TreeViewItemDisabledForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="TreeViewItemDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="TreeViewItemPointeroverForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="TreeViewItemPointeroverBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="TreeViewItemPressedBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="TreeViewItemSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="TreeViewItemSelectedBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="TreeViewItemDisabledBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="TreeViewItemSelectedDisabledBackground" ResourceKey="SemiColorWindow" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Window.axaml b/src/Semi.Avalonia/Themes/HighContrast/Window.axaml
index 0288a75..fffbb2a 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Window.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/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="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="WindowDefaultForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
index a2583be..a32fc3d 100644
--- a/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
@@ -7,4 +7,12 @@
     <Color x:Key="HighlightColor">#8EE3F0</Color>
     <Color x:Key="ButtonTextColor">#FFFFFF</Color>
     <Color x:Key="ButtonFaceColor">#202020</Color>
+    <SolidColorBrush x:Key="SemiColorWindow" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="SemiColorWindowText" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHotlight" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SemiColorGrayText" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonText" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonFace" Color="{StaticResource ButtonFaceColor}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
index 80bd582..17e4d70 100644
--- a/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
@@ -7,4 +7,12 @@
     <Color x:Key="HighlightColor">#903909</Color>
     <Color x:Key="ButtonTextColor">#202020</Color>
     <Color x:Key="ButtonFaceColor">#FFFAEF</Color>
+    <SolidColorBrush x:Key="SemiColorWindow" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="SemiColorWindowText" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHotlight" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SemiColorGrayText" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonText" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonFace" Color="{StaticResource ButtonFaceColor}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
index 6474bdf..a4d252b 100644
--- a/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
@@ -7,4 +7,12 @@
     <Color x:Key="HighlightColor">#A1BFDE</Color>
     <Color x:Key="ButtonTextColor">#B6F6F0</Color>
     <Color x:Key="ButtonFaceColor">#2D3236</Color>
+    <SolidColorBrush x:Key="SemiColorWindow" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="SemiColorWindowText" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHotlight" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SemiColorGrayText" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonText" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonFace" Color="{StaticResource ButtonFaceColor}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml b/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
index a2c9c9c..e6068e1 100644
--- a/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
@@ -7,4 +7,12 @@
     <Color x:Key="HighlightColor">#D6B4FD</Color>
     <Color x:Key="ButtonTextColor">#FFEE32</Color>
     <Color x:Key="ButtonFaceColor">#000000</Color>
+    <SolidColorBrush x:Key="SemiColorWindow" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="SemiColorWindowText" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHotlight" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SemiColorGrayText" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonText" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonFace" Color="{StaticResource ButtonFaceColor}" />
 </ResourceDictionary>
\ No newline at end of file