From a7a677db3a2b31dddaa841ed090681e48d56a72f Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 2 Feb 2023 17:00:18 +0800
Subject: [PATCH] Button Color

---
 .../Themes/Dark/AutoCompleteBox.axaml         |  2 +-
 src/Semi.Avalonia/Themes/Dark/Button.axaml    | 62 +++++++++----------
 .../Themes/Dark/CalendarDatePicker.axaml      |  2 +-
 .../Themes/Dark/CaptionButtons.axaml          |  4 +-
 src/Semi.Avalonia/Themes/Dark/CheckBox.axaml  | 12 ++--
 src/Semi.Avalonia/Themes/Dark/ComboBox.axaml  |  2 +-
 .../Themes/Dark/DateTimePickerShared.axaml    |  2 +-
 src/Semi.Avalonia/Themes/Dark/Label.axaml     | 18 +++---
 .../Themes/Dark/NotificationCard.axaml        |  4 +-
 .../Themes/Dark/ProgressBar.axaml             |  4 +-
 .../Themes/Dark/RadioButton.axaml             | 16 ++---
 src/Semi.Avalonia/Themes/Dark/Slider.axaml    |  4 +-
 src/Semi.Avalonia/Themes/Dark/TextBlock.axaml |  4 +-
 src/Semi.Avalonia/Themes/Dark/TextBox.axaml   |  6 +-
 .../Themes/Dark/ToggleButton.axaml            | 58 ++++++++---------
 src/Semi.Avalonia/Themes/Dark/Tooltip.axaml   |  2 +-
 16 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
index 5b26f66..efad586 100644
--- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AutoCompleteBoxDefaultBorderBrush" Color="#C6CACD" />
+    <SolidColorBrush x:Key="AutoCompleteBoxDefaultBorderBrush" Color="#2E3238" />
     <SolidColorBrush x:Key="AutoCompleteBoxDefaultBackground" Color="Transparent" />
     <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1A000000</BoxShadows>
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="Black" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml
index 6994d61..94f7a16 100644
--- a/src/Semi.Avalonia/Themes/Dark/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml
@@ -17,10 +17,10 @@
     <!--  Light  -->
     <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonDefaultWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonDefaultDangerForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ButtonDefaultTertiaryForeground" Color="#888D92" />
+    <SolidColorBrush x:Key="ButtonDefaultWarningForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ButtonDefaultDangerForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Color="#2E3238" />
 
     <SolidColorBrush x:Key="ButtonDefaultBackground" Opacity="0.05" Color="#E6E8EA" />
     <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
@@ -35,50 +35,50 @@
     <!--  end Light  -->
 
     <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonSolidForeground" Color="White" />
+    <SolidColorBrush x:Key="ButtonSolidForeground" Color="Black" />
     <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Color="Gray" />
 
     <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="#A9D7FF" />
 
     <SolidColorBrush x:Key="ButtonSolidSecondaryBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBackground" Color="#007BCA" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBackground" Color="#0063A7" />
+    <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBackground" Color="#6EC8F6" />
+    <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBackground" Color="#9DDCF9" />
 
-    <SolidColorBrush x:Key="ButtonSolidTertiaryBackground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPointeroverBackground" Color="#555B61" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPressedBackground" Color="#41464C" />
+    <SolidColorBrush x:Key="ButtonSolidTertiaryBackground" Color="#888D92" />
+    <SolidColorBrush x:Key="ButtonSolidTertiaryPointeroverBackground" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="ButtonSolidTertiaryPressedBackground" Color="#C6CACD" />
 
-    <SolidColorBrush x:Key="ButtonSolidWarningBackground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPointeroverBackground" Color="#D26700" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPressedBackground" Color="#A84A00" />
+    <SolidColorBrush x:Key="ButtonSolidWarningBackground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ButtonSolidWarningPointeroverBackground" Color="#FFC772" />
+    <SolidColorBrush x:Key="ButtonSolidWarningPressedBackground" Color="#FFDDA1" />
 
-    <SolidColorBrush x:Key="ButtonSolidDangerBackground" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBackground" Color="#D52515" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPressedBackground" Color="#B2140C" />
+    <SolidColorBrush x:Key="ButtonSolidDangerBackground" Color="#FC725A" />
+    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBackground" Color="#FD9983" />
+    <SolidColorBrush x:Key="ButtonSolidDangerPressedBackground" Color="#FDBEAC" />
 
     <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="Gray" />
 
     <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="#A9D7FF" />
 
     <SolidColorBrush x:Key="ButtonSolidSecondaryBorderBrush" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBorderBrush" Color="#007BCA" />
-    <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBorderBrush" Color="#0063A7" />
+    <SolidColorBrush x:Key="ButtonSolidSecondaryPointeroverBorderBrush" Color="#6EC8F6" />
+    <SolidColorBrush x:Key="ButtonSolidSecondaryPressedBorderBrush" Color="#9DDCF9" />
 
-    <SolidColorBrush x:Key="ButtonSolidTertiaryBorderBrush" Color="#6B7075" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPointeroverBorderBrush" Color="#555B61" />
-    <SolidColorBrush x:Key="ButtonSolidTertiaryPressedBorderBrush" Color="#41464C" />
+    <SolidColorBrush x:Key="ButtonSolidTertiaryBorderBrush" Color="#888D92" />
+    <SolidColorBrush x:Key="ButtonSolidTertiaryPointeroverBorderBrush" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="ButtonSolidTertiaryPressedBorderBrush" Color="#C6CACD" />
 
-    <SolidColorBrush x:Key="ButtonSolidWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPointeroverBorderBrush" Color="#D26700" />
-    <SolidColorBrush x:Key="ButtonSolidWarningPressedBorderBrush" Color="#A84A00" />
+    <SolidColorBrush x:Key="ButtonSolidWarningBorderBrush" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ButtonSolidWarningPointeroverBorderBrush" Color="#FFC772" />
+    <SolidColorBrush x:Key="ButtonSolidWarningPressedBorderBrush" Color="#FFDDA1" />
 
-    <SolidColorBrush x:Key="ButtonSolidDangerBorderBrush" Color="#F93920" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#D52515" />
-    <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#B2140C" />
+    <SolidColorBrush x:Key="ButtonSolidDangerBorderBrush" Color="#FC725A" />
+    <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#FD9983" />
+    <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#FDBEAC" />
 
     <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Gray" />
     <!--  end Solid  -->
diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
index 6ae2492..3b21eef 100644
--- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -7,7 +7,7 @@
     <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="#C6CACD" />
     <Thickness x:Key="CalendarDatePickerBorderThickness">1</Thickness>
     <CornerRadius x:Key="CalendarDatePickerCornerRadius">3</CornerRadius>
-    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#A9D7FF" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBorderBrush" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
diff --git a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
index 10733d6..daf8f3d 100644
--- a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
@@ -8,7 +8,7 @@
     <PathGeometry x:Key="WindowCollapseGlyph">M19.5,3.09L15,7.59V4H13V11H20V9H16.41L20.91,4.5L19.5,3.09M4,13V15H7.59L3.09,19.5L4.5,20.91L9,16.41V20H11V13H4Z</PathGeometry>
     <SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Opacity="0.09" Color="#E6E8EA" />
     <SolidColorBrush x:Key="CaptionButtonPressedBackground" Opacity="0.13" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="#D52515" />
-    <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="#B2140C" />
+    <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="#FD9983" />
+    <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="#FDBEAC" />
     <SolidColorBrush x:Key="CaptionButtonForeground" Opacity="0.62" Color="#F9F9F9" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
index 77e869e..f6ef0cd 100644
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -12,15 +12,15 @@
     <SolidColorBrush x:Key="CheckboxDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CheckboxPointOverBackground" Opacity="0.05" Color="#E6E8EA" />
     <SolidColorBrush x:Key="CheckboxPointOverBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckboxPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="CheckboxPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="CheckboxPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CheckboxPressedBorderBrush" Color="#A9D7FF" />
 
     <SolidColorBrush x:Key="CheckboxCheckedDefaultBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="CheckboxCheckedDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckboxCheckedPointOverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="CheckboxCheckedPointOverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="CheckboxCheckedPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="CheckboxCheckedPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="CheckboxCheckedPointOverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CheckboxCheckedPressedBorderBrush" Color="#A9D7FF" />
 
     <SolidColorBrush x:Key="CheckboxDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="CheckboxDefaultDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 5c4a737..f69a574 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -5,7 +5,7 @@
     <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPointerOverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#A9D7FF" />
 
     <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
 
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index 2b54f84..4bc4466 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -29,7 +29,7 @@
     <SolidColorBrush x:Key="DateTimePickerIconForeground" Opacity="0.62" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#F9F9F9" />
 
-    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="#0062D6" />
+    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml
index 4f8d2b3..6ef848f 100644
--- a/src/Semi.Avalonia/Themes/Dark/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml
@@ -21,7 +21,7 @@
     <SolidColorBrush x:Key="LabelTagLightGreenForeground" Color="#1B5924" />
     <SolidColorBrush x:Key="LabelTagLightGreenBackground" Opacity="0.15" Color="#3BB346" />
     <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#6B7075" />
+    <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#888D92" />
     <SolidColorBrush x:Key="LabelTagLightIndigoForeground" Color="#1F2878" />
     <SolidColorBrush x:Key="LabelTagLightIndigoBackground" Opacity="0.15" Color="#3F51B5" />
     <SolidColorBrush x:Key="LabelTagLightLightBlueForeground" Color="#004B83" />
@@ -31,13 +31,13 @@
     <SolidColorBrush x:Key="LabelTagLightLimeForeground" Color="#9BD100" />
     <SolidColorBrush x:Key="LabelTagLightLimeBackground" Opacity="0.15" Color="#486800" />
     <SolidColorBrush x:Key="LabelTagLightOrangeForeground" Color="#7E3100" />
-    <SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="#FC8800" />
+    <SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="#FFAE43" />
     <SolidColorBrush x:Key="LabelTagLightPinkForeground" Color="#7E053A" />
     <SolidColorBrush x:Key="LabelTagLightPinkBackground" Opacity="0.15" Color="#E91E63" />
     <SolidColorBrush x:Key="LabelTagLightPurpleForeground" Color="#5C0F75" />
     <SolidColorBrush x:Key="LabelTagLightPurpleBackground" Opacity="0.15" Color="#9E28B3" />
     <SolidColorBrush x:Key="LabelTagLightRedForeground" Color="#8E0805" />
-    <SolidColorBrush x:Key="LabelTagLightRedBackground" Opacity="0.15" Color="#F93920" />
+    <SolidColorBrush x:Key="LabelTagLightRedBackground" Opacity="0.15" Color="#FC725A" />
     <SolidColorBrush x:Key="LabelTagLightTealForeground" Color="#005955" />
     <SolidColorBrush x:Key="LabelTagLightTealBackground" Opacity="0.15" Color="#00B3A1" />
     <SolidColorBrush x:Key="LabelTagLightVioletForeground" Color="#6A3AC7" />
@@ -57,7 +57,7 @@
     <SolidColorBrush x:Key="LabelTagGhostGreenBorderBrush" Color="#5AC262" />
     <SolidColorBrush x:Key="LabelTagGhostGreenForeground" Color="#3BB346" />
     <SolidColorBrush x:Key="LabelTagGhostGreyBorderBrush" Color="#888D92" />
-    <SolidColorBrush x:Key="LabelTagGhostGreyForeground" Color="#6B7075" />
+    <SolidColorBrush x:Key="LabelTagGhostGreyForeground" Color="#888D92" />
     <SolidColorBrush x:Key="LabelTagGhostIndigoBorderBrush" Color="#5E6FC4" />
     <SolidColorBrush x:Key="LabelTagGhostIndigoForeground" Color="#3F51B5" />
     <SolidColorBrush x:Key="LabelTagGhostLightBlueBorderBrush" Color="#30ACF1" />
@@ -67,13 +67,13 @@
     <SolidColorBrush x:Key="LabelTagGhostLimeBorderBrush" Color="#A7DA2C" />
     <SolidColorBrush x:Key="LabelTagGhostLimeForeground" Color="#9BD100" />
     <SolidColorBrush x:Key="LabelTagGhostOrangeBorderBrush" Color="#FDA633" />
-    <SolidColorBrush x:Key="LabelTagGhostOrangeForeground" Color="#FC8800" />
+    <SolidColorBrush x:Key="LabelTagGhostOrangeForeground" Color="#FFAE43" />
     <SolidColorBrush x:Key="LabelTagGhostPinkBorderBrush" Color="#ED487B" />
     <SolidColorBrush x:Key="LabelTagGhostPinkForeground" Color="#E91E63" />
     <SolidColorBrush x:Key="LabelTagGhostPurpleBorderBrush" Color="#B449C2" />
     <SolidColorBrush x:Key="LabelTagGhostPurpleForeground" Color="#9E28B3" />
     <SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="#FA664C" />
-    <SolidColorBrush x:Key="LabelTagGhostRedForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="LabelTagGhostRedForeground" Color="#FC725A" />
     <SolidColorBrush x:Key="LabelTagGhostTealBorderBrush" Color="#27C2B0" />
     <SolidColorBrush x:Key="LabelTagGhostTealForeground" Color="#00B3A1" />
     <SolidColorBrush x:Key="LabelTagGhostVioletBorderBrush" Color="#885BD2" />
@@ -88,15 +88,15 @@
     <SolidColorBrush x:Key="LabelTagSolidBlueBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="LabelTagSolidCyanBackground" Color="#05A4B6" />
     <SolidColorBrush x:Key="LabelTagSolidGreenBackground" Color="#3BB346" />
-    <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#6B7075" />
+    <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="#888D92" />
     <SolidColorBrush x:Key="LabelTagSolidIndigoBackground" Color="#3F51B5" />
     <SolidColorBrush x:Key="LabelTagSolidLightBlueBackground" Color="#40B4F3" />
     <SolidColorBrush x:Key="LabelTagSolidLightGreenBackground" Color="#7BB63C" />
     <SolidColorBrush x:Key="LabelTagSolidLimeBackground" Color="#9BD100" />
-    <SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FC8800" />
+    <SolidColorBrush x:Key="LabelTagSolidOrangeBackground" Color="#FFAE43" />
     <SolidColorBrush x:Key="LabelTagSolidPinkBackground" Color="#E91E63" />
     <SolidColorBrush x:Key="LabelTagSolidPurpleBackground" Color="#9E28B3" />
-    <SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="#F93920" />
+    <SolidColorBrush x:Key="LabelTagSolidRedBackground" Color="#FC725A" />
     <SolidColorBrush x:Key="LabelTagSolidTealBackground" Color="#00B3A1" />
     <SolidColorBrush x:Key="LabelTagSolidVioletBackground" Color="#6A3AC7" />
     <SolidColorBrush x:Key="LabelTagSolidYellowBackground" Color="#FAC800" />
diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
index 3a6b2e3..3ea19da 100644
--- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
@@ -7,8 +7,8 @@
     <SolidColorBrush x:Key="NotificationCardBackground" Color="White" />
     <SolidColorBrush x:Key="NotificationCardInformationIconForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#FC725A" />
     <sys:Double x:Key="NotificationCardWidth">320</sys:Double>
     <Thickness x:Key="NotificationCardBorderThickness">1</Thickness>
     <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
diff --git a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
index 9b831f4..4edf03c 100644
--- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
@@ -7,6 +7,6 @@
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
     <FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
     <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#FC725A" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
index 468d9e3..c8a2eee 100644
--- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
@@ -13,18 +13,18 @@
     <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Opacity="0.05" Color="#E6E8EA" />
 
     <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#A9D7FF" />
     <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />
 
 
     <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#A9D7FF" />
     <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#98CDFD" />
     <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#A9D7FF" />
     <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#98CDFD" />
 
     <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="White" />
@@ -55,8 +55,8 @@
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPointOverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#A9D7FF" />
     <SolidColorBrush x:Key="RadioButtonCardCheckDisabledBorderBrush" Color="#98CDFD" />
     <SolidColorBrush x:Key="RadioButtonCardUncheckPointOverBackground" Opacity="0.05" Color="#E6E8EA" />
     <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.09" Color="#E6E8EA" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
index 8aed507..fe92ffc 100644
--- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
@@ -18,8 +18,8 @@
     <SolidColorBrush x:Key="SliderTickForeground" Color="#C6CACD" />
     <SolidColorBrush x:Key="SliderThumbBackground" Color="White" />
     <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#A9D7FF" />
     <Thickness x:Key="SliderThumbBorderThickness">2</Thickness>
 
     <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#CBE7FE" />
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
index c89b8e1..7661271 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
@@ -5,8 +5,8 @@
     <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#FC725A" />
     <SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#3BB346" />
     <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#F9F9F9" />
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
index 101ff65..81171b3 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
@@ -4,9 +4,9 @@
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="#C6CACD" />
     <SolidColorBrush x:Key="TextBoxDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.05" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="TextBoxPointerOverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#A9D7FF" />
     <SolidColorBrush x:Key="TextBoxForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBoxWatermarkForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.62" Color="#F9F9F9" />
@@ -16,7 +16,7 @@
 
     <SolidColorBrush x:Key="TextBoxDisabledBackground" Opacity="0.04" Color="#403238" />
     <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="#2E3238" />
 
     <SolidColorBrush x:Key="TextBoxBorderlessDefaultBackground" Opacity="0.05" Color="#E6E8EA" />
     <SolidColorBrush x:Key="TextBoxBorderlessDefaultBorderBrush" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
index 0bb2165..ca8f963 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
@@ -21,28 +21,28 @@
 
     <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultErrorForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Color="#888D92" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultErrorForeground" Color="#FC725A" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Color="#E6E8EA" />
 
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedBackground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedBackground" Color="#F93920" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#888D92" />
+    <SolidColorBrush x:Key="ToggleButtonWarningCheckedBackground" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ToggleButtonErrorCheckedBackground" Color="#FC725A" />
 
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" Color="#007BCA" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" Color="#555B61" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#D26700" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPointeroverBackground" Color="#D52515" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" Color="#6EC8F6" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#FFC772" />
+    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPointeroverBackground" Color="#FD9983" />
 
-    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#0063A7" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#41464C" />
-    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="#A84A00" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPressedBackground" Color="#B2140C" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#9DDCF9" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#C6CACD" />
+    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="#FFDDA1" />
+    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPressedBackground" Color="#FDBEAC" />
 
     <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="White" />
 
@@ -54,19 +54,19 @@
 
     <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" Color="#6B7075" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBorderBrush" Color="#F93920" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" Color="#888D92" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBorderBrush" Color="#FFAE43" />
+    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBorderBrush" Color="#FC725A" />
 
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" Color="#007BCA" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" Color="#555B61" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" Color="#D26700" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePointeroverBorderBrush" Color="#D52515" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" Color="#6EC8F6" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" Color="#FFC772" />
+    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePointeroverBorderBrush" Color="#FD9983" />
 
-    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" Color="#0063A7" />
-    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" Color="#41464C" />
-    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" Color="#A84A00" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePressedBorderBrush" Color="#B2140C" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" Color="#9DDCF9" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" Color="#C6CACD" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" Color="#FFDDA1" />
+    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePressedBorderBrush" Color="#FDBEAC" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
index 895ccee..9f8f834 100644
--- a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
@@ -4,7 +4,7 @@
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
     <!--  Add Resources Here  -->
     <PathGeometry x:Key="ToolTipTriangleGlyph">M24 0V1C20 1 18.5 2 16.5 4C14.5 6 14 7 12 7C10 7 9.5 6 7.5 4C5.5 2 4 1 0 1V0H24Z</PathGeometry>
-    <SolidColorBrush x:Key="ToolTipBackground" Color="#41464C" />
+    <SolidColorBrush x:Key="ToolTipBackground" Color="#C6CACD" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="White" />
     <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
     <CornerRadius x:Key="ToolTipCornerRadius">6</CornerRadius>