From 1fe4df37162b5f42b315a0be3783508e47a8a255 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 1 Jan 2025 21:52:24 +0800
Subject: [PATCH 1/5] feat: add basic Variables.

---
 src/Semi.Avalonia/Index.axaml               |  4 +-
 src/Semi.Avalonia/SemiTheme.axaml           |  5 +-
 src/Semi.Avalonia/Tokens/Variables.axaml    | 64 +++++++++++++++++++++
 src/Semi.Avalonia/Tokens/Variables.axaml.cs |  5 ++
 4 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 src/Semi.Avalonia/Tokens/Variables.axaml
 create mode 100644 src/Semi.Avalonia/Tokens/Variables.axaml.cs

diff --git a/src/Semi.Avalonia/Index.axaml b/src/Semi.Avalonia/Index.axaml
index 013498e..c76abf6 100644
--- a/src/Semi.Avalonia/Index.axaml
+++ b/src/Semi.Avalonia/Index.axaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:semi="https://irihi.tech/semi">
     <Styles.Resources>
         <ResourceDictionary>
@@ -14,6 +15,7 @@
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Variables.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Icons/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
diff --git a/src/Semi.Avalonia/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml
index 8d158b8..20cb78b 100644
--- a/src/Semi.Avalonia/SemiTheme.axaml
+++ b/src/Semi.Avalonia/SemiTheme.axaml
@@ -1,4 +1,6 @@
-<Styles x:Class="Semi.Avalonia.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<Styles x:Class="Semi.Avalonia.SemiTheme"
+        xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:semi="https://irihi.tech/semi">
     <Styles.Resources>
         <ResourceDictionary>
@@ -14,6 +16,7 @@
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Variables.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Icons/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
diff --git a/src/Semi.Avalonia/Tokens/Variables.axaml b/src/Semi.Avalonia/Tokens/Variables.axaml
new file mode 100644
index 0000000..c155e99
--- /dev/null
+++ b/src/Semi.Avalonia/Tokens/Variables.axaml
@@ -0,0 +1,64 @@
+<ResourceDictionary
+    x:Class="Semi.Avalonia.Tokens.Variables"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Sizing -->
+    <x:Double x:Key="SemiHeightControlSmall">24</x:Double> <!-- 表单项高度 - 小尺寸 -->
+    <x:Double x:Key="SemiHeightControlDefault">32</x:Double> <!-- 表单项高度 - 默认尺寸 -->
+    <x:Double x:Key="SemiHeightControlLarge">40</x:Double> <!-- 表单项高度 - 大尺寸 -->
+    <x:Double x:Key="SemiWidthIconExtraSmall">8</x:Double> <!-- 图标尺寸 - 超小 -->
+    <x:Double x:Key="SemiWidthIconSmall">12</x:Double> <!-- 图标尺寸 - 小 -->
+    <x:Double x:Key="SemiWidthIconMedium">16</x:Double> <!-- 图标尺寸 - 中 -->
+    <x:Double x:Key="SemiWidthIconLarge">20</x:Double> <!-- 图标尺寸 - 大 -->
+    <x:Double x:Key="SemiWidthIconExtraLarge">24</x:Double> <!-- 图标尺寸 - 超大 -->
+
+    <!-- Border -->
+    <x:Double x:Key="SemiBorderSpacing">0</x:Double> <!-- 描边间距 - 零 -->
+    <x:Double x:Key="SemiBorderSpacingControl">1</x:Double> <!-- 描边间距 - 默认状态 -->
+    <x:Double x:Key="SemiBorderSpacingControlFocus">1</x:Double> <!-- 描边间距 - focus 状态 -->
+    <Thickness x:Key="SemiBorderThickness">0</Thickness> <!-- 描边宽度 - 零 -->
+    <Thickness x:Key="SemiBorderThicknessControl">1</Thickness> <!-- 描边宽度 - 默认状态 -->
+    <Thickness x:Key="SemiBorderThicknessControlFocus">1</Thickness> <!-- 描边宽度 - focus 状态 -->
+    <CornerRadius x:Key="SemiBorderRadiusExtraSmall">3</CornerRadius> <!-- 圆角 - 超小 -->
+    <CornerRadius x:Key="SemiBorderRadiusSmall">3</CornerRadius> <!-- 圆角 - 小 -->
+    <CornerRadius x:Key="SemiBorderRadiusMedium">6</CornerRadius> <!-- 圆角 - 中 -->
+    <CornerRadius x:Key="SemiBorderRadiusLarge">12</CornerRadius> <!-- 圆角 - 大 -->
+    <CornerRadius x:Key="SemiBorderRadiusFull">999</CornerRadius> <!-- 圆角 - 全圆 -->
+
+    <!-- Spacing -->
+    <x:Double x:Key="SemiSpacingNone">0</x:Double> <!-- 间距 - 零 -->
+    <x:Double x:Key="SemiSpacingSuperTight">2</x:Double> <!-- 间距 - 极紧凑 -->
+    <x:Double x:Key="SemiSpacingExtraTight">4</x:Double> <!-- 间距 - 超紧凑 -->
+    <x:Double x:Key="SemiSpacingTight">8</x:Double> <!-- 间距 - 紧凑 -->
+    <x:Double x:Key="SemiSpacingBaseTight">12</x:Double> <!-- 间距 - 偏紧凑 -->
+    <x:Double x:Key="SemiSpacingBase">16</x:Double> <!-- 间距 - 默认 -->
+    <x:Double x:Key="SemiSpacingBaseLoose">20</x:Double> <!-- 间距 - 偏宽松 -->
+    <x:Double x:Key="SemiSpacingLoose">24</x:Double> <!-- 间距 - 宽松 -->
+    <x:Double x:Key="SemiSpacingExtraLoose">32</x:Double> <!-- 间距 - 超宽松 -->
+    <x:Double x:Key="SemiSpacingSuperLoose">40</x:Double> <!-- 间距 - 极宽松 -->
+
+    <!-- Thickness -->
+    <Thickness x:Key="SemiThicknessNone">0</Thickness> <!-- 宽度 - 零 -->
+    <Thickness x:Key="SemiThicknessSuperTight">2</Thickness> <!-- 宽度 - 极紧凑 -->
+    <Thickness x:Key="SemiThicknessExtraTight">4</Thickness> <!-- 宽度 - 超紧凑 -->
+    <Thickness x:Key="SemiThicknessTight">8</Thickness> <!-- 宽度 - 紧凑 -->
+    <Thickness x:Key="SemiThicknessBaseTight">12</Thickness> <!-- 宽度 - 偏紧凑 -->
+    <Thickness x:Key="SemiThicknessBase">16</Thickness> <!-- 宽度 - 默认 -->
+    <Thickness x:Key="SemiThicknessBaseLoose">20</Thickness> <!-- 宽度 - 偏宽松 -->
+    <Thickness x:Key="SemiThicknessLoose">24</Thickness> <!-- 宽度 - 宽松 -->
+    <Thickness x:Key="SemiThicknessExtraLoose">32</Thickness> <!-- 宽度 - 超宽松 -->
+    <Thickness x:Key="SemiThicknessSuperLoose">40</Thickness> <!-- 宽度 - 极宽松 -->
+
+    <!-- Font -->
+    <x:Double x:Key="SemiFontSizeSmall">12</x:Double> <!-- 小文本字号 -->
+    <x:Double x:Key="SemiFontSizeRegular">14</x:Double> <!-- 常规文本字号 -->
+    <x:Double x:Key="SemiFontSizeHeader6">16</x:Double> <!-- 六级标题字号 -->
+    <x:Double x:Key="SemiFontSizeHeader5">18</x:Double> <!-- 五级标题字号 -->
+    <x:Double x:Key="SemiFontSizeHeader4">20</x:Double> <!-- 四级标题字号 -->
+    <x:Double x:Key="SemiFontSizeHeader3">24</x:Double> <!-- 三级标题字号 -->
+    <x:Double x:Key="SemiFontSizeHeader2">28</x:Double> <!-- 二级标题字号 -->
+    <x:Double x:Key="SemiFontSizeHeader1">32</x:Double> <!-- 一级标题字号 -->
+    <FontWeight x:Key="SemiFontWeightLight">200</FontWeight> <!-- 字重 - 轻 -->
+    <FontWeight x:Key="SemiFontWeightRegular">400</FontWeight> <!-- 字重 - 常规 -->
+    <FontWeight x:Key="SemiFontWeightBold">600</FontWeight> <!-- 字重 - 粗 -->
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/Variables.axaml.cs b/src/Semi.Avalonia/Tokens/Variables.axaml.cs
new file mode 100644
index 0000000..27ac62c
--- /dev/null
+++ b/src/Semi.Avalonia/Tokens/Variables.axaml.cs
@@ -0,0 +1,5 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Tokens;
+
+public class Variables : ResourceDictionary;
\ No newline at end of file

From c55efe88355152ca796fb417e176f1dc8078d82c Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:35:53 +0800
Subject: [PATCH 2/5] misc: format shared codes.

---
 src/Semi.Avalonia/Themes/Shared/Button.axaml       |  5 -----
 .../Themes/Shared/ButtonSpinner.axaml              |  5 ++---
 src/Semi.Avalonia/Themes/Shared/Calendar.axaml     |  6 ++----
 .../Themes/Shared/CalendarDatePicker.axaml         |  2 +-
 src/Semi.Avalonia/Themes/Shared/Carousel.axaml     |  6 +-----
 src/Semi.Avalonia/Themes/Shared/CheckBox.axaml     |  8 ++------
 src/Semi.Avalonia/Themes/Shared/ComboBox.axaml     |  7 +------
 .../Themes/Shared/DataValidationErrors.axaml       |  2 +-
 src/Semi.Avalonia/Themes/Shared/DatePicker.axaml   |  2 +-
 .../Themes/Shared/DateTimePickerShared.axaml       |  5 -----
 .../Themes/Shared/DropDownButton.axaml             |  2 +-
 src/Semi.Avalonia/Themes/Shared/Expander.axaml     |  3 +--
 src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml |  2 +-
 .../Themes/Shared/HeaderedContentControl.axaml     |  2 +-
 .../Themes/Shared/HyperlinkButton.axaml            |  1 -
 src/Semi.Avalonia/Themes/Shared/ListBox.axaml      |  1 -
 .../Themes/Shared/ManagedFileChooser.axaml         |  2 +-
 src/Semi.Avalonia/Themes/Shared/Menu.axaml         | 14 ++++----------
 .../Themes/Shared/NotificationCard.axaml           | 11 ++++-------
 src/Semi.Avalonia/Themes/Shared/RadioButton.axaml  |  6 ------
 src/Semi.Avalonia/Themes/Shared/Slider.axaml       |  1 -
 src/Semi.Avalonia/Themes/Shared/SplitView.axaml    |  9 +++------
 src/Semi.Avalonia/Themes/Shared/TabControl.axaml   |  2 +-
 src/Semi.Avalonia/Themes/Shared/TextBlock.axaml    |  2 --
 src/Semi.Avalonia/Themes/Shared/TextBox.axaml      |  4 ----
 src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml |  1 -
 src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml |  3 ---
 src/Semi.Avalonia/Themes/Shared/TreeView.axaml     |  4 +---
 src/Semi.Avalonia/Themes/Shared/Window.axaml       |  2 +-
 src/Semi.Avalonia/Themes/Shared/_index.axaml       |  2 +-
 30 files changed, 31 insertions(+), 91 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/Shared/Button.axaml b/src/Semi.Avalonia/Themes/Shared/Button.axaml
index 567a07a..4d3a4df 100644
--- a/src/Semi.Avalonia/Themes/Shared/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Button.axaml
@@ -1,18 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <x:Double x:Key="ButtonDefaultFontSize">14</x:Double>
     <FontWeight x:Key="ButtonDefaultFontWeight">600</FontWeight>
-
     <Thickness x:Key="ButtonDefaultPadding">12 6</Thickness>
     <Thickness x:Key="ButtonLargePadding">16 10</Thickness>
     <Thickness x:Key="ButtonSmallPadding">6 2</Thickness>
-
     <x:Double x:Key="ButtonDefaultHeight">32</x:Double>
     <x:Double x:Key="ButtonSmallHeight">24</x:Double>
     <x:Double x:Key="ButtonLargeHeight">40</x:Double>
-
     <Thickness x:Key="ButtonBorderThickness">1</Thickness>
-
     <CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
-
     <StaticResource x:Key="IconButtonClearData" ResourceKey="SemiIconClear" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
index 857b225..2bd11d7 100644
--- a/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="ButtonSpinnerIncreaseButtonGlyph" ResourceKey="SemiIconChevronUp"/>
-    <StaticResource x:Key="ButtonSpinnerDecreaseButtonGlyph" ResourceKey="SemiIconChevronDown"/>
-
+    <StaticResource x:Key="ButtonSpinnerIncreaseButtonGlyph" ResourceKey="SemiIconChevronUp" />
+    <StaticResource x:Key="ButtonSpinnerDecreaseButtonGlyph" ResourceKey="SemiIconChevronDown" />
     <CornerRadius x:Key="ButtonSpinnerButtonGroupCornerRadius">3</CornerRadius>
     <Thickness x:Key="ButtonSpinnerButtonGroupBorderThickness">1</Thickness>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Calendar.axaml b/src/Semi.Avalonia/Themes/Shared/Calendar.axaml
index 0a6ec26..40b2c19 100644
--- a/src/Semi.Avalonia/Themes/Shared/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Calendar.axaml
@@ -2,13 +2,11 @@
     <Thickness x:Key="CalendarBorderThickness">1</Thickness>
     <CornerRadius x:Key="CalendarCornerRadius">6</CornerRadius>
     <GridLength x:Key="CalendarItemWeekDayNameHeight">40</GridLength>
-    <StaticResource x:Key="CalendarItemPreviousIconGlyph" ResourceKey="SemiIconChevronLeft"/>
-    <StaticResource x:Key="CalendarItemNextIconGlyph" ResourceKey="SemiIconChevronRight"/>
-
+    <StaticResource x:Key="CalendarItemPreviousIconGlyph" ResourceKey="SemiIconChevronLeft" />
+    <StaticResource x:Key="CalendarItemNextIconGlyph" ResourceKey="SemiIconChevronRight" />
     <FontWeight x:Key="CalendarItemCalendarButtonSelectedFontWeight">600</FontWeight>
     <CornerRadius x:Key="CalendarItemCalendarButtonCornerRadius">3</CornerRadius>
     <CornerRadius x:Key="CalendarItemCalendarDayButtonCornerRadius">3</CornerRadius>
-
     <x:Double x:Key="CalendarMinWidth">240</x:Double>
     <x:Double x:Key="CalendarMinHeight">250</x:Double>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
index c0e4f5b..2aa79c0 100644
--- a/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="CalendarDatePickerIconGlyph" ResourceKey="SemiIconCalendar"/>
+    <StaticResource x:Key="CalendarDatePickerIconGlyph" ResourceKey="SemiIconCalendar" />
     <Thickness x:Key="CalendarDatePickerBorderThickness">1</Thickness>
     <CornerRadius x:Key="CalendarDatePickerCornerRadius">3</CornerRadius>
     <x:Double x:Key="CalendarDatePickerDefaultHeight">32</x:Double>
diff --git a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml
index ab9344e..dc5bf1e 100644
--- a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml
@@ -1,14 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="CarouselButtonGlyph" ResourceKey="SemiIconChevronLeft"/>
-
+    <StaticResource x:Key="CarouselButtonGlyph" ResourceKey="SemiIconChevronLeft" />
     <x:Double x:Key="CarouselIndicatorDotWidth">8</x:Double>
     <x:Double x:Key="CarouselIndicatorDotHeight">8</x:Double>
-
     <x:Double x:Key="CarouselIndicatorLineHeight">4</x:Double>
-
     <x:Double x:Key="CarouselIndicatorColumnarWidth">4</x:Double>
     <x:Double x:Key="CarouselIndicatorColumnarHeight">12</x:Double>
     <x:Double x:Key="CarouselIndicatorColumnarSelectedHeight">20</x:Double>
-
     <Thickness x:Key="CarouselButtonMargin">20</Thickness>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml b/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
index c87f768..09055dc 100644
--- a/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
@@ -4,16 +4,12 @@
     <x:Double x:Key="CheckBoxBoxHeight">16</x:Double>
     <Thickness x:Key="CheckBoxBoxMargin">0 2 0 0</Thickness>
     <Thickness x:Key="CheckBoxContentMargin">8 0 0 0</Thickness>
-
     <x:Double x:Key="CheckBoxBoxGlyphWidth">16</x:Double>
     <x:Double x:Key="CheckBoxBoxGlyphHeight">16</x:Double>
-
     <CornerRadius x:Key="CheckBoxBoxCornerRadius">3</CornerRadius>
     <Thickness x:Key="CheckBoxBoxBorderThickness">1</Thickness>
-
-    <StaticResource x:Key="CheckBoxCheckGlyph" ResourceKey="SemiIconCheckBoxTick"/>
-    <StaticResource x:Key="CheckBoxIndeterminateGlyph" ResourceKey="SemiIconCheckBoxIndeterminate"/>
-
+    <StaticResource x:Key="CheckBoxCheckGlyph" ResourceKey="SemiIconCheckBoxTick" />
+    <StaticResource x:Key="CheckBoxIndeterminateGlyph" ResourceKey="SemiIconCheckBoxIndeterminate" />
     <Thickness x:Key="CheckBoxCardBorderThickness">1</Thickness>
     <Thickness x:Key="CheckBoxCardPadding">16 12</Thickness>
     <CornerRadius x:Key="CheckBoxCardCornerRadius">3</CornerRadius>
diff --git a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
index a415b22..adbec94 100644
--- a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
@@ -1,20 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
     <Thickness x:Key="ComboBoxSelectorThickness">1</Thickness>
-
     <Thickness x:Key="ComboBoxItemDefaultPadding">12 8</Thickness>
     <Thickness x:Key="ComboBoxSelectorDefaultPadding">12 0 0 0</Thickness>
-
     <x:Double x:Key="ComboBoxPopupMaxDropDownHeight">504</x:Double>
     <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
     <CornerRadius x:Key="ComboBoxPopupBoxCornerRadius">6</CornerRadius>
-
     <x:Double x:Key="ComboBoxIconWidth">32</x:Double>
-    <StaticResource x:Key="ComboBoxIcon" ResourceKey="SemiIconChevronDown"/>
-
+    <StaticResource x:Key="ComboBoxIcon" ResourceKey="SemiIconChevronDown" />
     <Thickness x:Key="ComboBoxPopupBorderMargin">4</Thickness>
     <Thickness x:Key="ComboBoxPopupBorderPadding">0 4</Thickness>
-
     <x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
     <x:Double x:Key="ComboBoxSmallHeight">24</x:Double>
     <x:Double x:Key="ComboBoxLargeHeight">40</x:Double>
diff --git a/src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml
index d1981be..9b91be8 100644
--- a/src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml
@@ -1,2 +1,2 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml b/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml
index 3f128e5..50e0964 100644
--- a/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="DatePickerIconGlyph" ResourceKey="SemiIconCalendar"/>
+    <StaticResource x:Key="DatePickerIconGlyph" ResourceKey="SemiIconCalendar" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
index 6a67390..d144678 100644
--- a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
@@ -3,17 +3,12 @@
     <StaticResource x:Key="DateTimePickerButtonDownGlyph" ResourceKey="SemiIconCaretDown" />
     <StaticResource x:Key="DateTimePickerAcceptGlyph" ResourceKey="SemiIconTick" />
     <StaticResource x:Key="DateTimePickerDismissGlyph" ResourceKey="SemiIconClose" />
-
     <x:Double x:Key="DateTimePickerListBoxItemHeight">36</x:Double>
-
-
     <Thickness x:Key="DateTimePickerFlyoutPadding">0</Thickness>
     <Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</Thickness>
-
     <x:Double x:Key="DateTimePickerButtonSmallHeight">24</x:Double>
     <x:Double x:Key="DateTimePickerButtonDefaultHeight">32</x:Double>
     <x:Double x:Key="DateTimePickerButtonLargeHeight">40</x:Double>
-
     <Thickness x:Key="DateTimePickerButtonBorderThickness">1</Thickness>
     <CornerRadius x:Key="DateTimePickerButtonCornerRadius">3</CornerRadius>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml b/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml
index 1f84e28..0bfbfbe 100644
--- a/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="DropDownButtonIconGlyph" ResourceKey="SemiIconChevronDown"/>
+    <StaticResource x:Key="DropDownButtonIconGlyph" ResourceKey="SemiIconChevronDown" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Expander.axaml b/src/Semi.Avalonia/Themes/Shared/Expander.axaml
index 11008af..5fe1eb2 100644
--- a/src/Semi.Avalonia/Themes/Shared/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Expander.axaml
@@ -2,8 +2,7 @@
     <FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
     <x:Double x:Key="ExpanderIconSize">8</x:Double>
     <Thickness x:Key="ExpanderIconMargin">8 0 0 0</Thickness>
-    <StaticResource x:Key="ExpanderIcon" ResourceKey="SemiIconChevronDown"/>
-
+    <StaticResource x:Key="ExpanderIcon" ResourceKey="SemiIconChevronDown" />
     <Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
     <Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
     <Thickness x:Key="ExpanderContentMargin">16 4 16 8</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml
index d1981be..9b91be8 100644
--- a/src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/GridSplitter.axaml
@@ -1,2 +1,2 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
index 24289d5..31792df 100644
--- a/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <CornerRadius x:Key="HeaderedContentControlCornerRadius">6</CornerRadius>
     <Thickness x:Key="HeaderedContentControlBorderThickness">1</Thickness>
     <FontWeight x:Key="HeaderedContentControlHeaderFontWeight">600</FontWeight>
diff --git a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
index 9e7fbcd..093545d 100644
--- a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
@@ -4,6 +4,5 @@
     <x:Double x:Key="HyperlinkButtonLinkGlyphWidth">16</x:Double>
     <x:Double x:Key="HyperlinkButtonLinkGlyphHeight">16</x:Double>
     <Thickness x:Key="HyperlinkButtonLinkGlyphMargin">0 0 4 0</Thickness>
-
     <StaticResource x:Key="HyperlinkButtonLinkGlyph" ResourceKey="SemiIconLink" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
index a9cb0b5..53234a0 100644
--- a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
@@ -2,5 +2,4 @@
     <!-- ListBox -->
     <Thickness x:Key="ListBoxItemDefaultPadding">12 8</Thickness>
     <CornerRadius x:Key="ListBoxItemCornerRadius">0</CornerRadius>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml
index 5e82286..7b0583a 100644
--- a/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="ManagedFileChooserUpButtonGlyph" ResourceKey="SemiIconArrowUp"/>
+    <StaticResource x:Key="ManagedFileChooserUpButtonGlyph" ResourceKey="SemiIconArrowUp" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Menu.axaml b/src/Semi.Avalonia/Themes/Shared/Menu.axaml
index c2410c2..cff702a 100644
--- a/src/Semi.Avalonia/Themes/Shared/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Menu.axaml
@@ -1,10 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="MenuScrollViewerUpButtonGlyph" ResourceKey="SemiIconChevronUp"/>
-    <StaticResource x:Key="MenuScrollViewerDownButtonGlyph" ResourceKey="SemiIconChevronDown"/>
-
-    <StaticResource x:Key="MenuItemExpandIconGlyph" ResourceKey="SemiIconChevronRight"/>
-    <StaticResource x:Key="MenuCheckGlyph" ResourceKey="SemiIconCheckBoxTick"/>
-
+    <StaticResource x:Key="MenuScrollViewerUpButtonGlyph" ResourceKey="SemiIconChevronUp" />
+    <StaticResource x:Key="MenuScrollViewerDownButtonGlyph" ResourceKey="SemiIconChevronDown" />
+    <StaticResource x:Key="MenuItemExpandIconGlyph" ResourceKey="SemiIconChevronRight" />
+    <StaticResource x:Key="MenuCheckGlyph" ResourceKey="SemiIconCheckBoxTick" />
     <!--  MenuFlyout  -->
     <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
     <Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
@@ -13,16 +11,12 @@
     <x:Double x:Key="MenuFlyoutMinWidth">100</x:Double>
     <x:Double x:Key="MenuFlyoutMaxHeight">400</x:Double>
     <x:Double x:Key="MenuFlyoutMaxWidth">600</x:Double>
-
     <!--  MenuItem  -->
     <Thickness x:Key="MenuItemPadding">16 8</Thickness>
-    
     <CornerRadius x:Key="MenuItemCornerRadius">3</CornerRadius>
-
     <x:Double x:Key="MenuItemSeparatorHeight">1</x:Double>
     <Thickness x:Key="MenuItemSeparatorMargin">2</Thickness>
     <Thickness x:Key="MenuItemIconMargin">0 0 12 0</Thickness>
     <Thickness x:Key="MenuItemInputGestureTextMargin">4 0</Thickness>
-
     <Thickness x:Key="MenuItemExpandIconMargin">4 0</Thickness>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
index 646795d..0a66b45 100644
--- a/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
@@ -4,17 +4,14 @@
     <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
     <Thickness x:Key="NotificationCardMargin">8</Thickness>
     <Thickness x:Key="NotificationCardPadding">20 16 12 16</Thickness>
-
     <x:Double x:Key="NotificationCardIconWidth">20</x:Double>
     <x:Double x:Key="NotificationCardIconHeight">20</x:Double>
     <Thickness x:Key="NotificationCardIconMargin">0 0 12 0</Thickness>
-    <StaticResource x:Key="NotificationCardInformationIconPathData" ResourceKey="SemiIconInfoCircle"/>
-    <StaticResource x:Key="NotificationCardSuccessIconPathData" ResourceKey="SemiIconTickCircle"/>
-    <StaticResource x:Key="NotificationCardWarningIconPathData" ResourceKey="SemiIconAlertTriangle"/>
-    <StaticResource x:Key="NotificationCardErrorIconPathData" ResourceKey="SemiIconAlertCircle"/>
-
+    <StaticResource x:Key="NotificationCardInformationIconPathData" ResourceKey="SemiIconInfoCircle" />
+    <StaticResource x:Key="NotificationCardSuccessIconPathData" ResourceKey="SemiIconTickCircle" />
+    <StaticResource x:Key="NotificationCardWarningIconPathData" ResourceKey="SemiIconAlertTriangle" />
+    <StaticResource x:Key="NotificationCardErrorIconPathData" ResourceKey="SemiIconAlertCircle" />
     <x:Double x:Key="NotificationCardTitleSpacing">4</x:Double>
-
     <x:Double x:Key="NotificationCardTitleFontSize">16</x:Double>
     <FontWeight x:Key="NotificationCardTitleFontWeight">600</FontWeight>
     <x:Double x:Key="NotificationCardMessageFontSize">14</x:Double>
diff --git a/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml
index e47c9e1..586e395 100644
--- a/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml
@@ -4,25 +4,19 @@
     <x:Double x:Key="RadioButtonGlyphRadius">6</x:Double>
     <x:Double x:Key="RadioButtonFontSize">14</x:Double>
     <Thickness x:Key="RadioButtonIconMargin">0 2 0 0</Thickness>
-
     <x:Double x:Key="RadioButtonUncheckIconDefaultThickness">1</x:Double>
     <Thickness x:Key="RadioButtonContentMargin">8 0 0 0</Thickness>
-
     <!-- ButtonRadioButton -->
     <CornerRadius x:Key="RadioButtonBoxCornerRadius">3</CornerRadius>
-
     <CornerRadius x:Key="RadioButtonGroupCornerRadius">3</CornerRadius>
     <CornerRadius x:Key="RadioButtonButtonCornerRadius">3</CornerRadius>
-
     <FontWeight x:Key="RadioButtonButtonFontWeight">600</FontWeight>
     <Thickness x:Key="RadioButtonButtonSmallPadding">16 2</Thickness>
     <Thickness x:Key="RadioButtonButtonDefaultPadding">16 4</Thickness>
     <Thickness x:Key="RadioButtonButtonLargePadding">24 6</Thickness>
-
     <x:Double x:Key="RadioButtonButtonSmallFontSize">12</x:Double>
     <x:Double x:Key="RadioButtonButtonDefaultFontSize">12</x:Double>
     <x:Double x:Key="RadioButtonButtonLargeFontSize">14</x:Double>
-
     <!-- CardRadioButton -->
     <Thickness x:Key="RadioButtonBorderThickness">1</Thickness>
     <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Shared/Slider.axaml b/src/Semi.Avalonia/Themes/Shared/Slider.axaml
index 42c66a9..7e1d107 100644
--- a/src/Semi.Avalonia/Themes/Shared/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Slider.axaml
@@ -5,7 +5,6 @@
     <x:Double x:Key="SliderThumbHeight">16</x:Double>
     <CornerRadius x:Key="SliderThumbCornerRadius">24</CornerRadius>
     <Thickness x:Key="SliderBorderThickness">0</Thickness>
-
     <x:Double x:Key="SliderTickHorizontalHeight">4</x:Double>
     <x:Double x:Key="SliderTickVerticalWidth">4</x:Double>
     <Thickness x:Key="SliderThumbBorderThickness">2</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Shared/SplitView.axaml b/src/Semi.Avalonia/Themes/Shared/SplitView.axaml
index 944eb37..b3780e7 100644
--- a/src/Semi.Avalonia/Themes/Shared/SplitView.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/SplitView.axaml
@@ -1,10 +1,7 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="using:System">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="using:System">
     <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
     <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
-    <sys:TimeSpan x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</sys:TimeSpan>
-    <sys:TimeSpan x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</sys:TimeSpan>
+    <x:TimeSpan x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</x:TimeSpan>
+    <x:TimeSpan x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</x:TimeSpan>
     <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TabControl.axaml b/src/Semi.Avalonia/Themes/Shared/TabControl.axaml
index d1981be..9b91be8 100644
--- a/src/Semi.Avalonia/Themes/Shared/TabControl.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TabControl.axaml
@@ -1,2 +1,2 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
index 514d9ca..827602d 100644
--- a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <x:Double x:Key="TextBlockCodeFontSize">12</x:Double>
-
     <x:Double x:Key="TextBlockFontSize">14</x:Double>
     <x:Double x:Key="TextBlockTitleH1FontSize">32</x:Double>
     <x:Double x:Key="TextBlockTitleH2FontSize">28</x:Double>
@@ -10,6 +9,5 @@
     <x:Double x:Key="TextBlockTitleH6FontSize">16</x:Double>
     <FontWeight x:Key="TextBlockFontWeight">400</FontWeight>
     <FontWeight x:Key="TextBlockTitleFontWeight">600</FontWeight>
-
     <CornerRadius x:Key="TextBlockCodeCornerRadius">2</CornerRadius>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
index 1746095..61f7281 100644
--- a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
@@ -2,17 +2,13 @@
     <x:Double x:Key="TextBoxDefaultHeight">32</x:Double>
     <x:Double x:Key="TextBoxSmallHeight">24</x:Double>
     <x:Double x:Key="TextBoxLargeHeight">40</x:Double>
-
     <CornerRadius x:Key="TextBoxDefaultCornerRadius">3</CornerRadius>
-
     <Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 8 0</Thickness>
     <Thickness x:Key="TextBoxInnerRightContentPadding">8 0 0 0</Thickness>
     <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
     <Thickness x:Key="TextBoxBorderThickness">1</Thickness>
-
     <Thickness x:Key="TextBoxTextAreaContentPadding">12 5</Thickness>
     <x:Double x:Key="TextBoxTextAreaHeight">90</x:Double>
-
     <StaticResource x:Key="PasswordBoxRevealButtonData" ResourceKey="SemiIconEyeClosedSolid" />
     <StaticResource x:Key="PasswordBoxHideButtonData" ResourceKey="SemiIconEyeOpened" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
index cfa03fe..b7cc427 100644
--- a/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <x:Double x:Key="ToggleButtonDefaultFontSize">14</x:Double>
     <FontWeight x:Key="ToggleButtonDefaultFontWeight">600</FontWeight>
-
     <Thickness x:Key="ToggleButtonBorderThickness">1</Thickness>
     <CornerRadius x:Key="ToggleButtonCornerRadius">3</CornerRadius>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
index 2baad9f..a2fe5ab 100644
--- a/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
@@ -19,12 +19,9 @@
     <x:Double x:Key="ToggleSwitchLoadingIndicatorDefaultStrokeThickness">2</x:Double>
     <x:Double x:Key="ToggleSwitchLoadingIndicatorSmallStrokeThickness">1</x:Double>
     <x:Double x:Key="ToggleSwitchLoadingIndicatorLargeStrokeThickness">3</x:Double>
-
     <x:Double x:Key="ToggleSwitchDefaultFontSize">12</x:Double>
     <x:Double x:Key="ToggleSwitchLargeFontSize">14</x:Double>
-
     <Thickness x:Key="ToggleSwitchHeaderMargin">8 4</Thickness>
     <Thickness x:Key="ToggleSwitchOnContentMargin">8 4</Thickness>
-
     <x:Double x:Key="SimpleToggleSwitchFontSize">14</x:Double>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TreeView.axaml b/src/Semi.Avalonia/Themes/Shared/TreeView.axaml
index 100748a..5d42b00 100644
--- a/src/Semi.Avalonia/Themes/Shared/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TreeView.axaml
@@ -1,9 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <x:Double x:Key="TreeViewItemIndent">20</x:Double>
     <x:Double x:Key="TreeViewItemIconSize">8</x:Double>
-
-    <StaticResource x:Key="ExpanderIconData" ResourceKey="SemiIconTreeTriangleRight"/>
-
+    <StaticResource x:Key="ExpanderIconData" ResourceKey="SemiIconTreeTriangleRight" />
     <Thickness x:Key="TreeViewItemIconMargin">8 0</Thickness>
     <Thickness x:Key="TreeViewItemPadding">0 4 8 4</Thickness>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Window.axaml b/src/Semi.Avalonia/Themes/Shared/Window.axaml
index d1981be..9b91be8 100644
--- a/src/Semi.Avalonia/Themes/Shared/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Window.axaml
@@ -1,2 +1,2 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/_index.axaml b/src/Semi.Avalonia/Themes/Shared/_index.axaml
index 20cdaf7..3ff987e 100644
--- a/src/Semi.Avalonia/Themes/Shared/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml" />

From 7600b187f43c8eafeeb1c6a23bcd59e564f655cb Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 2 Jan 2025 14:31:47 +0800
Subject: [PATCH 3/5] feat: replace most resources in Shared folder with basic
 design tokens.

---
 .../Themes/Shared/AdornerLayer.axaml          |  2 +-
 .../Themes/Shared/AutoCompleteBox.axaml       | 12 +++++-----
 src/Semi.Avalonia/Themes/Shared/Border.axaml  |  6 ++---
 src/Semi.Avalonia/Themes/Shared/Button.axaml  | 14 ++++++------
 .../Themes/Shared/ButtonSpinner.axaml         |  4 ++--
 .../Themes/Shared/Calendar.axaml              | 10 ++++-----
 .../Themes/Shared/CalendarDatePicker.axaml    | 10 ++++-----
 .../Themes/Shared/CheckBox.axaml              | 10 ++++-----
 .../Themes/Shared/ComboBox.axaml              | 16 +++++++-------
 .../Themes/Shared/DateTimePickerShared.axaml  | 14 ++++++------
 .../Themes/Shared/Expander.axaml              |  6 ++---
 src/Semi.Avalonia/Themes/Shared/Flyout.axaml  |  8 +++----
 .../Shared/HeaderedContentControl.axaml       | 10 ++++-----
 .../Themes/Shared/HyperlinkButton.axaml       |  4 ++--
 src/Semi.Avalonia/Themes/Shared/Label.axaml   |  8 +++----
 src/Semi.Avalonia/Themes/Shared/Menu.axaml    |  8 +++----
 .../Themes/Shared/NotificationCard.axaml      | 20 ++++++++---------
 .../Themes/Shared/NumericUpDown.axaml         |  8 +++----
 .../Themes/Shared/ProgressBar.axaml           |  4 ++--
 .../Themes/Shared/RadioButton.axaml           | 22 +++++++++----------
 .../Themes/Shared/ScrollViewer.axaml          |  2 +-
 src/Semi.Avalonia/Themes/Shared/Slider.axaml  |  6 ++---
 src/Semi.Avalonia/Themes/Shared/TabItem.axaml |  2 +-
 .../Themes/Shared/TextBlock.axaml             | 20 ++++++++---------
 src/Semi.Avalonia/Themes/Shared/TextBox.axaml | 10 ++++-----
 .../Themes/Shared/ToggleButton.axaml          |  8 +++----
 .../Themes/Shared/ToggleSwitch.axaml          |  8 +++----
 src/Semi.Avalonia/Themes/Shared/Tooltip.axaml |  4 ++--
 28 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml
index d55d612..23605e3 100644
--- a/src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Thickness x:Key="AdornerLayerBorderThickness">2</Thickness>
-    <CornerRadius x:Key="AdornerLayerCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="AdornerLayerCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml
index 3e775cf..173bcff 100644
--- a/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
-    <Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
+    <StaticResource x:Key="AutoCompleteBoxPopupBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="AutoCompleteBoxPopupMargin" ResourceKey="SemiThicknessExtraTight" />
     <Thickness x:Key="AutoCompleteBoxPopupPadding">0 4</Thickness>
-    <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
-    <x:Double x:Key="AutoCompleteBoxDefaultHeight">32</x:Double>
-    <x:Double x:Key="AutoCompleteBoxSmallHeight">24</x:Double>
-    <x:Double x:Key="AutoCompleteBoxLargeHeight">40</x:Double>
+    <StaticResource x:Key="AutoCompleteBoxPopupCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
+    <StaticResource x:Key="AutoCompleteBoxDefaultHeight" ResourceKey="SemiHeightControlDefault" />
+    <StaticResource x:Key="AutoCompleteBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
+    <StaticResource x:Key="AutoCompleteBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
     <x:Double x:Key="AutoCompleteMaxDropdownHeight">600</x:Double>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Border.axaml b/src/Semi.Avalonia/Themes/Shared/Border.axaml
index ba9887f..c55630b 100644
--- a/src/Semi.Avalonia/Themes/Shared/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Border.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <CornerRadius x:Key="RadiusCardCornerRadius">4</CornerRadius>
-    <Thickness x:Key="ThicknessCardPadding">20</Thickness>
-    <Thickness x:Key="ThicknessCardMargin">4</Thickness>
-    <Thickness x:Key="ThicknessCardBorderThickness">1</Thickness>
+    <StaticResource x:Key="ThicknessCardPadding" ResourceKey="SemiThicknessBaseLoose" />
+    <StaticResource x:Key="ThicknessCardMargin" ResourceKey="SemiThicknessExtraTight" />
+    <StaticResource x:Key="ThicknessCardBorderThickness" ResourceKey="SemiBorderThicknessControl" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Button.axaml b/src/Semi.Avalonia/Themes/Shared/Button.axaml
index 4d3a4df..e0bca57 100644
--- a/src/Semi.Avalonia/Themes/Shared/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Button.axaml
@@ -1,13 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:Double x:Key="ButtonDefaultFontSize">14</x:Double>
-    <FontWeight x:Key="ButtonDefaultFontWeight">600</FontWeight>
+    <StaticResource x:Key="ButtonDefaultFontSize" ResourceKey="SemiFontSizeRegular" />
+    <StaticResource x:Key="ButtonDefaultFontWeight" ResourceKey="SemiFontWeightBold" />
     <Thickness x:Key="ButtonDefaultPadding">12 6</Thickness>
     <Thickness x:Key="ButtonLargePadding">16 10</Thickness>
     <Thickness x:Key="ButtonSmallPadding">6 2</Thickness>
-    <x:Double x:Key="ButtonDefaultHeight">32</x:Double>
-    <x:Double x:Key="ButtonSmallHeight">24</x:Double>
-    <x:Double x:Key="ButtonLargeHeight">40</x:Double>
-    <Thickness x:Key="ButtonBorderThickness">1</Thickness>
-    <CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="ButtonDefaultHeight" ResourceKey="SemiHeightControlDefault" />
+    <StaticResource x:Key="ButtonSmallHeight" ResourceKey="SemiHeightControlSmall" />
+    <StaticResource x:Key="ButtonLargeHeight" ResourceKey="SemiHeightControlLarge" />
+    <StaticResource x:Key="ButtonBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="ButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <StaticResource x:Key="IconButtonClearData" ResourceKey="SemiIconClear" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
index 2bd11d7..2be0bc3 100644
--- a/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="ButtonSpinnerIncreaseButtonGlyph" ResourceKey="SemiIconChevronUp" />
     <StaticResource x:Key="ButtonSpinnerDecreaseButtonGlyph" ResourceKey="SemiIconChevronDown" />
-    <CornerRadius x:Key="ButtonSpinnerButtonGroupCornerRadius">3</CornerRadius>
-    <Thickness x:Key="ButtonSpinnerButtonGroupBorderThickness">1</Thickness>
+    <StaticResource x:Key="ButtonSpinnerButtonGroupCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="ButtonSpinnerButtonGroupBorderThickness" ResourceKey="SemiBorderThicknessControl" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Calendar.axaml b/src/Semi.Avalonia/Themes/Shared/Calendar.axaml
index 40b2c19..47d4f95 100644
--- a/src/Semi.Avalonia/Themes/Shared/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Calendar.axaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Thickness x:Key="CalendarBorderThickness">1</Thickness>
-    <CornerRadius x:Key="CalendarCornerRadius">6</CornerRadius>
+    <StaticResource x:Key="CalendarBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="CalendarCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
     <GridLength x:Key="CalendarItemWeekDayNameHeight">40</GridLength>
     <StaticResource x:Key="CalendarItemPreviousIconGlyph" ResourceKey="SemiIconChevronLeft" />
     <StaticResource x:Key="CalendarItemNextIconGlyph" ResourceKey="SemiIconChevronRight" />
-    <FontWeight x:Key="CalendarItemCalendarButtonSelectedFontWeight">600</FontWeight>
-    <CornerRadius x:Key="CalendarItemCalendarButtonCornerRadius">3</CornerRadius>
-    <CornerRadius x:Key="CalendarItemCalendarDayButtonCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="CalendarItemCalendarButtonSelectedFontWeight" ResourceKey="SemiFontWeightBold" />
+    <StaticResource x:Key="CalendarItemCalendarButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="CalendarItemCalendarDayButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <x:Double x:Key="CalendarMinWidth">240</x:Double>
     <x:Double x:Key="CalendarMinHeight">250</x:Double>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
index 2aa79c0..1e9852b 100644
--- a/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="CalendarDatePickerIconGlyph" ResourceKey="SemiIconCalendar" />
-    <Thickness x:Key="CalendarDatePickerBorderThickness">1</Thickness>
-    <CornerRadius x:Key="CalendarDatePickerCornerRadius">3</CornerRadius>
-    <x:Double x:Key="CalendarDatePickerDefaultHeight">32</x:Double>
-    <x:Double x:Key="CalendarDatePickerSmallHeight">24</x:Double>
-    <x:Double x:Key="CalendarDatePickerLargeHeight">40</x:Double>
+    <StaticResource x:Key="CalendarDatePickerBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="CalendarDatePickerCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="CalendarDatePickerDefaultHeight" ResourceKey="SemiHeightControlDefault" />
+    <StaticResource x:Key="CalendarDatePickerSmallHeight" ResourceKey="SemiHeightControlSmall" />
+    <StaticResource x:Key="CalendarDatePickerLargeHeight" ResourceKey="SemiHeightControlLarge" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml b/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
index 09055dc..b690426 100644
--- a/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
@@ -1,16 +1,16 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:Double x:Key="CheckBoxFontSize">14</x:Double>
+    <StaticResource x:Key="CheckBoxFontSize" ResourceKey="SemiFontSizeRegular" />
     <x:Double x:Key="CheckBoxBoxWidth">16</x:Double>
     <x:Double x:Key="CheckBoxBoxHeight">16</x:Double>
     <Thickness x:Key="CheckBoxBoxMargin">0 2 0 0</Thickness>
     <Thickness x:Key="CheckBoxContentMargin">8 0 0 0</Thickness>
     <x:Double x:Key="CheckBoxBoxGlyphWidth">16</x:Double>
     <x:Double x:Key="CheckBoxBoxGlyphHeight">16</x:Double>
-    <CornerRadius x:Key="CheckBoxBoxCornerRadius">3</CornerRadius>
-    <Thickness x:Key="CheckBoxBoxBorderThickness">1</Thickness>
+    <StaticResource x:Key="CheckBoxBoxCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="CheckBoxBoxBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <StaticResource x:Key="CheckBoxCheckGlyph" ResourceKey="SemiIconCheckBoxTick" />
     <StaticResource x:Key="CheckBoxIndeterminateGlyph" ResourceKey="SemiIconCheckBoxIndeterminate" />
-    <Thickness x:Key="CheckBoxCardBorderThickness">1</Thickness>
+    <StaticResource x:Key="CheckBoxCardBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <Thickness x:Key="CheckBoxCardPadding">16 12</Thickness>
-    <CornerRadius x:Key="CheckBoxCardCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="CheckBoxCardCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
index adbec94..1534907 100644
--- a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
@@ -1,16 +1,16 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
-    <Thickness x:Key="ComboBoxSelectorThickness">1</Thickness>
+    <StaticResource x:Key="ComboBoxSelectorCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="ComboBoxSelectorThickness" ResourceKey="SemiBorderThicknessControl" />
     <Thickness x:Key="ComboBoxItemDefaultPadding">12 8</Thickness>
     <Thickness x:Key="ComboBoxSelectorDefaultPadding">12 0 0 0</Thickness>
     <x:Double x:Key="ComboBoxPopupMaxDropDownHeight">504</x:Double>
-    <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
-    <CornerRadius x:Key="ComboBoxPopupBoxCornerRadius">6</CornerRadius>
+    <StaticResource x:Key="ComboBoxPopupBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="ComboBoxPopupBoxCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
     <x:Double x:Key="ComboBoxIconWidth">32</x:Double>
     <StaticResource x:Key="ComboBoxIcon" ResourceKey="SemiIconChevronDown" />
-    <Thickness x:Key="ComboBoxPopupBorderMargin">4</Thickness>
+    <StaticResource x:Key="ComboBoxPopupBorderMargin" ResourceKey="SemiThicknessExtraTight" />
     <Thickness x:Key="ComboBoxPopupBorderPadding">0 4</Thickness>
-    <x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
-    <x:Double x:Key="ComboBoxSmallHeight">24</x:Double>
-    <x:Double x:Key="ComboBoxLargeHeight">40</x:Double>
+    <StaticResource x:Key="ComboBoxDefaultHeight" ResourceKey="SemiHeightControlDefault" />
+    <StaticResource x:Key="ComboBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
+    <StaticResource x:Key="ComboBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
index d144678..48111f0 100644
--- a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
@@ -4,11 +4,11 @@
     <StaticResource x:Key="DateTimePickerAcceptGlyph" ResourceKey="SemiIconTick" />
     <StaticResource x:Key="DateTimePickerDismissGlyph" ResourceKey="SemiIconClose" />
     <x:Double x:Key="DateTimePickerListBoxItemHeight">36</x:Double>
-    <Thickness x:Key="DateTimePickerFlyoutPadding">0</Thickness>
-    <Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</Thickness>
-    <x:Double x:Key="DateTimePickerButtonSmallHeight">24</x:Double>
-    <x:Double x:Key="DateTimePickerButtonDefaultHeight">32</x:Double>
-    <x:Double x:Key="DateTimePickerButtonLargeHeight">40</x:Double>
-    <Thickness x:Key="DateTimePickerButtonBorderThickness">1</Thickness>
-    <CornerRadius x:Key="DateTimePickerButtonCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="DateTimePickerFlyoutPadding" ResourceKey="SemiThicknessNone" />
+    <StaticResource x:Key="DateTimePickerFlyoutBorderMargin" ResourceKey="SemiThicknessTight" />
+    <StaticResource x:Key="DateTimePickerButtonSmallHeight" ResourceKey="SemiFontSizeHeader3" />
+    <StaticResource x:Key="DateTimePickerButtonDefaultHeight" ResourceKey="SemiFontSizeHeader1" />
+    <StaticResource x:Key="DateTimePickerButtonLargeHeight" ResourceKey="SemiHeightControlLarge" />
+    <StaticResource x:Key="DateTimePickerButtonBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="DateTimePickerButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Expander.axaml b/src/Semi.Avalonia/Themes/Shared/Expander.axaml
index 5fe1eb2..42b9cdf 100644
--- a/src/Semi.Avalonia/Themes/Shared/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Expander.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
-    <x:Double x:Key="ExpanderIconSize">8</x:Double>
+    <StaticResource x:Key="ExpanderHeaderFontWeight" ResourceKey="SemiFontWeightBold" />
+    <StaticResource x:Key="ExpanderIconSize" ResourceKey="SemiWidthIconExtraSmall" />
     <Thickness x:Key="ExpanderIconMargin">8 0 0 0</Thickness>
     <StaticResource x:Key="ExpanderIcon" ResourceKey="SemiIconChevronDown" />
     <Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
-    <Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
+    <StaticResource x:Key="ExpanderHeaderPadding" ResourceKey="SemiThicknessTight" />
     <Thickness x:Key="ExpanderContentMargin">16 4 16 8</Thickness>
     <Thickness x:Key="ExpanderDownContentBorderThickness">0 0 0 1</Thickness>
     <Thickness x:Key="ExpanderUpContentBorderThickness">0 1 0 0</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Shared/Flyout.axaml b/src/Semi.Avalonia/Themes/Shared/Flyout.axaml
index 62aff56..dc0345a 100644
--- a/src/Semi.Avalonia/Themes/Shared/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Flyout.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <FontWeight x:Key="FlyoutFontWeight">400</FontWeight>
-    <Thickness x:Key="FlyoutBorderThickness">1</Thickness>
+    <StaticResource x:Key="FlyoutFontWeight" ResourceKey="SemiFontWeightRegular" />
+    <StaticResource x:Key="FlyoutBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <x:Double x:Key="FlyoutMinHeight">100</x:Double>
     <x:Double x:Key="FlyoutMinWidth">100</x:Double>
     <x:Double x:Key="FlyoutMaxHeight">600</x:Double>
     <x:Double x:Key="FlyoutMaxWidth">600</x:Double>
-    <CornerRadius x:Key="FlyoutCornerRadius">6</CornerRadius>
-    <Thickness x:Key="FlyoutPadding">8</Thickness>
+    <StaticResource x:Key="FlyoutCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
+    <StaticResource x:Key="FlyoutPadding" ResourceKey="SemiThicknessTight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
index 31792df..c74049b 100644
--- a/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <CornerRadius x:Key="HeaderedContentControlCornerRadius">6</CornerRadius>
-    <Thickness x:Key="HeaderedContentControlBorderThickness">1</Thickness>
-    <FontWeight x:Key="HeaderedContentControlHeaderFontWeight">600</FontWeight>
-    <Thickness x:Key="HeaderedContentControlHeaderPadding">20</Thickness>
-    <Thickness x:Key="HeaderedContentControlContentPadding">20</Thickness>
+    <StaticResource x:Key="HeaderedContentControlCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
+    <StaticResource x:Key="HeaderedContentControlBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="HeaderedContentControlHeaderFontWeight" ResourceKey="SemiFontWeightBold" />
+    <StaticResource x:Key="HeaderedContentControlHeaderPadding" ResourceKey="SemiThicknessBaseLoose" />
+    <StaticResource x:Key="HeaderedContentControlContentPadding" ResourceKey="SemiThicknessBaseLoose" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
index 093545d..3675662 100644
--- a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:Double x:Key="HyperlinkButtonFontSize">14</x:Double>
-    <FontWeight x:Key="HyperlinkButtonFontWeight">600</FontWeight>
+    <StaticResource x:Key="HyperlinkButtonFontSize" ResourceKey="SemiFontSizeRegular" />
+    <StaticResource x:Key="HyperlinkButtonFontWeight" ResourceKey="SemiFontWeightBold" />
     <x:Double x:Key="HyperlinkButtonLinkGlyphWidth">16</x:Double>
     <x:Double x:Key="HyperlinkButtonLinkGlyphHeight">16</x:Double>
     <Thickness x:Key="HyperlinkButtonLinkGlyphMargin">0 0 4 0</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Shared/Label.axaml b/src/Semi.Avalonia/Themes/Shared/Label.axaml
index ffc7296..414ecc7 100644
--- a/src/Semi.Avalonia/Themes/Shared/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Label.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Thickness x:Key="LabelTagBorderThickness">1</Thickness>
+    <StaticResource x:Key="LabelTagBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <Thickness x:Key="LabelTagSmallPadding">8 2</Thickness>
     <Thickness x:Key="LabelTagLargePadding">8 4</Thickness>
     <x:Double x:Key="LabelTagSmallHeight">20</x:Double>
     <x:Double x:Key="LabelTagLargeHeight">24</x:Double>
-    <x:Double x:Key="LabelTagFontSize">12</x:Double>
-    <CornerRadius x:Key="LabelTagSquareCornerRadius">3</CornerRadius>
-    <CornerRadius x:Key="LabelTagCircleCornerRadius">9999</CornerRadius>
+    <StaticResource x:Key="LabelTagFontSize" ResourceKey="SemiFontSizeSmall" />
+    <StaticResource x:Key="LabelTagSquareCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="LabelTagCircleCornerRadius" ResourceKey="SemiBorderRadiusFull" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Menu.axaml b/src/Semi.Avalonia/Themes/Shared/Menu.axaml
index cff702a..07044ec 100644
--- a/src/Semi.Avalonia/Themes/Shared/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Menu.axaml
@@ -4,18 +4,18 @@
     <StaticResource x:Key="MenuItemExpandIconGlyph" ResourceKey="SemiIconChevronRight" />
     <StaticResource x:Key="MenuCheckGlyph" ResourceKey="SemiIconCheckBoxTick" />
     <!--  MenuFlyout  -->
-    <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
+    <StaticResource x:Key="MenuFlyoutBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
-    <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
+    <StaticResource x:Key="MenuFlyoutCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
     <x:Double x:Key="MenuFlyoutMinHeight">16</x:Double>
     <x:Double x:Key="MenuFlyoutMinWidth">100</x:Double>
     <x:Double x:Key="MenuFlyoutMaxHeight">400</x:Double>
     <x:Double x:Key="MenuFlyoutMaxWidth">600</x:Double>
     <!--  MenuItem  -->
     <Thickness x:Key="MenuItemPadding">16 8</Thickness>
-    <CornerRadius x:Key="MenuItemCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="MenuItemCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <x:Double x:Key="MenuItemSeparatorHeight">1</x:Double>
-    <Thickness x:Key="MenuItemSeparatorMargin">2</Thickness>
+    <StaticResource x:Key="MenuItemSeparatorMargin" ResourceKey="SemiThicknessSuperTight" />
     <Thickness x:Key="MenuItemIconMargin">0 0 12 0</Thickness>
     <Thickness x:Key="MenuItemInputGestureTextMargin">4 0</Thickness>
     <Thickness x:Key="MenuItemExpandIconMargin">4 0</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
index 0a66b45..7c20b02 100644
--- a/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <x:Double x:Key="NotificationCardMinWidth">320</x:Double>
-    <Thickness x:Key="NotificationCardBorderThickness">1</Thickness>
-    <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
-    <Thickness x:Key="NotificationCardMargin">8</Thickness>
+    <StaticResource x:Key="NotificationCardBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="NotificationCardCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
+    <StaticResource x:Key="NotificationCardMargin" ResourceKey="SemiThicknessTight" />
     <Thickness x:Key="NotificationCardPadding">20 16 12 16</Thickness>
-    <x:Double x:Key="NotificationCardIconWidth">20</x:Double>
-    <x:Double x:Key="NotificationCardIconHeight">20</x:Double>
+    <StaticResource x:Key="NotificationCardIconWidth" ResourceKey="SemiFontSizeHeader4" />
+    <StaticResource x:Key="NotificationCardIconHeight" ResourceKey="SemiFontSizeHeader4" />
     <Thickness x:Key="NotificationCardIconMargin">0 0 12 0</Thickness>
     <StaticResource x:Key="NotificationCardInformationIconPathData" ResourceKey="SemiIconInfoCircle" />
     <StaticResource x:Key="NotificationCardSuccessIconPathData" ResourceKey="SemiIconTickCircle" />
     <StaticResource x:Key="NotificationCardWarningIconPathData" ResourceKey="SemiIconAlertTriangle" />
     <StaticResource x:Key="NotificationCardErrorIconPathData" ResourceKey="SemiIconAlertCircle" />
-    <x:Double x:Key="NotificationCardTitleSpacing">4</x:Double>
-    <x:Double x:Key="NotificationCardTitleFontSize">16</x:Double>
-    <FontWeight x:Key="NotificationCardTitleFontWeight">600</FontWeight>
-    <x:Double x:Key="NotificationCardMessageFontSize">14</x:Double>
-    <FontWeight x:Key="NotificationCardMessageFontWeight">400</FontWeight>
+    <StaticResource x:Key="NotificationCardTitleSpacing" ResourceKey="SemiSpacingExtraTight" />
+    <StaticResource x:Key="NotificationCardTitleFontSize" ResourceKey="SemiFontSizeHeader6" />
+    <StaticResource x:Key="NotificationCardTitleFontWeight" ResourceKey="SemiFontWeightBold" />
+    <StaticResource x:Key="NotificationCardMessageFontSize" ResourceKey="SemiFontSizeRegular" />
+    <StaticResource x:Key="NotificationCardMessageFontWeight" ResourceKey="SemiFontWeightRegular" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml b/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml
index d7c57fd..0ca8dc8 100644
--- a/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <CornerRadius x:Key="NumericUpDownCornerRadius">3</CornerRadius>
-    <x:Double x:Key="NumericUpDownDefaultHeight">32</x:Double>
-    <x:Double x:Key="NumericUpDownSmallHeight">24</x:Double>
-    <x:Double x:Key="NumericUpDownLargeHeight">40</x:Double>
+    <StaticResource x:Key="NumericUpDownCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="NumericUpDownDefaultHeight" ResourceKey="SemiHeightControlDefault" />
+    <StaticResource x:Key="NumericUpDownSmallHeight" ResourceKey="SemiHeightControlSmall" />
+    <StaticResource x:Key="NumericUpDownLargeHeight" ResourceKey="SemiHeightControlLarge" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml
index 56142f7..a3a8168 100644
--- a/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
-    <FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
+    <StaticResource x:Key="ProgressBarBackgroundCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="ProgressBarTextFontWeight" ResourceKey="SemiFontWeightBold" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml
index 586e395..605e14b 100644
--- a/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml
@@ -2,23 +2,23 @@
     <!-- RadioButton -->
     <x:Double x:Key="RadioButtonIconRadius">16</x:Double>
     <x:Double x:Key="RadioButtonGlyphRadius">6</x:Double>
-    <x:Double x:Key="RadioButtonFontSize">14</x:Double>
+    <StaticResource x:Key="RadioButtonFontSize" ResourceKey="SemiFontSizeRegular" />
     <Thickness x:Key="RadioButtonIconMargin">0 2 0 0</Thickness>
-    <x:Double x:Key="RadioButtonUncheckIconDefaultThickness">1</x:Double>
+    <StaticResource x:Key="RadioButtonUncheckIconDefaultThickness" ResourceKey="SemiBorderSpacingControl" />
     <Thickness x:Key="RadioButtonContentMargin">8 0 0 0</Thickness>
     <!-- ButtonRadioButton -->
-    <CornerRadius x:Key="RadioButtonBoxCornerRadius">3</CornerRadius>
-    <CornerRadius x:Key="RadioButtonGroupCornerRadius">3</CornerRadius>
-    <CornerRadius x:Key="RadioButtonButtonCornerRadius">3</CornerRadius>
-    <FontWeight x:Key="RadioButtonButtonFontWeight">600</FontWeight>
+    <StaticResource x:Key="RadioButtonBoxCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="RadioButtonGroupCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="RadioButtonButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+    <StaticResource x:Key="RadioButtonButtonFontWeight" ResourceKey="SemiFontWeightBold" />
     <Thickness x:Key="RadioButtonButtonSmallPadding">16 2</Thickness>
     <Thickness x:Key="RadioButtonButtonDefaultPadding">16 4</Thickness>
     <Thickness x:Key="RadioButtonButtonLargePadding">24 6</Thickness>
-    <x:Double x:Key="RadioButtonButtonSmallFontSize">12</x:Double>
-    <x:Double x:Key="RadioButtonButtonDefaultFontSize">12</x:Double>
-    <x:Double x:Key="RadioButtonButtonLargeFontSize">14</x:Double>
+    <StaticResource x:Key="RadioButtonButtonSmallFontSize" ResourceKey="SemiFontSizeSmall" />
+    <StaticResource x:Key="RadioButtonButtonDefaultFontSize" ResourceKey="SemiFontSizeSmall" />
+    <StaticResource x:Key="RadioButtonButtonLargeFontSize" ResourceKey="SemiFontSizeRegular" />
     <!-- CardRadioButton -->
-    <Thickness x:Key="RadioButtonBorderThickness">1</Thickness>
+    <StaticResource x:Key="RadioButtonBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>
-    <CornerRadius x:Key="RadioButtonCardCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="RadioButtonCardCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml
index d884e37..771973a 100644
--- a/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:Double x:Key="ScrollBarThickness">14</x:Double>
+    <StaticResource x:Key="ScrollBarThickness" ResourceKey="SemiFontSizeRegular" />
     <x:Double x:Key="ScrollBarThumbThickness">10</x:Double>
     <StaticResource x:Key="ScrollBarUpGlyph" ResourceKey="SemiIconSmallTriangleTop" />
     <StaticResource x:Key="ScrollBarDownGlyph" ResourceKey="SemiIconSmallTriangleDown" />
diff --git a/src/Semi.Avalonia/Themes/Shared/Slider.axaml b/src/Semi.Avalonia/Themes/Shared/Slider.axaml
index 7e1d107..66f92ea 100644
--- a/src/Semi.Avalonia/Themes/Shared/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Slider.axaml
@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <x:Double x:Key="SliderTrackWidth">4</x:Double>
-    <CornerRadius x:Key="SliderTrackCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="SliderTrackCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <x:Double x:Key="SliderThumbWidth">16</x:Double>
     <x:Double x:Key="SliderThumbHeight">16</x:Double>
     <CornerRadius x:Key="SliderThumbCornerRadius">24</CornerRadius>
-    <Thickness x:Key="SliderBorderThickness">0</Thickness>
+    <StaticResource x:Key="SliderBorderThickness" ResourceKey="SemiThicknessNone" />
     <x:Double x:Key="SliderTickHorizontalHeight">4</x:Double>
     <x:Double x:Key="SliderTickVerticalWidth">4</x:Double>
-    <Thickness x:Key="SliderThumbBorderThickness">2</Thickness>
+    <StaticResource x:Key="SliderThumbBorderThickness" ResourceKey="SemiThicknessSuperTight" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TabItem.axaml b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
index 9e9c07e..bd6b384 100644
--- a/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <FontWeight x:Key="TabItemSelectedFontWeight">600</FontWeight>
+    <StaticResource x:Key="TabItemSelectedFontWeight" ResourceKey="SemiFontWeightBold" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
index 827602d..3aa75c2 100644
--- a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
@@ -1,13 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:Double x:Key="TextBlockCodeFontSize">12</x:Double>
-    <x:Double x:Key="TextBlockFontSize">14</x:Double>
-    <x:Double x:Key="TextBlockTitleH1FontSize">32</x:Double>
-    <x:Double x:Key="TextBlockTitleH2FontSize">28</x:Double>
-    <x:Double x:Key="TextBlockTitleH3FontSize">24</x:Double>
-    <x:Double x:Key="TextBlockTitleH4FontSize">20</x:Double>
-    <x:Double x:Key="TextBlockTitleH5FontSize">18</x:Double>
-    <x:Double x:Key="TextBlockTitleH6FontSize">16</x:Double>
-    <FontWeight x:Key="TextBlockFontWeight">400</FontWeight>
-    <FontWeight x:Key="TextBlockTitleFontWeight">600</FontWeight>
+    <StaticResource x:Key="TextBlockCodeFontSize" ResourceKey="SemiFontSizeSmall" />
+    <StaticResource x:Key="TextBlockFontSize" ResourceKey="SemiFontSizeRegular" />
+    <StaticResource x:Key="TextBlockTitleH1FontSize" ResourceKey="SemiFontSizeHeader1" />
+    <StaticResource x:Key="TextBlockTitleH2FontSize" ResourceKey="SemiFontSizeHeader2" />
+    <StaticResource x:Key="TextBlockTitleH3FontSize" ResourceKey="SemiFontSizeHeader3" />
+    <StaticResource x:Key="TextBlockTitleH4FontSize" ResourceKey="SemiFontSizeHeader4" />
+    <StaticResource x:Key="TextBlockTitleH5FontSize" ResourceKey="SemiFontSizeHeader5" />
+    <StaticResource x:Key="TextBlockTitleH6FontSize" ResourceKey="SemiFontSizeHeader6" />
+    <StaticResource x:Key="TextBlockFontWeight" ResourceKey="SemiFontWeightRegular" />
+    <StaticResource x:Key="TextBlockTitleFontWeight" ResourceKey="SemiFontWeightBold" />
     <CornerRadius x:Key="TextBlockCodeCornerRadius">2</CornerRadius>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
index 61f7281..88047cc 100644
--- a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:Double x:Key="TextBoxDefaultHeight">32</x:Double>
-    <x:Double x:Key="TextBoxSmallHeight">24</x:Double>
-    <x:Double x:Key="TextBoxLargeHeight">40</x:Double>
-    <CornerRadius x:Key="TextBoxDefaultCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="TextBoxDefaultHeight" ResourceKey="SemiHeightControlDefault" />
+    <StaticResource x:Key="TextBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
+    <StaticResource x:Key="TextBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
+    <StaticResource x:Key="TextBoxDefaultCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 8 0</Thickness>
     <Thickness x:Key="TextBoxInnerRightContentPadding">8 0 0 0</Thickness>
     <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
-    <Thickness x:Key="TextBoxBorderThickness">1</Thickness>
+    <StaticResource x:Key="TextBoxBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <Thickness x:Key="TextBoxTextAreaContentPadding">12 5</Thickness>
     <x:Double x:Key="TextBoxTextAreaHeight">90</x:Double>
     <StaticResource x:Key="PasswordBoxRevealButtonData" ResourceKey="SemiIconEyeClosedSolid" />
diff --git a/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
index b7cc427..d73b148 100644
--- a/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <x:Double x:Key="ToggleButtonDefaultFontSize">14</x:Double>
-    <FontWeight x:Key="ToggleButtonDefaultFontWeight">600</FontWeight>
-    <Thickness x:Key="ToggleButtonBorderThickness">1</Thickness>
-    <CornerRadius x:Key="ToggleButtonCornerRadius">3</CornerRadius>
+    <StaticResource x:Key="ToggleButtonDefaultFontSize" ResourceKey="SemiFontSizeRegular" />
+    <StaticResource x:Key="ToggleButtonDefaultFontWeight" ResourceKey="SemiFontWeightBold" />
+    <StaticResource x:Key="ToggleButtonBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+    <StaticResource x:Key="ToggleButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
index a2fe5ab..fb0e239 100644
--- a/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
@@ -5,7 +5,7 @@
     <x:Double x:Key="ToggleSwitchDefaultWidth">40</x:Double>
     <x:Double x:Key="ToggleSwitchSmallWidth">26</x:Double>
     <x:Double x:Key="ToggleSwitchLargeWidth">54</x:Double>
-    <Thickness x:Key="ToggleSwitchDefaultBorderThickness">1</Thickness>
+    <StaticResource x:Key="ToggleSwitchDefaultBorderThickness" ResourceKey="SemiBorderThicknessControl" />
     <CornerRadius x:Key="ToggleSwitchDefaultCornerRadius">12</CornerRadius>
     <CornerRadius x:Key="ToggleSwitchSmallCornerRadius">8</CornerRadius>
     <CornerRadius x:Key="ToggleSwitchLargeCornerRadius">16</CornerRadius>
@@ -19,9 +19,9 @@
     <x:Double x:Key="ToggleSwitchLoadingIndicatorDefaultStrokeThickness">2</x:Double>
     <x:Double x:Key="ToggleSwitchLoadingIndicatorSmallStrokeThickness">1</x:Double>
     <x:Double x:Key="ToggleSwitchLoadingIndicatorLargeStrokeThickness">3</x:Double>
-    <x:Double x:Key="ToggleSwitchDefaultFontSize">12</x:Double>
-    <x:Double x:Key="ToggleSwitchLargeFontSize">14</x:Double>
+    <StaticResource x:Key="ToggleSwitchDefaultFontSize" ResourceKey="SemiFontSizeSmall" />
+    <StaticResource x:Key="ToggleSwitchLargeFontSize" ResourceKey="SemiFontSizeRegular" />
     <Thickness x:Key="ToggleSwitchHeaderMargin">8 4</Thickness>
     <Thickness x:Key="ToggleSwitchOnContentMargin">8 4</Thickness>
-    <x:Double x:Key="SimpleToggleSwitchFontSize">14</x:Double>
+    <StaticResource x:Key="SimpleToggleSwitchFontSize" ResourceKey="SemiFontSizeRegular" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
index 137de36..2c602d5 100644
--- a/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <CornerRadius x:Key="ToolTipCornerRadius">6</CornerRadius>
+    <StaticResource x:Key="ToolTipCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
     <Thickness x:Key="ToolTipPadding">12 8</Thickness>
     <x:Double x:Key="ToolTipMaxWidth">320</x:Double>
-    <Thickness x:Key="ToolTipBorderThickness">1</Thickness>
+    <StaticResource x:Key="ToolTipBorderThickness" ResourceKey="SemiBorderThicknessControl" />
 </ResourceDictionary>
\ No newline at end of file

From 1200c9a1c9059022a647adc0c67761825446cb09 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 2 Jan 2025 16:58:12 +0800
Subject: [PATCH 4/5] feat: index RadiusCardCornerRadius.

---
 src/Semi.Avalonia/Themes/Shared/Border.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Semi.Avalonia/Themes/Shared/Border.axaml b/src/Semi.Avalonia/Themes/Shared/Border.axaml
index c55630b..ea633c4 100644
--- a/src/Semi.Avalonia/Themes/Shared/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Border.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <CornerRadius x:Key="RadiusCardCornerRadius">4</CornerRadius>
+    <StaticResource x:Key="RadiusCardCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
     <StaticResource x:Key="ThicknessCardPadding" ResourceKey="SemiThicknessBaseLoose" />
     <StaticResource x:Key="ThicknessCardMargin" ResourceKey="SemiThicknessExtraTight" />
     <StaticResource x:Key="ThicknessCardBorderThickness" ResourceKey="SemiBorderThicknessControl" />

From 06d9e35adda41ddbf1a4f3cce02a2422e6711822 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:44:28 +0800
Subject: [PATCH 5/5] misc: delete Base.axaml file.

---
 src/Semi.Avalonia/Index.axaml                   |  1 -
 src/Semi.Avalonia/SemiTheme.axaml               |  1 -
 src/Semi.Avalonia/Themes/Base.axaml             | 13 -------------
 src/Semi.Avalonia/Themes/Dark/Window.axaml      |  1 +
 src/Semi.Avalonia/Themes/Light/Window.axaml     |  1 +
 src/Semi.Avalonia/Themes/Shared/TextBlock.axaml |  1 +
 src/Semi.Avalonia/Themes/Shared/Window.axaml    |  2 ++
 src/Semi.Avalonia/Tokens/Variables.axaml        |  5 +++++
 8 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 src/Semi.Avalonia/Themes/Base.axaml

diff --git a/src/Semi.Avalonia/Index.axaml b/src/Semi.Avalonia/Index.axaml
index c76abf6..334aa54 100644
--- a/src/Semi.Avalonia/Index.axaml
+++ b/src/Semi.Avalonia/Index.axaml
@@ -13,7 +13,6 @@
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Variables.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
diff --git a/src/Semi.Avalonia/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml
index 20cb78b..eea19b2 100644
--- a/src/Semi.Avalonia/SemiTheme.axaml
+++ b/src/Semi.Avalonia/SemiTheme.axaml
@@ -14,7 +14,6 @@
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Variables.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Base.axaml b/src/Semi.Avalonia/Themes/Base.axaml
deleted file mode 100644
index 2489219..0000000
--- a/src/Semi.Avalonia/Themes/Base.axaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Default">
-            <SolidColorBrush x:Key="DefaultForeground" Color="#1C1F23" />
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="Dark">
-            <SolidColorBrush x:Key="DefaultForeground" Color="#F9F9F9" />
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-    <x:Double x:Key="DefaultFontSize">14</x:Double>
-    <FontFamily x:Key="DefaultFontFamily">Inter, -apple-system,BlinkMacSystemFont,PingFang SC, Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,Helvetica,Arial,sans-serif</FontFamily>
-    <FontFamily x:Key="CodeFontFamily">Cascadia Code, Consolas, Inconsolata, monospace</FontFamily>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Window.axaml b/src/Semi.Avalonia/Themes/Dark/Window.axaml
index 1f95612..b9d1483 100644
--- a/src/Semi.Avalonia/Themes/Dark/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Window.axaml
@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
     <StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DefaultForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Window.axaml b/src/Semi.Avalonia/Themes/Light/Window.axaml
index 1f95612..b9d1483 100644
--- a/src/Semi.Avalonia/Themes/Light/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Window.axaml
@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
     <StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DefaultForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
index 3aa75c2..6fdefa0 100644
--- a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
@@ -10,4 +10,5 @@
     <StaticResource x:Key="TextBlockFontWeight" ResourceKey="SemiFontWeightRegular" />
     <StaticResource x:Key="TextBlockTitleFontWeight" ResourceKey="SemiFontWeightBold" />
     <CornerRadius x:Key="TextBlockCodeCornerRadius">2</CornerRadius>
+    <FontFamily x:Key="CodeFontFamily">Cascadia Code, Consolas, Inconsolata, monospace</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Window.axaml b/src/Semi.Avalonia/Themes/Shared/Window.axaml
index 9b91be8..6c18d0f 100644
--- a/src/Semi.Avalonia/Themes/Shared/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Window.axaml
@@ -1,2 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="DefaultFontSize" ResourceKey="SemiFontSizeRegular" />
+    <StaticResource x:Key="DefaultFontFamily" ResourceKey="SemiFontFamilyRegular" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/Variables.axaml b/src/Semi.Avalonia/Tokens/Variables.axaml
index c155e99..f3de46d 100644
--- a/src/Semi.Avalonia/Tokens/Variables.axaml
+++ b/src/Semi.Avalonia/Tokens/Variables.axaml
@@ -61,4 +61,9 @@
     <FontWeight x:Key="SemiFontWeightLight">200</FontWeight> <!-- 字重 - 轻 -->
     <FontWeight x:Key="SemiFontWeightRegular">400</FontWeight> <!-- 字重 - 常规 -->
     <FontWeight x:Key="SemiFontWeightBold">600</FontWeight> <!-- 字重 - 粗 -->
+    <FontFamily x:Key="SemiFontFamilyRegular">
+        Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
+        Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,
+        Helvetica, Arial, sans-serif
+    </FontFamily>
 </ResourceDictionary>
\ No newline at end of file