diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
index a4c3928..d0d1eed 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
@@ -7,6 +7,14 @@
     <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.MergedDictionaries>
         <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml
index e86884f..5bdd2df 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="BadgeBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="BadgeForeground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="BadgeContentForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="BadgeBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="BadgeForeground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="BadgeContentForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="BadgePrimaryBadgeBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="BadgeLightPrimaryBadgeForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="BadgeInvertedBadgeBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="BadgeInvertedPrimaryBadgeForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml
index 4a2fb13..9eeabfa 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="BannerInformationBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="BannerBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="BannerCloseButtonForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="BannerInformationBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="BannerBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="BannerInformationBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="BannerCloseButtonForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml
index a502c70..e9fd595 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="BreadcrumbItemForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="BreadcrumbItemForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="BreadcrumbItemSeparatorForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="BreadcrumbItemLastForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="BreadcrumbItemPointeroverForeground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml
index b067d2b..6756a01 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml
@@ -1,32 +1,32 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="ButtonGroupSeparatorForeground" ResourceKey="SemiColorButtonText" />
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonGroupDefaultPrimaryForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonGroupDefaultDisabledForeground" ResourceKey="SemiColorGrayText" />
 
-    <SolidColorBrush x:Key="ButtonGroupDefaultBackground" Color="{StaticResource ButtonFaceColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonGroupDefaultBackground" ResourceKey="ButtonFaceColor" />
+    <StaticResource x:Key="ButtonGroupDefaultPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonGroupDefaultPressedBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="ButtonGroupDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonGroupDefaultBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonGroupDefaultPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
     <SolidColorBrush x:Key="ButtonGroupDefaultPressedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonGroupDefaultDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
 
     <!--  end Light  -->
 
     <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonGroupSolidForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ButtonGroupSolidDisabledForeground" ResourceKey="SemiColorGrayText" />
 
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBackground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonGroupSolidDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
     <!--  end Solid  -->
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml
index 9964dec..1ee355a 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ClockHandBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ClockHourTickForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ClockMinuteTickForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ClockArborFill" Color="{StaticResource ButtonFaceColor}" />
-    <SolidColorBrush x:Key="ClockArborStroke" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="ClockHandBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ClockHourTickForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ClockArborFill" ResourceKey="SemiColorButtonFace" />
+    <StaticResource x:Key="ClockArborStroke" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml
index 51845d8..1c8bd46 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml
@@ -2,40 +2,40 @@
     <!--CalenderDayButton-->
     <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayTodayBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayPressedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="CalenderDayInRangeBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="CalenderDayTodayBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayTodayForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CalenderDayNotCurrentMonthForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CalenderDayPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayPressedBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalendarDayInRangeForeground" Color="{StaticResource HighlightTextColor}" />
+    <StaticResource x:Key="CalenderDaySelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDaySelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalenderDaySelectedPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDaySelectedPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalendarDayInRangeForeground" ResourceKey="SemiColorHighlightText" />
 
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="CalenderDayStartEndDateBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayStartEndDateBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayStartEndDatePointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayStartEndDatePressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayStartEndDateInRangeBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="CalenderDayPreviewStartEndDateBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayPreviewStartEndDatePressedBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="CalenderDayBlackoutForeground" ResourceKey="SemiColorGrayText" />
     <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="Transparent" />
 
     <!--CalenderYearButton-->
     <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderYearPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="CalenderYearPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderYearPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderYearSelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderYearSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalenderYearSelectedPointeroverBackground" ResourceKey="SemiColorHighlight" />
 
     <!--CalenderView-->
     <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
index 3a662fa..d92bca2 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
@@ -7,6 +7,14 @@
     <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.MergedDictionaries>
         <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml
index 91f95aa..a1be7c9 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="DividerBorderBrush" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
index f37ecc6..258df24 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
@@ -7,6 +7,14 @@
     <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.MergedDictionaries>
         <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml
index 9387701..cdb4f34 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="FormGroupForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="FormAsteriskForeground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="FormGroupForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="FormAsteriskForeground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml
index 4fc4b82..cfb8af3 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="NavigationMenuItemExpandIconForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="NavigationMenuItemSeparatorBorderForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml
index 5af4c67..46f00b9 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml
@@ -7,6 +7,14 @@
     <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.MergedDictionaries>
         <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml
index c6433f5..d86c4b9 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="PaginationButtonDefaultForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="PaginationButtonIconForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="PaginationButtonDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="PaginationButtonPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="PaginationButtonPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="PaginationButtonDefaultForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="PaginationButtonSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="PaginationButtonIconForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="PaginationButtonDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="PaginationButtonPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="PaginationButtonPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="PaginationButtonSelectedBackground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Rating.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Rating.axaml
deleted file mode 100644
index f0cc810..0000000
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Rating.axaml
+++ /dev/null
@@ -1,4 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="RatingCharacterForeground" Color="#FDDE43" />
-    <SolidColorBrush x:Key="RatingCharacterBackground" Opacity="0.12" Color="White" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml
index 7cd2633..da0ebfd 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="SelectionListIndicatorBackground" ResourceKey="SemiColorWindow" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml
index eeb5026..77296d4 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ClosableTagBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ClosableTagForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ClosableTagBorder" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ClosableTagBorder" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml
index c0b97ab..9f7be5f 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TimelineHeaderForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="TimelineHeaderForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Toast.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Toast.axaml
deleted file mode 100644
index ef28a3c..0000000
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Toast.axaml
+++ /dev/null
@@ -1,5 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToastCardContentForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ToastCardBackground" Color="#43444A" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml
index b45e564..f373439 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToolBarHeaderForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ToolBarSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="ToolBarHeaderForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ToolBarSeparatorForeground" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml
index 2bf0a45..c759256 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TwoTonePathIconForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="TwoTonePathIconForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TwoTonePathIconStrokeBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="TwoTonePathIconActiveForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="TwoTonePathIconActiveStrokeBrush" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml
index 63b3df6..2014115 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml
@@ -13,7 +13,6 @@
         <ResourceInclude Source="SelectionList.axaml" />
         <ResourceInclude Source="TagInput.axaml" />
         <ResourceInclude Source="Timeline.axaml" />
-        <ResourceInclude Source="Toast.axaml" />
         <ResourceInclude Source="ToolBar.axaml" />
         <ResourceInclude Source="TwoTonePathIcon.axaml" />
     </ResourceDictionary.MergedDictionaries>