diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml
index f7eed42..60681b9 100644
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml
@@ -323,70 +323,70 @@
     <SolidColorBrush x:Key="SemiGrey9" Color="{StaticResource SemiGrey9Color}" />
 
     <!--  Primary  -->
-    <SolidColorBrush x:Key="SemiColorPrimary" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="#FF0062D6" />
-    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="#FF004FB3" />
-    <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="#FF98CDFD" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLight" Color="#FFEAF5FF" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLightPointerover" Color="#FFCBE7FE" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLightActive" Color="#FF98CDFD" />
+    <SolidColorBrush x:Key="SemiColorPrimary" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="{StaticResource SemiBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLight" Color="{StaticResource SemiBlue0Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLightPointerover" Color="{StaticResource SemiBlue1Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLightActive" Color="{StaticResource SemiBlue2Color}" />
     <!--  Secondary  -->
-    <SolidColorBrush x:Key="SemiColorSecondary" Color="#FF0095EE" />
-    <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="#FF007BCA" />
-    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="#FF0063A7" />
-    <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="#FF95D8F8" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLight" Color="#FFE9F7FD" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Color="#FFC9ECFC" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Color="#FF95D8F8" />
+    <SolidColorBrush x:Key="SemiColorSecondary" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="{StaticResource SemiLightBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLight" Color="{StaticResource SemiLightBlue0Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Color="{StaticResource SemiLightBlue1Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Color="{StaticResource SemiLightBlue2Color}" />
     <!--  Tertiary  -->
-    <SolidColorBrush x:Key="SemiColorTertiary" Color="#FF6B7075" />
-    <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="#FF555B61" />
-    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="#FF41464C" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLight" Color="#FFF9F9F9" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Color="#FFE6E8EA" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLightActive" Color="#FFC6CACD" />
+    <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="{StaticResource SemiGrey6Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLight" Color="{StaticResource SemiGrey0Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLightActive" Color="{StaticResource SemiGrey2Color}" />
     <!--  Information  -->
-    <SolidColorBrush x:Key="SemiColorInformation" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="#FF0062D6" />
-    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="#FF004FB3" />
-    <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="#FF98CDFD" />
-    <SolidColorBrush x:Key="SemiColorInformationLight" Color="#FFEAF5FF" />
-    <SolidColorBrush x:Key="SemiColorInformationLightPointerover" Color="#FFCBE7FE" />
-    <SolidColorBrush x:Key="SemiColorInformationLightActive" Color="#FF98CDFD" />
+    <SolidColorBrush x:Key="SemiColorInformation" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="{StaticResource SemiBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLight" Color="{StaticResource SemiBlue0Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLightPointerover" Color="{StaticResource SemiBlue1Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLightActive" Color="{StaticResource SemiBlue2Color}" />
     <!--  Success  -->
-    <SolidColorBrush x:Key="SemiColorSuccess" Color="#FF3BB346" />
-    <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="#FF30953B" />
-    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="#FF25772F" />
-    <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="#FFA4E0A7" />
-    <SolidColorBrush x:Key="SemiColorSuccessLight" Color="#FFECF7EC" />
-    <SolidColorBrush x:Key="SemiColorSuccessLightPointerover" Color="#FFD0F0D1" />
-    <SolidColorBrush x:Key="SemiColorSuccessLightActive" Color="#FFA4E0A7" />
+    <SolidColorBrush x:Key="SemiColorSuccess" Color="{StaticResource SemiGreen5Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="{StaticResource SemiGreen6Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="{StaticResource SemiGreen2Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLight" Color="{StaticResource SemiGreen0Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLightPointerover" Color="{StaticResource SemiGreen1Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLightActive" Color="{StaticResource SemiGreen2Color}" />
     <!--  Warning  -->
-    <SolidColorBrush x:Key="SemiColorWarning" Color="#FFFC8800" />
-    <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="#FFD26700" />
-    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="#FFA84A00" />
-    <SolidColorBrush x:Key="SemiColorWarningLight" Color="#FFFFF8EA" />
-    <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Color="#FFFEEECC" />
-    <SolidColorBrush x:Key="SemiColorWarningLightActive" Color="#FFFED998" />
+    <SolidColorBrush x:Key="SemiColorWarning" Color="{StaticResource SemiOrange5Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="{StaticResource SemiOrange6Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLight" Color="{StaticResource SemiOrange0Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Color="{StaticResource SemiOrange1Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLightActive" Color="{StaticResource SemiOrange2Color}" />
     <!--  Danger  -->
-    <SolidColorBrush x:Key="SemiColorDanger" Color="#FFF93920" />
-    <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="#FFD52515" />
-    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="#FFB2140C" />
-    <SolidColorBrush x:Key="SemiColorDangerLight" Color="#FFFEF2ED" />
-    <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Color="#FFFEDDD2" />
-    <SolidColorBrush x:Key="SemiColorDangerLightActive" Color="#FFFDB7A5" />
+    <SolidColorBrush x:Key="SemiColorDanger" Color="{StaticResource SemiRed5Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="{StaticResource SemiRed6Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLight" Color="{StaticResource SemiRed0Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Color="{StaticResource SemiRed1Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLightActive" Color="{StaticResource SemiRed2Color}" />
 
     <!--  Text and Icons  -->
-    <SolidColorBrush x:Key="SemiColorText0" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="SemiColorText1" Opacity="0.8" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="SemiColorText2" Opacity="0.62" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="SemiColorText3" Opacity="0.35" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="SemiColorText0" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText1" Opacity="0.8" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText2" Opacity="0.62" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText3" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
 
     <!--  Link  -->
-    <SolidColorBrush x:Key="SemiColorLink" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="SemiColorLinkPointerover" Color="#FF0062D6" />
-    <SolidColorBrush x:Key="SemiColorLinkActive" Color="#FF004FB3" />
-    <SolidColorBrush x:Key="SemiColorLinkVisited" Color="#FF0077FA" />
+    <SolidColorBrush x:Key="SemiColorLink" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkActive" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkVisited" Color="{StaticResource SemiBlue5Color}" />
 
     <!--  Background  -->
     <SolidColorBrush x:Key="SemiColorBackground0" Color="White" />
@@ -396,16 +396,16 @@
     <SolidColorBrush x:Key="SemiColorBackground4" Color="White" />
 
     <!--  Fill  -->
-    <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="SemiColorFill1" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="SemiColorFill2" Opacity="0.13" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.05" Color="{StaticResource SemiGrey8Color}" />
+    <SolidColorBrush x:Key="SemiColorFill1" Opacity="0.09" Color="{StaticResource SemiGrey8Color}" />
+    <SolidColorBrush x:Key="SemiColorFill2" Opacity="0.13" Color="{StaticResource SemiGrey8Color}" />
 
     <!--  Border  -->
-    <SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="{StaticResource SemiGrey9Color}" />
 
     <!--  Disabled  -->
-    <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="#FFE6E8EA" />
-    <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="#FFE6E8EA" />
-    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.02" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.02" Color="{StaticResource SemiGrey8Color}" />
 </ResourceDictionary>