From 609d0f23afd4f8169408b31ea878522d74b3efbc Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 30 Apr 2025 13:28:46 +0800
Subject: [PATCH] feat: replace Light folder.

---
 .../Themes/Dark/TagInput.axaml                |   6 +-
 .../Themes/Light/Avatar.axaml                 |  34 ++---
 src/Ursa.Themes.Semi/Themes/Light/Badge.axaml |  49 ++++----
 .../Themes/Light/Banner.axaml                 |  19 ++-
 .../Themes/Light/Breadcrumb.axaml             |   8 +-
 .../Themes/Light/ButtonGroup.axaml            | 119 ++++++++----------
 src/Ursa.Themes.Semi/Themes/Light/Clock.axaml |  10 +-
 .../Themes/Light/DatePicker.axaml             |  58 ++++-----
 .../Themes/Light/Dialog.axaml                 |   2 +-
 .../Themes/Light/Divider.axaml                |   2 +-
 .../Themes/Light/DualBadge.axaml              |   6 +-
 src/Ursa.Themes.Semi/Themes/Light/Form.axaml  |   4 +-
 .../Themes/Light/Loading.axaml                |   4 +-
 .../Themes/Light/NavigationMenu.axaml         |   4 +-
 .../Themes/Light/NotificationShared.axaml     |  26 ++--
 .../Themes/Light/Pagination.axaml             |  12 +-
 .../Themes/Light/PopConfirm.axaml             |   8 +-
 .../Themes/Light/Rating.axaml                 |   4 +-
 .../Themes/Light/SelectionList.axaml          |   5 +-
 .../Themes/Light/TagInput.axaml               |   6 +-
 .../Themes/Light/Timeline.axaml               |  14 +--
 src/Ursa.Themes.Semi/Themes/Light/Toast.axaml |   7 +-
 .../Themes/Light/ToolBar.axaml                |   4 +-
 .../Themes/Light/TwoTonePathIcon.axaml        |   8 +-
 24 files changed, 193 insertions(+), 226 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
index 4a6482a..1f1e54d 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">
-    <StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorTertiary" />
-    <StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiGrey8" />
-    <StaticResource x:Key="ClosableTagBorder" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorBackground4" />
+    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Avatar.axaml b/src/Ursa.Themes.Semi/Themes/Light/Avatar.axaml
index 9080891..acf2611 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Avatar.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Avatar.axaml
@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AvatarForeground" Color="White" />
-    <SolidColorBrush x:Key="AvatarRedBackground" Color="#FB9078" />
-    <SolidColorBrush x:Key="AvatarPinkBackground" Color="#F27396" />
-    <SolidColorBrush x:Key="AvatarPurpleBackground" Color="#C96FD1" />
-    <SolidColorBrush x:Key="AvatarVioletBackground" Color="#A67FDD" />
-    <SolidColorBrush x:Key="AvatarIndigoBackground" Color="#8090D3" />
-    <SolidColorBrush x:Key="AvatarBlueBackground" Color="#65B2FC" />
-    <SolidColorBrush x:Key="AvatarLightBlueBackground" Color="#62C3F5" />
-    <SolidColorBrush x:Key="AvatarCyanBackground" Color="#58CBD3" />
-    <SolidColorBrush x:Key="AvatarTealBackground" Color="#54D1C1" />
-    <SolidColorBrush x:Key="AvatarGreenBackground" Color="#7DD182" />
-    <SolidColorBrush x:Key="AvatarLightGreenBackground" Color="#ADD37E" />
-    <SolidColorBrush x:Key="AvatarLimeBackground" Color="#B7E35B" />
-    <SolidColorBrush x:Key="AvatarYellowBackground" Color="#FCE865" />
-    <SolidColorBrush x:Key="AvatarAmberBackground" Color="#F6D86F" />
-    <SolidColorBrush x:Key="AvatarOrangeBackground" Color="#FDC165" />
-    <SolidColorBrush x:Key="AvatarGreyBackground" Color="#A7ABB0" />
+    <StaticResource x:Key="AvatarForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="AvatarRedBackground" ResourceKey="SemiRed3" />
+    <StaticResource x:Key="AvatarPinkBackground" ResourceKey="SemiPink3" />
+    <StaticResource x:Key="AvatarPurpleBackground" ResourceKey="SemiPurple3" />
+    <StaticResource x:Key="AvatarVioletBackground" ResourceKey="SemiViolet3" />
+    <StaticResource x:Key="AvatarIndigoBackground" ResourceKey="SemiIndigo3" />
+    <StaticResource x:Key="AvatarBlueBackground" ResourceKey="SemiBlue3" />
+    <StaticResource x:Key="AvatarLightBlueBackground" ResourceKey="SemiLightBlue3" />
+    <StaticResource x:Key="AvatarCyanBackground" ResourceKey="SemiCyan3" />
+    <StaticResource x:Key="AvatarTealBackground" ResourceKey="SemiTeal3" />
+    <StaticResource x:Key="AvatarGreenBackground" ResourceKey="SemiGreen3" />
+    <StaticResource x:Key="AvatarLightGreenBackground" ResourceKey="SemiLightGreen3" />
+    <StaticResource x:Key="AvatarLimeBackground" ResourceKey="SemiLime3" />
+    <StaticResource x:Key="AvatarYellowBackground" ResourceKey="SemiYellow3" />
+    <StaticResource x:Key="AvatarAmberBackground" ResourceKey="SemiAmber3" />
+    <StaticResource x:Key="AvatarOrangeBackground" ResourceKey="SemiOrange3" />
+    <StaticResource x:Key="AvatarGreyBackground" ResourceKey="SemiGrey3" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
index 82b4001..e6b144f 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
@@ -3,32 +3,31 @@
     <SolidColorBrush x:Key="BadgeForeground" Color="White" />
     <SolidColorBrush x:Key="BadgeContentForeground" Color="#1C1F23" />
     <!-- Solid -->
-    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#0095EE" />
-    <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#6B7075" />
-    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#3BB346" />
-    <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FC8800" />
-    <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#F93920" />
+    <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="#0077FA" />
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#E9F7FD" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#FEF2ED" />
+    <StaticResource x:Key="BadgeLightPrimaryBadgeForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BadgeLightPrimaryBadgeBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="BadgeLightSecondaryBadgeForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="BadgeLightSecondaryBadgeBackground" ResourceKey="SemiColorSecondaryLight" />
+    <StaticResource x:Key="BadgeLightTertiaryBadgeForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="BadgeLightTertiaryBadgeBackground" ResourceKey="SemiColorTertiaryLight" />
+    <StaticResource x:Key="BadgeLightSuccessBadgeForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BadgeLightSuccessBadgeBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="BadgeLightWarningBadgeForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BadgeLightWarningBadgeBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="BadgeLightDangerBadgeForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="BadgeLightDangerBadgeBackground" ResourceKey="SemiColorDangerLight" />
     <!-- Inverted -->
     <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="White" />
-
-    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#F93920" />
+    <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/Light/Banner.axaml b/src/Ursa.Themes.Semi/Themes/Light/Banner.axaml
index 7295d06..aa219c7 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="BannerSuccessBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="BannerSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="BannerWarningBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="BannerWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="BannerErrorBackground" Color="#FEF2ED" />
-    <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#F93920" />
-
-    <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.62" Color="#1C1F23" />
+    <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/Light/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Themes/Light/Breadcrumb.axaml
index 8a519e3..840f71c 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Breadcrumb.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="#0077FA" />
+    <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/Light/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Themes/Light/ButtonGroup.axaml
index d8e9122..9f42474 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/ButtonGroup.axaml
@@ -1,80 +1,59 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="ButtonGroupSeparatorForeground" ResourceKey="SemiColorBorder" />
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultSecondaryForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultTertiaryForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultSuccessForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDangerForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Opacity="0.35" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="ButtonGroupDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBackground" 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="#0077FA" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="#004FB3" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryBackground" Color="#0095EE" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPointeroverBackground" Color="#007BCA" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPressedBackground" Color="#0063A7" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryBackground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPointeroverBackground" Color="#555B61" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPressedBackground" Color="#41464C" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessBackground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPointeroverBackground" Color="#30953B" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPressedBackground" Color="#25772F" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningBackground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPointeroverBackground" Color="#D26700" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPressedBackground" Color="#A84A00" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerBackground" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPointeroverBackground" Color="#D52515" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPressedBackground" Color="#B2140C" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBackground" Color="Gray" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="#004FB3" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryBorderBrush" Color="#0095EE" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPointeroverBorderBrush" Color="#007BCA" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPressedBorderBrush" Color="#0063A7" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryBorderBrush" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPointeroverBorderBrush" Color="#555B61" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPressedBorderBrush" Color="#41464C" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPointeroverBorderBrush" Color="#30953B" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPressedBorderBrush" Color="#25772F" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPointeroverBorderBrush" Color="#D26700" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPressedBorderBrush" Color="#A84A00" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerBorderBrush" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPointeroverBorderBrush" Color="#D52515" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPressedBorderBrush" Color="#B2140C" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="Gray" />
+    <StaticResource x:Key="ButtonGroupSolidForeground" ResourceKey="SemiColorWhite" />
+    <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" />
+    <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" />
     <!--  end Solid  -->
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Clock.axaml b/src/Ursa.Themes.Semi/Themes/Light/Clock.axaml
index 583fd26..18bb75a 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Clock.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#555B61" />
-    <SolidColorBrush x:Key="ClockHourTickForeground" Color="#555B61" />
-    <SolidColorBrush x:Key="ClockMinuteTickForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="ClockArborFill" Color="White" />
-    <SolidColorBrush x:Key="ClockArborStroke" Color="#0077FA" />
+    <StaticResource x:Key="ClockHandBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ClockHourTickForeground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiGrey4" />
+    <StaticResource x:Key="ClockArborFill" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ClockArborStroke" ResourceKey="SemiColorPrimary" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
index b6f8002..38075ea 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
@@ -2,41 +2,35 @@
     <!--CalenderDayButton-->
     <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="CalenderDayTodayBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalenderDayPressedBackground" Opacity="0.09" Color="#2E3238" />
-
-    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="CalendarDayInRangeForeground" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="#004FB3" />
-
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="#CBE7FE" />
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="#98CDFD" />
-
-    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="#98CDFD" />
-
+    <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" />
+    <StaticResource x:Key="CalenderDaySelectedForeground" ResourceKey="SemiColorWhite" />
+    <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.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalenderYearPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="#0062D6" />
-
+    <StaticResource x:Key="CalenderYearPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalenderYearPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalenderYearSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderYearSelectedForeground" ResourceKey="SemiColorWhite" />
+    <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/Light/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
index a2ecc75..9074ccb 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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/Light/Divider.axaml b/src/Ursa.Themes.Semi/Themes/Light/Divider.axaml
index f1a72c6..37ff4b8 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Divider.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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" Opacity="0.2" Color="#1C1F23" />
+    <StaticResource x:Key="DividerBorderBrush" ResourceKey="SemiColorFill2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml
index 4919f48..18d9881 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DualBadgeDefaultIconForeground">White</SolidColorBrush>
-    <SolidColorBrush x:Key="DualBadgeDefaultHeaderForeground">White</SolidColorBrush>
-    <SolidColorBrush x:Key="DualBadgeDefaultForeground">White</SolidColorBrush>
+    <StaticResource x:Key="DualBadgeDefaultIconForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="DualBadgeDefaultHeaderForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="DualBadgeDefaultForeground" ResourceKey="SemiColorWhite" />
     <LinearGradientBrush x:Key="DualBadgeDefaultHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
         <GradientStop Color="#555B61" Offset="0" />
         <GradientStop Color="#41464C" Offset="1" />
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Form.axaml b/src/Ursa.Themes.Semi/Themes/Light/Form.axaml
index efe5ae8..1951592 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Form.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#1C1F23" />
-    <SolidColorBrush x:Key="FormAsteriskForeground" Color="#D52515" />
+    <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/Light/Loading.axaml b/src/Ursa.Themes.Semi/Themes/Light/Loading.axaml
index 7a85028..3141469 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Loading.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#0077FA" />
-    <SolidColorBrush x:Key="LoadingMaskBackground" Opacity="0.05" Color="#2E3238" />
+    <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/Light/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
index 3e047ca..ab424ef 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#1C1F23" />
-    <SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Opacity="0.08" Color="#1C1F23" />
+    <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/Light/NotificationShared.axaml b/src/Ursa.Themes.Semi/Themes/Light/NotificationShared.axaml
index 26f70c6..d5a2c84 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/NotificationShared.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/NotificationShared.axaml
@@ -1,15 +1,13 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
-    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="White" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBorderBrush" Color="#F93920" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBackground" Color="#FEF2ED" />
-
-    <SolidColorBrush x:Key="NotificationCardCloseButtonForeground" Opacity="0.8" Color="#1C1F23" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="NotificationCardBoxShadows" ResourceKey="SemiShadowElevated" />
+    <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/Light/Pagination.axaml b/src/Ursa.Themes.Semi/Themes/Light/Pagination.axaml
index 0ca9cc9..10746eb 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Pagination.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#1C1F23" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="PaginationButtonIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <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.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="PaginationButtonPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedBackground" Color="#EAF5FF" />
+    <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/Light/PopConfirm.axaml b/src/Ursa.Themes.Semi/Themes/Light/PopConfirm.axaml
index de092db..444a21e 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/PopConfirm.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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">White</SolidColorBrush>
-    <SolidColorBrush x:Key="PopConfirmBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <SolidColorBrush x:Key="PopConfirmContentForeground" Opacity="0.62" Color="#1C1F23" />
-    <BoxShadows x:Key="PopConfirmBorderBoxShadows">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
+    <StaticResource x:Key="PopConfirmBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="PopConfirmBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="PopConfirmContentForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="PopConfirmBorderBoxShadows" ResourceKey="SemiShadowElevated" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Rating.axaml b/src/Ursa.Themes.Semi/Themes/Light/Rating.axaml
index ddb703a..dcbbe13 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Rating.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#FAC800" />
-    <SolidColorBrush x:Key="RatingCharacterBackground" Opacity="0.05" Color="#2E3238" />
+    <StaticResource x:Key="RatingCharacterForeground" ResourceKey="SemiYellow5" />
+    <StaticResource x:Key="RatingCharacterBackground" ResourceKey="SemiColorFill0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml b/src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml
index 0fc6518..232122a 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml
@@ -1,4 +1,3 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="#CBE7FE" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="SelectionListIndicatorBackground" ResourceKey="SemiBlue1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Light/TagInput.axaml
index 2b90421..1f1e54d 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="White" />
-    <SolidColorBrush x:Key="ClosableTagForeground" Color="#2E3238" />
-    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="#1C1F23" />
+    <StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorBackground4" />
+    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Timeline.axaml b/src/Ursa.Themes.Semi/Themes/Light/Timeline.axaml
index 32bfada..ede09ca 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#1C1F23" />
-    <SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="OngoingTimelineIconForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="SuccessTimelineIconForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="WarningTimelineIconForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ErrorTimelineIconForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.13" Color="#2E3238" />
+    <StaticResource x:Key="TimelineHeaderForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DefaultTimelineIconForeground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="OngoingTimelineIconForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="SuccessTimelineIconForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="WarningTimelineIconForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ErrorTimelineIconForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="TimelineLineBrush" ResourceKey="SemiColorFill2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Toast.axaml b/src/Ursa.Themes.Semi/Themes/Light/Toast.axaml
index 1be95d0..36c66da 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Toast.axaml
@@ -1,5 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToastCardContentForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ToastCardBackground" Color="White" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <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/Light/ToolBar.axaml b/src/Ursa.Themes.Semi/Themes/Light/ToolBar.axaml
index e8953ed..85ddccc 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/ToolBar.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ToolBarSeparatorForeground" Opacity="0.08" Color="#1C1F23" />
+    <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/Light/TwoTonePathIcon.axaml b/src/Ursa.Themes.Semi/Themes/Light/TwoTonePathIcon.axaml
index f2f388c..f31f22c 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/TwoTonePathIcon.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#98CDFD" />
-    <SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="#0062D6" />
-    <SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="#0062D6" />
+    <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