diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
index 5c2b5e9..b6dcc61 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
@@ -3,32 +3,31 @@
     <SolidColorBrush x:Key="BadgeForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="BadgeContentForeground" Color="White" />
     <!-- Solid -->
-    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#888D92" />
-    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#5DC264" />
-    <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#FC725A" />
+    <StaticResource x:Key="BadgePrimaryBadgeBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BadgeSecondaryBadgeBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="BadgeTertiaryBadgeBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="BadgeSuccessBadgeBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BadgeWarningBadgeBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BadgeDangerBadgeBackground" ResourceKey="SemiColorDanger" />
     <!-- Light -->
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#54A9FF" />
+    <StaticResource x:Key="BadgeLightPrimaryBadgeForeground" ResourceKey="SemiColorPrimary" />
     <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#053170" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#40B4F3" />
+    <StaticResource x:Key="BadgeLightSecondaryBadgeForeground" ResourceKey="SemiColorSecondary" />
     <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#003761" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#888D92" />
+    <StaticResource x:Key="BadgeLightTertiaryBadgeForeground" ResourceKey="SemiColorTertiary" />
     <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#5DC264" />
+    <StaticResource x:Key="BadgeLightSuccessBadgeForeground" ResourceKey="SemiColorSuccess" />
     <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#123C19" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FFAE43" />
+    <StaticResource x:Key="BadgeLightWarningBadgeForeground" ResourceKey="SemiColorWarning" />
     <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#551F03" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#FC725A" />
+    <StaticResource x:Key="BadgeLightDangerBadgeForeground" ResourceKey="SemiColorDanger" />
     <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#6C090B" />
     <!-- Inverted -->
     <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#FC725A" />
+    <StaticResource x:Key="BadgeInvertedPrimaryBadgeForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BadgeInvertedSecondaryBadgeForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="BadgeInvertedTertiaryBadgeForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="BadgeInvertedSuccessBadgeForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BadgeInvertedWarningBadgeForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BadgeInvertedDangerBadgeForeground" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml
index df3c2d8..aa219c7 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml
@@ -1,13 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="BannerInformationBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="BannerSuccessBackground" Opacity="0.2" Color="#5DC264" />
-    <SolidColorBrush x:Key="BannerSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="BannerWarningBackground" Opacity="0.2" Color="#FFAE43" />
-    <SolidColorBrush x:Key="BannerWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="BannerErrorBackground" Opacity="0.2" Color="#FC725A" />
-    <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#FC725A" />
-
-    <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.6" Color="#F9F9F9" />
+    <StaticResource x:Key="BannerInformationBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="BannerInformationBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BannerSuccessBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="BannerSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BannerWarningBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="BannerWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BannerErrorBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="BannerErrorBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="BannerCloseButtonForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Breadcrumb.axaml
index a2fc941..840f71c 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Breadcrumb.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="#54A9FF" />
+    <StaticResource x:Key="BreadcrumbItemForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="BreadcrumbItemSeparatorForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="BreadcrumbItemLastForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="BreadcrumbItemPointeroverForeground" ResourceKey="SemiColorPrimary" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml
index 8f697c9..e5cd78f 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml
@@ -1,80 +1,62 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="ButtonGroupSeparatorForeground" ResourceKey="SemiColorBorder" />
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultTertiaryForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultSuccessForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDangerForeground" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="ButtonGroupDefaultBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Opacity="0.20" Color="White" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-
+    <StaticResource x:Key="ButtonGroupDefaultPrimaryForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonGroupDefaultSecondaryForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonGroupDefaultTertiaryForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonGroupDefaultSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonGroupDefaultWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonGroupDefaultDangerForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonGroupDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ButtonGroupDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ButtonGroupDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ButtonGroupDefaultPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="ButtonGroupDefaultDisabledBackground" ResourceKey="SemiColorDisabledFill" />
     <SolidColorBrush x:Key="ButtonGroupDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonGroupDefaultPressedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="Transparent" />
-
     <!--  end Light  -->
-
     <!--  Solid  -->
     <SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="White" />
     <SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="Gray" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPointeroverBackground" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPressedBackground" Color="#9DDCF9" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryBackground" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPointeroverBackground" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPressedBackground" Color="#C6CACD" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessBackground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPointeroverBackground" Color="#7FD184" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPressedBackground" Color="#A6E1A8" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningBackground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPointeroverBackground" Color="#FFC772" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPressedBackground" Color="#FFDDA1" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerBackground" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPointeroverBackground" Color="#FD9983" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPressedBackground" Color="#FDBEAC" />
-
+    <StaticResource x:Key="ButtonGroupSolidPrimaryBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryPointeroverBackground" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryPressedBackground" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryPointeroverBackground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryPressedBackground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessPressedBackground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ButtonGroupSolidWarningBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonGroupSolidWarningPointeroverBackground" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidWarningPressedBackground" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ButtonGroupSolidDangerBackground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonGroupSolidDangerPointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidDangerPressedBackground" ResourceKey="SemiColorDangerActive" />
     <SolidColorBrush x:Key="ButtonGroupSolidDisabledBackground" Color="Gray" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryBorderBrush" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPointeroverBorderBrush" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPressedBorderBrush" Color="#9DDCF9" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryBorderBrush" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPointeroverBorderBrush" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPressedBorderBrush" Color="#C6CACD" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPointeroverBorderBrush" Color="#7FD184" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPressedBorderBrush" Color="#A6E1A8" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPointeroverBorderBrush" Color="#FFC772" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPressedBorderBrush" Color="#FFDDA1" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerBorderBrush" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPointeroverBorderBrush" Color="#FD9983" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPressedBorderBrush" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="#2E3238" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryBorderBrush" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryPointeroverBorderBrush" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryPressedBorderBrush" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryBorderBrush" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryPointeroverBorderBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryPressedBorderBrush" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessPointeroverBorderBrush" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessPressedBorderBrush" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ButtonGroupSolidWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonGroupSolidWarningPointeroverBorderBrush" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidWarningPressedBorderBrush" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ButtonGroupSolidDangerBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonGroupSolidDangerPointeroverBorderBrush" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidDangerPressedBorderBrush" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ButtonGroupSolidDisabledBorderBrush" ResourceKey="SemiColorDisabledBackground" />
     <!--  end Solid  -->
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml
index d081ae9..8a8052b 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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="#A7ABB0" />
-    <SolidColorBrush x:Key="ClockHourTickForeground" Color="#A7ABB0" />
+    <StaticResource x:Key="ClockHandBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ClockHourTickForeground" ResourceKey="SemiColorTertiaryPointerover" />
     <SolidColorBrush x:Key="ClockMinuteTickForeground" Color="#6B7075" />
     <SolidColorBrush x:Key="ClockArborFill" Color="White" />
-    <SolidColorBrush x:Key="ClockArborStroke" Color="#54A9FF" />
+    <StaticResource x:Key="ClockArborStroke" ResourceKey="SemiColorPrimary" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
index 2466dba..14a6144 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
@@ -2,41 +2,35 @@
     <!--CalenderDayButton-->
     <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayTodayBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CalenderDayPressedBackground" Opacity="0.16" Color="White" />
-
-    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="#54A9FF" />
+    <StaticResource x:Key="CalenderDayInRangeBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="CalenderDayTodayBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalenderDayTodayForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderDayNotCurrentMonthForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalenderDayPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalenderDayPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalenderDaySelectedBackground" ResourceKey="SemiColorPrimary" />
     <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="CalendarDayInRangeForeground" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Opacity="0.3" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Opacity="0.4" Color="#54A9FF" />
-
-    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="#135CB8" />
-
+    <StaticResource x:Key="CalenderDaySelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CalenderDaySelectedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CalendarDayInRangeForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalenderDayStartEndDateBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderDayStartEndDateBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderDayStartEndDatePointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CalenderDayStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CalenderDayStartEndDateInRangeBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CalenderDayPreviewStartEndDateBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <StaticResource x:Key="CalenderDayPreviewStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+    <StaticResource x:Key="CalenderDayBlackoutForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalenderDayBlackoutBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="CalenderDayBlackoutTodayBackground" ResourceKey="SemiColorPrimaryDisabled" />
     <!--CalenderYearButton-->
     <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CalenderYearPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="#54A9FF" />
+    <StaticResource x:Key="CalenderYearPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalenderYearPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalenderYearSelectedBackground" ResourceKey="SemiColorPrimary" />
     <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="#7FC1FF" />
-
+    <StaticResource x:Key="CalenderYearSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
     <!--CalenderView-->
     <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
index a2ecc75..9074ccb 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Opacity="0.6" Color="#16161A" />
+    <StaticResource x:Key="OverlayDialogMaskBrush" ResourceKey="SemiColorOverlayBackground" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Form.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Form.axaml
index d623760..1951592 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Form.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="FormAsteriskForeground" Color="#FD9983" />
+    <StaticResource x:Key="FormGroupForeground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="FormAsteriskForeground" ResourceKey="SemiColorDangerPointerover" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Loading.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Loading.axaml
index d15f01a..3141469 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Loading.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Loading.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="LoadingIconForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="LoadingMaskBackground" Opacity="0.12" Color="White" />
+    <StaticResource x:Key="LoadingIconForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="LoadingMaskBackground" ResourceKey="SemiColorFill0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
index b152545..ab424ef 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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" Opacity="0.62" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="NavigationMenuItemExpandIconForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="NavigationMenuItemSeparatorBorderForeground" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml b/src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml
index 8b9cb1d..a10f618 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml
@@ -1,14 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <BoxShadows x:Key="NotificationCardBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
-    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="#16161A" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBackground" Opacity="0.2" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBackground" Opacity="0.2" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBorderBrush" Color="#FC725A" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBackground" Opacity="0.2" Color="#FC725A" />
-
-    <SolidColorBrush x:Key="NotificationCardCloseButtonForeground" Opacity="0.8" Color="#F9F9F9" />
+    <StaticResource x:Key="NotificationCardLightBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="NotificationCardLightInformationBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="NotificationCardLightInformationBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="NotificationCardLightSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="NotificationCardLightSuccessBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="NotificationCardLightWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="NotificationCardLightWarningBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="NotificationCardLightErrorBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="NotificationCardLightErrorBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="NotificationCardCloseButtonForeground" ResourceKey="SemiColorText1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Pagination.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Pagination.axaml
index 4981c7a..10746eb 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Pagination.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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="#F9F9F9" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="PaginationButtonIconForeground" Opacity="0.6" Color="#F9F9F9" />
+    <StaticResource x:Key="PaginationButtonDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="PaginationButtonSelectedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="PaginationButtonIconForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="PaginationButtonDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="PaginationButtonPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="PaginationButtonPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedBackground" Opacity="0.2" Color="#54A9FF" />
+    <StaticResource x:Key="PaginationButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="PaginationButtonPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="PaginationButtonSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml b/src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml
index bc98383..3a34612 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="PopConfirmBackground">#43444A</SolidColorBrush>
-    <SolidColorBrush x:Key="PopConfirmBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="PopConfirmContentForeground" Opacity="0.6" Color="#F9F9F9" />
+    <StaticResource x:Key="PopConfirmBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="PopConfirmContentForeground" ResourceKey="SemiColorText2" />
     <BoxShadows x:Key="PopConfirmBorderBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml
index f0cc810..77a5044 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml
@@ -1,4 +1,4 @@
 <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" />
+    <StaticResource x:Key="RatingCharacterBackground" ResourceKey="SemiColorFill0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
index ac01ba0..8158162 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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" Opacity="0.15" Color="#888D92" />
+    <StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorTertiary" />
     <SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="ClosableTagBorder" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
index 6d61419..68b52e4 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TimelineHeaderForeground" Color="#F9F9F9" />
+    <StaticResource x:Key="TimelineHeaderForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.20" Color="White" />
-    <SolidColorBrush x:Key="OngoingTimelineIconForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="SuccessTimelineIconForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="WarningTimelineIconForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ErrorTimelineIconForeground" Color="#FC725A" />
+    <StaticResource x:Key="OngoingTimelineIconForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="SuccessTimelineIconForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="WarningTimelineIconForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ErrorTimelineIconForeground" ResourceKey="SemiColorDanger" />
     <SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.20" Color="White" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml
index a9efda6..36c66da 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml
@@ -1,4 +1,4 @@
 <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" />
+    <StaticResource x:Key="ToastCardContentForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ToastCardBackground" ResourceKey="SemiColorBackground3" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/ToolBar.axaml b/src/Ursa.Themes.Semi/Themes/Dark/ToolBar.axaml
index b2dce3c..85ddccc 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/ToolBar.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ToolBarSeparatorForeground" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="ToolBarHeaderForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ToolBarSeparatorForeground" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TwoTonePathIcon.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TwoTonePathIcon.axaml
index 11a78c2..f31f22c 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/TwoTonePathIcon.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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="#135CB8" />
-    <SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="#7FC1FF" />
+    <StaticResource x:Key="TwoTonePathIconForeground" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="TwoTonePathIconStrokeBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="TwoTonePathIconActiveForeground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="TwoTonePathIconActiveStrokeBrush" ResourceKey="SemiColorPrimaryPointerover" />
 </ResourceDictionary>
\ No newline at end of file