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