From 3273fb1e910fb287c6ace262aea80939e813982d Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 19 Jul 2023 02:40:17 +0800
Subject: [PATCH] feat: extract non-theme resources to shared directory.

---
 src/Semi.Avalonia/Semi.Avalonia.csproj        | 22 ++++------
 .../Themes/Dark/AutoCompleteBox.axaml         | 11 +----
 src/Semi.Avalonia/Themes/Dark/Border.axaml    | 12 +-----
 src/Semi.Avalonia/Themes/Dark/Button.axaml    | 20 +--------
 .../Themes/Dark/ButtonSpinner.axaml           |  9 +---
 src/Semi.Avalonia/Themes/Dark/Calendar.axaml  | 20 +--------
 .../Themes/Dark/CalendarDatePicker.axaml      | 11 -----
 .../Themes/Dark/CaptionButtons.axaml          |  9 +---
 src/Semi.Avalonia/Themes/Dark/Carousel.axaml  |  9 +---
 src/Semi.Avalonia/Themes/Dark/CheckBox.axaml  | 25 +----------
 src/Semi.Avalonia/Themes/Dark/ComboBox.axaml  | 14 -------
 src/Semi.Avalonia/Themes/Dark/Dark.axaml      |  9 +---
 .../Themes/Dark/DataValidationErrors.axaml    |  3 +-
 .../Themes/Dark/DateTimePickerShared.axaml    | 27 +-----------
 .../Themes/Dark/DropDownButton.axaml          |  4 --
 src/Semi.Avalonia/Themes/Dark/Expander.axaml  | 21 +---------
 src/Semi.Avalonia/Themes/Dark/Flyout.axaml    | 17 +-------
 .../Themes/Dark/GridSplitter.axaml            |  3 +-
 .../Themes/Dark/HeaderedContentControl.axaml  |  4 +-
 src/Semi.Avalonia/Themes/Dark/Label.axaml     | 17 +-------
 src/Semi.Avalonia/Themes/Dark/ListBox.axaml   |  7 +---
 .../Themes/Dark/ManagedFileChooser.axaml      |  4 +-
 src/Semi.Avalonia/Themes/Dark/Menu.axaml      | 28 +------------
 .../Themes/Dark/NotificationCard.axaml        | 13 +-----
 src/Semi.Avalonia/Themes/Dark/Palette.axaml   |  6 +--
 .../Themes/Dark/ProgressBar.axaml             |  5 +--
 .../Themes/Dark/RadioButton.axaml             | 29 +------------
 .../Themes/Dark/RefreshContainer.axaml        |  5 +--
 .../Themes/Dark/ScrollViewer.axaml            | 12 +-----
 src/Semi.Avalonia/Themes/Dark/Slider.axaml    | 19 ++-------
 .../Themes/Dark/SplitButton.axaml             |  8 ----
 src/Semi.Avalonia/Themes/Dark/SplitView.axaml | 13 +-----
 src/Semi.Avalonia/Themes/Dark/TabItem.axaml   |  4 +-
 src/Semi.Avalonia/Themes/Dark/TextBlock.axaml | 30 +------------
 src/Semi.Avalonia/Themes/Dark/TextBox.axaml   | 31 +-------------
 .../Themes/Dark/ToggleButton.axaml            | 19 ++-------
 .../Themes/Dark/ToggleSwitch.axaml            | 22 +---------
 src/Semi.Avalonia/Themes/Dark/Tooltip.axaml   | 13 +-----
 src/Semi.Avalonia/Themes/Dark/TreeView.axaml  | 16 +------
 src/Semi.Avalonia/Themes/Dark/Window.axaml    |  3 +-
 src/Semi.Avalonia/Themes/Index.axaml          |  1 +
 .../Themes/Light/AutoCompleteBox.axaml        | 11 +----
 src/Semi.Avalonia/Themes/Light/Border.axaml   | 14 ++-----
 src/Semi.Avalonia/Themes/Light/Button.axaml   | 18 +-------
 .../Themes/Light/ButtonSpinner.axaml          |  7 ----
 src/Semi.Avalonia/Themes/Light/Calendar.axaml | 18 +-------
 .../Themes/Light/CalendarDatePicker.axaml     | 13 +-----
 .../Themes/Light/CaptionButtons.axaml         |  9 +---
 src/Semi.Avalonia/Themes/Light/Carousel.axaml |  9 +---
 src/Semi.Avalonia/Themes/Light/CheckBox.axaml | 24 +----------
 src/Semi.Avalonia/Themes/Light/ComboBox.axaml | 16 +------
 .../Themes/Light/DataValidationErrors.axaml   |  3 +-
 .../Themes/Light/DatePicker.axaml             |  4 --
 .../Themes/Light/DateTimePickerShared.axaml   | 24 +----------
 src/Semi.Avalonia/Themes/Light/Expander.axaml | 20 +--------
 src/Semi.Avalonia/Themes/Light/Flyout.axaml   | 17 +-------
 .../Themes/Light/GridSplitter.axaml           |  3 +-
 .../Themes/Light/HeaderedContentControl.axaml |  4 +-
 src/Semi.Avalonia/Themes/Light/Label.axaml    | 18 +-------
 src/Semi.Avalonia/Themes/Light/Light.axaml    |  9 +---
 src/Semi.Avalonia/Themes/Light/ListBox.axaml  |  7 +---
 .../Themes/Light/ManagedFileChooser.axaml     |  4 +-
 src/Semi.Avalonia/Themes/Light/Menu.axaml     | 29 +------------
 .../Themes/Light/NotificationCard.axaml       | 15 +------
 .../Themes/Light/NumericUpDown.axaml          |  7 ----
 src/Semi.Avalonia/Themes/Light/Palette.axaml  |  4 +-
 .../Themes/Light/ProgressBar.axaml            |  5 +--
 .../Themes/Light/RadioButton.axaml            | 28 +------------
 .../Themes/Light/RefreshContainer.axaml       |  5 +--
 .../Themes/Light/ScrollViewer.axaml           | 13 +-----
 src/Semi.Avalonia/Themes/Light/Slider.axaml   | 18 +-------
 .../Themes/Light/SplitButton.axaml            |  8 ----
 .../Themes/Light/SplitView.axaml              | 13 +-----
 .../Themes/Light/TabControl.axaml             |  3 --
 src/Semi.Avalonia/Themes/Light/TabItem.axaml  |  9 +---
 .../Themes/Light/TextBlock.axaml              | 30 +------------
 src/Semi.Avalonia/Themes/Light/TextBox.axaml  | 27 +-----------
 .../Themes/Light/TimePicker.axaml             |  7 ----
 .../Themes/Light/ToggleButton.axaml           | 17 +-------
 .../Themes/Light/ToggleSwitch.axaml           | 25 +----------
 src/Semi.Avalonia/Themes/Light/Tooltip.axaml  | 13 +-----
 src/Semi.Avalonia/Themes/Light/TreeView.axaml | 16 +------
 src/Semi.Avalonia/Themes/Light/Window.axaml   |  3 +-
 .../Themes/Shared/AutoCompleteBox.axaml       | 11 +++++
 src/Semi.Avalonia/Themes/Shared/Border.axaml  |  7 ++++
 src/Semi.Avalonia/Themes/Shared/Button.axaml  | 12 ++++++
 .../Themes/Shared/ButtonSpinner.axaml         |  7 ++++
 .../Themes/Shared/Calendar.axaml              | 15 +++++++
 .../Themes/Shared/CalendarDatePicker.axaml    | 12 ++++++
 .../Themes/Shared/CaptionButtons.axaml        |  8 ++++
 .../Themes/Shared/Carousel.axaml              |  7 ++++
 .../Themes/Shared/CheckBox.axaml              | 19 +++++++++
 .../Themes/Shared/ComboBox.axaml              | 17 ++++++++
 .../Themes/{Dark => Shared}/DatePicker.axaml  |  3 +-
 .../Themes/Shared/DateTimePickerShared.axaml  | 21 ++++++++++
 .../{Light => Shared}/DropDownButton.axaml    |  3 +-
 .../Themes/Shared/Expander.axaml              | 15 +++++++
 src/Semi.Avalonia/Themes/Shared/Flyout.axaml  | 11 +++++
 .../Shared/HeaderedContentControl.axaml       |  3 ++
 src/Semi.Avalonia/Themes/Shared/Label.axaml   | 10 +++++
 src/Semi.Avalonia/Themes/Shared/ListBox.axaml |  4 ++
 .../Themes/Shared/ManagedFileChooser.axaml    |  3 ++
 src/Semi.Avalonia/Themes/Shared/Menu.axaml    | 24 +++++++++++
 .../Themes/Shared/NotificationCard.axaml      | 10 +++++
 .../{Dark => Shared}/NumericUpDown.axaml      |  3 +-
 .../Themes/Shared/ProgressBar.axaml           |  4 ++
 .../Themes/Shared/RadioButton.axaml           | 25 +++++++++++
 .../Themes/Shared/RefreshContainer.axaml      |  4 ++
 .../Themes/Shared/ScrollViewer.axaml          |  8 ++++
 src/Semi.Avalonia/Themes/Shared/Slider.axaml  | 13 ++++++
 .../Themes/Shared/SplitButton.axaml           |  4 ++
 .../Themes/Shared/SplitView.axaml             | 10 +++++
 .../TabControl.axaml => Shared/TabItem.axaml} |  4 +-
 .../Themes/Shared/TextBlock.axaml             | 25 +++++++++++
 src/Semi.Avalonia/Themes/Shared/TextBox.axaml | 25 +++++++++++
 .../Themes/{Dark => Shared}/TimePicker.axaml  |  8 +---
 .../Themes/Shared/ToggleButton.axaml          | 10 +++++
 .../Themes/Shared/ToggleSwitch.axaml          | 17 ++++++++
 src/Semi.Avalonia/Themes/Shared/Tooltip.axaml |  7 ++++
 .../Themes/Shared/TreeView.axaml              | 10 +++++
 src/Semi.Avalonia/Themes/Shared/_index.axaml  | 42 +++++++++++++++++++
 121 files changed, 551 insertions(+), 992 deletions(-)
 delete mode 100644 src/Semi.Avalonia/Themes/Dark/DropDownButton.axaml
 delete mode 100644 src/Semi.Avalonia/Themes/Dark/SplitButton.axaml
 delete mode 100644 src/Semi.Avalonia/Themes/Light/DatePicker.axaml
 delete mode 100644 src/Semi.Avalonia/Themes/Light/NumericUpDown.axaml
 delete mode 100644 src/Semi.Avalonia/Themes/Light/SplitButton.axaml
 delete mode 100644 src/Semi.Avalonia/Themes/Light/TabControl.axaml
 delete mode 100644 src/Semi.Avalonia/Themes/Light/TimePicker.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Border.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Button.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Calendar.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/CaptionButtons.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Carousel.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
 rename src/Semi.Avalonia/Themes/{Dark => Shared}/DatePicker.axaml (95%)
 create mode 100644 src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
 rename src/Semi.Avalonia/Themes/{Light => Shared}/DropDownButton.axaml (89%)
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Expander.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Flyout.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Label.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/ListBox.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Menu.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
 rename src/Semi.Avalonia/Themes/{Dark => Shared}/NumericUpDown.axaml (87%)
 create mode 100644 src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/RadioButton.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/RefreshContainer.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Slider.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/SplitButton.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/SplitView.axaml
 rename src/Semi.Avalonia/Themes/{Dark/TabControl.axaml => Shared/TabItem.axaml} (56%)
 create mode 100644 src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/TextBox.axaml
 rename src/Semi.Avalonia/Themes/{Dark => Shared}/TimePicker.axaml (63%)
 create mode 100644 src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/TreeView.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Shared/_index.axaml

diff --git a/src/Semi.Avalonia/Semi.Avalonia.csproj b/src/Semi.Avalonia/Semi.Avalonia.csproj
index 9579c92..166c1f0 100644
--- a/src/Semi.Avalonia/Semi.Avalonia.csproj
+++ b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -1,18 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
-  <Import Project="../Package.props" />
-  
-  <PropertyGroup>
-    <Title>Semi.Avalonia</Title>
-    <PackageReleaseNotes>Update to Avalonia 11.0.0-rc1</PackageReleaseNotes>
-  </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-  </ItemGroup>
+    <Import Project="../Package.props"/>
 
-  <ItemGroup>
-    <Folder Include="Themes\Styles" />
-  </ItemGroup>
+    <PropertyGroup>
+        <Title>Semi.Avalonia</Title>
+        <PackageReleaseNotes>Update to Avalonia 11.0.0-rc1</PackageReleaseNotes>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+    </ItemGroup>
 
 </Project>
diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
index 10f580e..3aba7b2 100644
--- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
@@ -1,13 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="#35363C" />
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#F9F9F9" />
-    <Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
-    <Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
-    <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
-    <CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</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>
-    <x:Double x:Key="AutoCompleteMaxDropdownHeight">600</x:Double>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml
index 74a762b..4684198 100644
--- a/src/Semi.Avalonia/Themes/Dark/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml
@@ -1,12 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="BorderCardBackground" Color="#232429" />
     <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="White" />
-    <CornerRadius x:Key="RadiusCardCornerRadius">4</CornerRadius>
-    <Thickness x:Key="ThicknessCardPadding">20</Thickness>
-    <Thickness x:Key="ThicknessCardMargin">4</Thickness>
-    <Thickness x:Key="ThicknessCardBorderThickness">1</Thickness>
-    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml
index 131c68d..31e56fc 100644
--- a/src/Semi.Avalonia/Themes/Dark/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml
@@ -1,19 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="using:System">
-    <!--  Add Resources Here  -->
-    <sys:Double x:Key="ButtonDefaultFontSize">14</sys: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>
-
-    <Thickness x:Key="ButtonBorderThickness">1</Thickness>
-
-    <CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Light  -->
     <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#40B4F3" />
@@ -32,7 +17,6 @@
     <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Color="Transparent" />
-
     <!--  end Light  -->
 
     <!--  Solid  -->
@@ -91,4 +75,4 @@
 
     <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="#FF2E3238" />
     <!--  end Solid  -->
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
index 96149dd..2aeac3b 100644
--- a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
@@ -1,15 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="ButtonSpinnerIncreaseButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
-    <PathGeometry x:Key="ButtonSpinnerDecreaseButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="#FF35363C" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.04" Color="#FF2E3238" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#F9F9F9" />
-
-    <CornerRadius x:Key="ButtonSpinnerButtonGroupCornerRadius">3</CornerRadius>
-    <Thickness x:Key="ButtonSpinnerButtonGroupBorderThickness">1</Thickness>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
index a87a6b3..e9f48c2 100644
--- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
@@ -1,37 +1,24 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="using:System">
-    <!--  Add Resources Here  -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CalendarBackground" Color="#232429" />
     <SolidColorBrush x:Key="CalendarForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="#F9F9F9" />
-    <Thickness x:Key="CalendarBorderThickness">1</Thickness>
-    <CornerRadius x:Key="CalendarCornerRadius">6</CornerRadius>
-    <GridLength x:Key="CalendarItemWeekDayNameHeight">40</GridLength>
     <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.6" Color="#F9F9F9" />
-    <PathGeometry x:Key="CalendarItemPreviousIconGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</PathGeometry>
-    <PathGeometry x:Key="CalendarItemNextIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
 
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="#232429" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
-    <Thickness x:Key="CalendarItemCalendarButtonBorderThickness">0</Thickness>
     <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Opacity="0.20" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="#232429" />
-    <FontWeight x:Key="CalendarItemCalendarButtonSelectedFontWeight">600</FontWeight>
     <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Opacity="0.65" Color="#F9F9F9" />
-    <CornerRadius x:Key="CalendarItemCalendarButtonCornerRadius">3</CornerRadius>
 
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
-    <CornerRadius x:Key="CalendarItemCalendarDayButtonCornerRadius">3</CornerRadius>
 
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Opacity="0.20" Color="White" />
@@ -45,7 +32,4 @@
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Opacity="0.6" Color="#F9F9F9" />
-
-    <sys:Double x:Key="CalendarMinWidth">240</sys:Double>
-    <sys:Double x:Key="CalendarMinHeight">250</sys:Double>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
index 3c2ff1e..f24cd9e 100644
--- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -1,26 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--    -->
     <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#F9F9F9" />
-    <PathGeometry x:Key="CalendarDatePickerIconGlyph">M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z</PathGeometry>
     <SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="CalendarDatePickerPressedBackground" Opacity="0.2" Color="White" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="Transparent" />
-    <Thickness x:Key="CalendarDatePickerBorderThickness">1</Thickness>
-    <CornerRadius x:Key="CalendarDatePickerCornerRadius">3</CornerRadius>
     <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
-    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
-    <x:Double x:Key="CalendarDatePickerInnerDefaultHeight">30</x:Double>
-    <x:Double x:Key="CalendarDatePickerInnerSmallHeight">22</x:Double>
-    <x:Double x:Key="CalendarDatePickerInnerLargeHeight">38</x:Double>
-    <x:Double x:Key="CalendarDatePickerDefaultHeight">32</x:Double>
-    <x:Double x:Key="CalendarDatePickerSmallHeight">24</x:Double>
-    <x:Double x:Key="CalendarDatePickerLargeHeight">40</x:Double>
 
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.12" Color="White" />
diff --git a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
index 2b51f15..8c54002 100644
--- a/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CaptionButtons.axaml
@@ -1,14 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="WindowCloseIconGlyph">M13.46,12L19,17.54V19H17.54L12,13.46L6.46,19H5V17.54L10.54,12L5,6.46V5H6.46L12,10.54L17.54,5H19V6.46L13.46,12Z</PathGeometry>
-    <PathGeometry x:Key="WindowMaximizeGlyph">M4,4H20V20H4V4M6,8V18H18V8H6Z</PathGeometry>
-    <PathGeometry x:Key="WindowMinimizeGlyph">M20,14H4V10H20</PathGeometry>
-    <PathGeometry x:Key="WindowRestoreGlyph">M4,8H8V4H20V16H16V20H4V8M16,8V14H18V6H10V8H16M6,12V18H14V12H6Z</PathGeometry>
-    <PathGeometry x:Key="WindowExpandGlyph">M10,21V19H6.41L10.91,14.5L9.5,13.09L5,17.59V14H3V21H10M14.5,10.91L19,6.41V10H21V3H14V5H17.59L13.09,9.5L14.5,10.91Z</PathGeometry>
-    <PathGeometry x:Key="WindowCollapseGlyph">M19.5,3.09L15,7.59V4H13V11H20V9H16.41L20.91,4.5L19.5,3.09M4,13V15H7.59L3.09,19.5L4.5,20.91L9,16.41V20H11V13H4Z</PathGeometry>
     <SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="CaptionButtonPressedBackground" Opacity="0.20" Color="White" />
     <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="#FD9983" />
     <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="#FDBEAC" />
     <SolidColorBrush x:Key="CaptionButtonForeground" Opacity="0.6" Color="#F9F9F9" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Carousel.axaml b/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
index fb02b11..561a92f 100644
--- a/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
@@ -1,7 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="CarouselButtonGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</PathGeometry>
-
     <SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
     <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Opacity="0.7" Color="Black" />
     <SolidColorBrush x:Key="CarouselButtonPressedForeground" Opacity="0.7" Color="Black" />
@@ -9,8 +6,4 @@
     <SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Opacity="0.7" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
-
-    <x:Double x:Key="CarouselIndicatorLineSelectedWidth">48</x:Double>
-    <x:Double x:Key="CarouselIndicatorSelectedHeight">8</x:Double>
-    <Thickness x:Key="CarouselButtonMargin">8</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
index fa48e7e..4c4bb32 100644
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CheckBoxForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CheckBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
@@ -27,20 +24,6 @@
     <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#135cb8" />
     <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#135cb8" />
 
-    <sys:Double x:Key="CheckBoxFontSize">14</sys:Double>
-    <sys:Double x:Key="CheckBoxBoxWidth">16</sys:Double>
-    <sys:Double x:Key="CheckBoxBoxHeight">16</sys:Double>
-    <sys:Double x:Key="CheckBoxBoxGlyphWidth">10</sys:Double>
-    <sys:Double x:Key="CheckBoxBoxGlyphHeight">10</sys:Double>
-    <FontWeight x:Key="CheckBoxFontWeight">400</FontWeight>
-
-    <CornerRadius x:Key="CheckBoxBoxCornerRadius">3</CornerRadius>
-    <Thickness x:Key="CheckBoxContentMargin">8 0 0 0</Thickness>
-    <Thickness x:Key="CheckBoxBoxBorderThickness">1</Thickness>
-
-    <PathGeometry x:Key="CheckBoxCheckGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
-    <PathGeometry x:Key="CheckBoxIndeterminateGlyph">M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z</PathGeometry>
-
     <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
     <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#FF54A9FF" />
     <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#FF135CB8" />
@@ -48,8 +31,4 @@
     <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#FF7FC1FF" />
     <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#FFA9D7FF" />
-
-    <Thickness x:Key="CheckBoxCardBorderThickness">1</Thickness>
-    <Thickness x:Key="CheckBoxCardPadding">16</Thickness>
-    <CornerRadius x:Key="CheckBoxCardCornerRadius">3</CornerRadius>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 4a5cb36..6c5ec25 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -7,8 +7,6 @@
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#A9D7FF" />
 
-    <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
-
     <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#F9F9F9" />
@@ -16,13 +14,8 @@
 
     <SolidColorBrush x:Key="ComboBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
-    <Thickness x:Key="ComboBoxItemDefaultPadding">8 4</Thickness>
-    <Thickness x:Key="ComboBoxSelectorDefaultPadding">8 0</Thickness>
-
-    <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
     <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="#35363C" />
     <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="#F9F9F9" />
-    <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
 
     <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
 
@@ -34,13 +27,6 @@
 
     <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <PathGeometry x:Key="ComboBoxIcon">
-        M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z
-    </PathGeometry>
-
-    <x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
-    <x:Double x:Key="ComboBoxSmallHeight">24</x:Double>
-    <x:Double x:Key="ComboBoxLargeHeight">40</x:Double>
 
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.12" Color="White" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Dark.axaml b/src/Semi.Avalonia/Themes/Dark/Dark.axaml
index 03fb808..7fbfa18 100644
--- a/src/Semi.Avalonia/Themes/Dark/Dark.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Dark.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Palette.axaml" />
         <!--  Controls  -->
@@ -14,9 +13,7 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/CheckBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ComboBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DatePicker.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DropDownButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Expander.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/GridSplitter.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml" />
@@ -25,19 +22,15 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Menu.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/NotificationCard.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/NumericUpDown.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ProgressBar.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/RadioButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/RefreshContainer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ScrollViewer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Slider.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/SplitButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/SplitView.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TabControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TabItem.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TextBlock.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TextBox.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/TimePicker.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ToggleButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Tooltip.axaml" />
@@ -45,4 +38,4 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Window.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Flyout.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
index a54f303..45a1849 100644
--- a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FFFC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FFFC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FFFC725A" />
@@ -9,4 +8,4 @@
     <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FFFC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FFFC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FFFC725A" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index f8a3916..87be000 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -1,11 +1,6 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="#35363C" />
-    <Thickness x:Key="DateTimePickerListItemPadding">0 3 0 6</Thickness>
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#F9F9F9" />
@@ -14,13 +9,7 @@
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.20" Color="White" />
 
-    <PathGeometry x:Key="DateTimePickerButtonUpGlyph">M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z</PathGeometry>
-    <PathGeometry x:Key="DateTimePickerButtonDownGlyph">M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z</PathGeometry>
-    <PathGeometry x:Key="DateTimePickerAcceptGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
-    <PathGeometry x:Key="DateTimePickerDismissGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</PathGeometry>
-
     <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
-    <sys:Double x:Key="DateTimePickerListBoxItemHeight">30</sys:Double>
 
 
     <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
@@ -34,16 +23,4 @@
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
-
-    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
-    <Thickness x:Key="DateTimePickerFlyoutPadding">16 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>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/DropDownButton.axaml b/src/Semi.Avalonia/Themes/Dark/DropDownButton.axaml
deleted file mode 100644
index cd4f571..0000000
--- a/src/Semi.Avalonia/Themes/Dark/DropDownButton.axaml
+++ /dev/null
@@ -1,4 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="DropDownButtonIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Expander.axaml b/src/Semi.Avalonia/Themes/Dark/Expander.axaml
index 3fa9be2..150d63e 100644
--- a/src/Semi.Avalonia/Themes/Dark/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Expander.axaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
@@ -10,18 +7,4 @@
     <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="ExpanderContentForeground" Opacity="0.8" Color="#F9F9F9" />
-
-    <FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
-    <sys:Double x:Key="ExpanderIconSize">8</sys:Double>
-
-    <CornerRadius x:Key="ExpanderHeaderCornerRadius">3</CornerRadius>
-    <Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
-    <Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
-    <Thickness x:Key="ExpanderEndIconMargin">0 0 8 0</Thickness>
-    <Thickness x:Key="ExpanderContentMargin">16 4 16 8</Thickness>
-    <Thickness x:Key="ExpanderFrontIconMargin">8 0 0 0</Thickness>
-    <Thickness x:Key="ExpanderDownContentBorderThickness">0 0 0 1</Thickness>
-    <Thickness x:Key="ExpanderUpContentBorderThickness">0 1 0 0</Thickness>
-    <Thickness x:Key="ExpanderLeftContentBorderThickness">1 0 0 0</Thickness>
-    <Thickness x:Key="ExpanderRightContentBorderThickness">0 0 1 0</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
index d88a2fc..e8f8b6b 100644
--- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
@@ -1,18 +1,5 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="FlyoutBackground" Color="#35363C" />
     <SolidColorBrush x:Key="FlyoutForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="#F9F9F9" />
-    <FontWeight x:Key="FlyoutFontWeight">400</FontWeight>
-    <Thickness x:Key="FlyoutBorderThickness">1</Thickness>
-    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
-    <sys:Double x:Key="FlyoutMinHeight">100</sys:Double>
-    <sys:Double x:Key="FlyoutMinWidth">100</sys:Double>
-    <sys:Double x:Key="FlyoutMaxHeight">600</sys:Double>
-    <sys:Double x:Key="FlyoutMaxWidth">600</sys:Double>
-    <CornerRadius x:Key="FlyoutCornerRadius">6</CornerRadius>
-    <Thickness x:Key="FlyoutPadding">8</Thickness>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
index 68006be..f7b2f61 100644
--- a/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/GridSplitter.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="GridSplitterBackground" Opacity="0.4" Color="#F9F9F9" />
     <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="#0A4694" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
index 5a991bb..79315cc 100644
--- a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
@@ -1,6 +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">
     <SolidColorBrush x:Key="HeaderedContentControlDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="HeaderedContentControlDefaultBorderBrush" Opacity="0.08" Color="#F9F9F9" />
-    <CornerRadius x:Key="HeaderedContentControlCornerRadius">4</CornerRadius>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml
index fb9815d..1a9c36f 100644
--- a/src/Semi.Avalonia/Themes/Dark/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml
@@ -1,18 +1,5 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Typography related resources are combined with TextBlock  -->
-
-    <Thickness x:Key="LabelTagBorderThickness">1</Thickness>
-    <Thickness x:Key="LabelTagSmallPadding">8 2</Thickness>
-    <Thickness x:Key="LabelTagLargePadding">8 4</Thickness>
-    <sys:Double x:Key="LabelTagSmallHeight">20</sys:Double>
-    <sys:Double x:Key="LabelTagLargeHeight">24</sys:Double>
-    <sys:Double x:Key="LabelTagFontSize">12</sys:Double>
-    <CornerRadius x:Key="LabelTagSquareCornerRadius">3</CornerRadius>
-    <CornerRadius x:Key="LabelTagCircleCornerRadius">9999</CornerRadius>
-
     <SolidColorBrush x:Key="LabelTagLightRedForeground" Color="#FEE0D5" />
     <SolidColorBrush x:Key="LabelTagLightRedBackground" Opacity="0.15" Color="#FC725A" />
     <SolidColorBrush x:Key="LabelTagLightPinkForeground" Color="#FBD3DC" />
@@ -106,6 +93,4 @@
     <SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="#4F5159" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#41464C" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#F9F9F9" />
-
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
index 2bcface..15a5cc8 100644
--- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
@@ -1,7 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Thickness x:Key="ListBoxItemDefaultPadding">8 4</Thickness>
-
     <SolidColorBrush x:Key="ListBoxItemDefaultForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ListBoxItemIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ListBoxItemIconHoverForeground" Color="#F9F9F9" />
@@ -14,6 +11,4 @@
     <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#FF54A9FF" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <CornerRadius x:Key="ListBoxItemCornerRadius">3</CornerRadius>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
index fd95927..969ecec 100644
--- a/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ManagedFileChooserSeparatorBorderBrush" Opacity="0.08" Color="#F9F9F9" />
-    <PathGeometry x:Key="ManagedFileChooserUpButtonGlyph">M20 18V20H13.5C9.91 20 7 17.09 7 13.5V7.83L3.91 10.92L2.5 9.5L8 4L13.5 9.5L12.09 10.91L9 7.83V13.5C9 16 11 18 13.5 18H20Z</PathGeometry>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
index 60e54c9..fe48847 100644
--- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -1,47 +1,23 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
-
-    <PathGeometry x:Key="MenuScrollViewerUpButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
-    <PathGeometry x:Key="MenuScrollViewerDownButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
-    <PathGeometry x:Key="MenuItemExpandIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Opacity="0.6" Color="#F9F9F9" />
 
     <!--  MenuFlyout  -->
     <SolidColorBrush x:Key="MenuFlyoutBackground" Color="#35363C" />
     <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#F9F9F9" />
-    <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
-    <Thickness x:Key="MenuFlyoutPadding">8</Thickness>
-    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
-    <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
-    <sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double>
-    <sys:Double x:Key="MenuFlyoutMinWidth">100</sys:Double>
-    <sys:Double x:Key="MenuFlyoutMaxHeight">400</sys:Double>
-    <sys:Double x:Key="MenuFlyoutMaxWidth">600</sys:Double>
 
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="#35363C" />
     <SolidColorBrush x:Key="MenuItemForeground" Color="#F9F9F9" />
-    <Thickness x:Key="MenuItemPadding">16 8</Thickness>
 
     <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
-    <sys:Double x:Key="MenuItemSeparatorHeight">1</sys:Double>
-    <Thickness x:Key="MenuItemSeparatorMargin">2</Thickness>
     <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.16" Color="White" />
 
-    <Thickness x:Key="MenuItemIconMargin">0 0 12 0</Thickness>
-    <Thickness x:Key="MenuItemInputGestureTextMargin">4 0</Thickness>
-
     <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="Gray" />
     <SolidColorBrush x:Key="MenuItemExpandIconForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="MenuItemExpandIconOpenForeground" Color="#F9F9F9" />
-    <Thickness x:Key="MenuItemExpandIconMargin">4 0</Thickness>
 
     <SolidColorBrush x:Key="MenuItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="#F9F9F9" />
     <SolidColorBrush x:Key="MenuItemDisabledExpandIconForeground" Opacity="0.35" Color="#F9F9F9" />
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
index ef1c5d7..bdc2345 100644
--- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="NotificationCardForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="#F9F9F9" />
     <SolidColorBrush x:Key="NotificationCardBackground" Color="#43444A" />
@@ -9,12 +6,4 @@
     <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#5DC264" />
     <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FFAE43" />
     <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#FC725A" />
-    <sys:Double x:Key="NotificationCardWidth">320</sys:Double>
-    <Thickness x:Key="NotificationCardBorderThickness">1</Thickness>
-    <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
-    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
-    <Geometry x:Key="NotificationCardInformationIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</Geometry>
-    <Geometry x:Key="NotificationCardSuccessIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</Geometry>
-    <Geometry x:Key="NotificationCardWarningIconPathData">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</Geometry>
-    <Geometry x:Key="NotificationCardErrorIconPathData">M23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12ZM13.5 17.5C13.5 16.6716 12.8284 16 12 16C11.1716 16 10.5 16.6716 10.5 17.5C10.5 18.3284 11.1716 19 12 19C12.8284 19 13.5 18.3284 13.5 17.5ZM12 5C10.9138 5 10.0507 5.91244 10.1109 6.99692L10.4168 12.5023C10.4635 13.3426 11.1584 14 12 14C12.8416 14 13.5365 13.3426 13.5832 12.5023L13.8891 6.99692C13.9493 5.91244 13.0862 5 12 5Z</Geometry>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
index 6ac643c..d66c981 100644
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <!--  Color Resources  -->
     <Color x:Key="SemiRed0Color">#6C090B</Color>
     <Color x:Key="SemiRed1Color">#901110</Color>
@@ -337,7 +336,8 @@
     <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryLight" Opacity="0.2" Color="{StaticResource SemiLightBlue5Color}" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Opacity="0.3"
+                     Color="{StaticResource SemiLightBlue5Color}" />
     <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Opacity="0.4" Color="{StaticResource SemiLightBlue5Color}" />
     <!--  Tertiary  -->
     <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
@@ -410,4 +410,4 @@
     <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
     <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.04" Color="{StaticResource SemiGrey8Color}" />
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
index 9500752..6f40655 100644
--- a/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ProgressBar.axaml
@@ -1,16 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#54A9FF" />
-    <CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
     <SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
-    <FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
     <SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ProgressBarSecondaryForeground" Color="#40B4F3" />
     <SolidColorBrush x:Key="ProgressBarTertiaryForeground" Color="#888D92" />
     <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#5DC264" />
     <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FFAE43" />
     <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#FC725A" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
index a301b8d..f0a77ac 100644
--- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
@@ -1,12 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <sys:Double x:Key="RadioButtonIconRadius">16</sys:Double>
-    <sys:Double x:Key="RadioButtonGlyphRadius">6</sys:Double>
-    <sys:Double x:Key="RadioButtonFontSize">14</sys:Double>
-    <Thickness x:Key="RadioButtonIconMargin">0 2 8 0</Thickness>
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="RadioButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
@@ -34,21 +26,9 @@
     <SolidColorBrush x:Key="RadioButtonForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="RadioButtonDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
-    <CornerRadius x:Key="RadioButtonBoxCornerRadius">3</CornerRadius>
 
     <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.12" Color="White" />
 
-    <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>
-
-    <sys:Double x:Key="RadioButtonButtonSmallFontSize">12</sys:Double>
-    <sys:Double x:Key="RadioButtonButtonDefaultFontSize">12</sys:Double>
-    <sys:Double x:Key="RadioButtonButtonLargeFontSize">14</sys:Double>
 
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#F9F9F9" />
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.16" Color="White" />
@@ -57,8 +37,6 @@
     <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
-    <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>
-
     <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
@@ -69,7 +47,4 @@
     <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="RadioButtonCardUncheckDisabledBackground" Opacity="0.12" Color="White" />
-
-    <CornerRadius x:Key="RadioButtonCardCornerRadius">3</CornerRadius>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml
index 7f21a12..9be9ad3 100644
--- a/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml
@@ -1,7 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="RefreshContainerIconForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="RefreshContainerIconBackground" Color="Transparent" />
-    <x:Double x:Key="RefreshContainerIconSize">24</x:Double>
-    <PathGeometry x:Key="RefreshContainerIconGlyph">M14.2 3.78966C9.66551 2.57466 5.00465 5.26561 3.78964 9.80007C3.12066 12.2967 3.63433 14.8301 4.99177 16.8102C5.46019 17.4935 5.28601 18.4271 4.60273 18.8955C3.91945 19.364 2.98581 19.1898 2.51739 18.5065C0.685557 15.8344 -0.0134454 12.4023 0.891867 9.02361C2.5357 2.88875 8.84157 -0.751945 14.9764 0.891885C21.1113 2.53572 24.752 8.84159 23.1082 14.9765C22.8937 15.7767 22.0712 16.2515 21.271 16.0371C20.4708 15.8227 19.996 15.0002 20.2104 14.2C21.4254 9.66553 18.7344 5.00467 14.2 3.78966Z</PathGeometry>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
index a8ca77c..7771787 100644
--- a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
@@ -1,18 +1,8 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <sys:Double x:Key="ScrollBarThickness">14</sys:Double>
-    <sys:Double x:Key="ScrollBarThumbThickness">10</sys:Double>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ScrollBarButtonDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ScrollBarBackground" Color="Transparent" />
-    <PathGeometry x:Key="ScrollBarLeftGlyph">M16.3176 6.95628V17.0878C16.3176 17.4871 15.8725 17.7253 15.5402 17.5038L7.94161 12.438C7.64474 12.2401 7.64474 11.8039 7.94161 11.606L15.5402 6.54025C15.8725 6.31873 16.3176 6.55693 16.3176 6.95628Z</PathGeometry>
-    <PathGeometry x:Key="ScrollBarRightGlyph">M9 17.0657V6.93425C9 6.5349 9.44507 6.29671 9.77735 6.51823L17.376 11.584C17.6728 11.7819 17.6728 12.2181 17.376 12.416L9.77735 17.4818C9.44507 17.7033 9 17.4651 9 17.0657Z</PathGeometry>
-    <PathGeometry x:Key="ScrollBarUpGlyph">M17.0839 16.3212H6.9524C6.55305 16.3212 6.31486 15.8761 6.53638 15.5438L11.6021 7.94521C11.8 7.64834 12.2363 7.64834 12.4342 7.94521L17.4999 15.5438C17.7214 15.8761 17.4832 16.3212 17.0839 16.3212Z</PathGeometry>
-    <PathGeometry x:Key="ScrollBarDownGlyph">M6.95249 7.72265L17.084 7.72265C17.4833 7.72265 17.7215 8.16772 17.5 8.5L12.4343 16.0986C12.2363 16.3955 11.8001 16.3955 11.6022 16.0986L6.53647 8.5C6.31495 8.16772 6.55315 7.72265 6.95249 7.72265Z</PathGeometry>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Slider.axaml b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
index 884cd00..4db1a0e 100644
--- a/src/Semi.Avalonia/Themes/Dark/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Slider.axaml
@@ -1,28 +1,15 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="SliderTrackForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="SliderTrackBackground" Opacity="0.12" Color="White" />
-    <sys:Double x:Key="SliderTrackWidth">4</sys:Double>
-    <CornerRadius x:Key="SliderTrackCornerRadius">3</CornerRadius>
-    <sys:Double x:Key="SliderThumbWidth">16</sys:Double>
-    <sys:Double x:Key="SliderThumbHeight">16</sys:Double>
-    <CornerRadius x:Key="SliderThumbCornerRadius">24</CornerRadius>
-    <Thickness x:Key="SliderBorderThickness">0</Thickness>
-    <BoxShadows x:Key="SliderThumbBoxShadow">0 0 1 1 #1AFFFFFF</BoxShadows>
 
-    <sys:Double x:Key="SliderTickHorizontalHeight">4</sys:Double>
-    <sys:Double x:Key="SliderTickVerticalWidth">4</sys:Double>
+
     <SolidColorBrush x:Key="SliderTickForeground" Color="#41464C" />
     <SolidColorBrush x:Key="SliderThumbBackground" Color="White" />
     <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#7FC1FF" />
     <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#A9D7FF" />
-    <Thickness x:Key="SliderThumbBorderThickness">2</Thickness>
 
     <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#0A4694" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#0A4694" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#1C1F23" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/SplitButton.axaml b/src/Semi.Avalonia/Themes/Dark/SplitButton.axaml
deleted file mode 100644
index 8ef2922..0000000
--- a/src/Semi.Avalonia/Themes/Dark/SplitButton.axaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="SplitButtonIconGlyph">M20.5598 9.65618L12.7546 18.6322C12.3559 19.0906 11.644 19.0906 11.2453 18.6322L3.4401 9.65618C2.8773 9.00895 3.33701 8 4.19471 8L19.8052 8C20.6629 8 21.1226 9.00895 20.5598 9.65618Z</PathGeometry>
-    <sys:Double x:Key="SplitButtonSeparatorWidth">1</sys:Double>
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
index ff349b5..aea9a99 100644
--- a/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/SplitView.axaml
@@ -1,13 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="using:System">
-    <!--  Add Resources Here  -->
-    <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>
-    <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="SplitViewSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
     <SolidColorBrush x:Key="SplitViewPaneBackground" Color="#16161A" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
index 1bd9440..8f75744 100644
--- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="TabItemLinePipeBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TabItemLinePipeSelectedBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Opacity="0.16" Color="White" />
@@ -11,5 +10,4 @@
 
     <SolidColorBrush x:Key="TabItemLineHeaderBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TabItemLineHeaderPointeroverBackground" Color="Transparent" />
-    <FontWeight x:Key="TabItemSelectedFontWeight">600</FontWeight>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
index 6d306af..7938282 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.6" Color="#F9F9F9" />
@@ -15,28 +13,4 @@
     <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.2" Color="#E6E8EA" />
 
     <SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.2" Color="#54A9FF" />
-
-    <sys:Double x:Key="TextBlockCodeFontSize">12</sys:Double>
-
-    <sys:Double x:Key="TextBlockFontSize">14</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH1FontSize">32</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH2FontSize">28</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH3FontSize">24</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH4FontSize">20</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH5FontSize">18</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH6FontSize">16</sys:Double>
-    <FontWeight x:Key="TextBlockFontWeight">400</FontWeight>
-    <FontWeight x:Key="TextBlockTitleFontWeight">600</FontWeight>
-    <FontWeight x:Key="TextBlockLinkFontWeight">600</FontWeight>
-    <FontWeight x:Key="TextBlockStrongFontWeight">600</FontWeight>
-
-    <Thickness x:Key="TextBlockTitleH1Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH2Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH3Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH4Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH5Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH6Margin">0</Thickness>
-    <Thickness x:Key="TextBlockParagraphMargin">0</Thickness>
-    <Thickness x:Key="TextBlockCodeBorder">1</Thickness>
-    <CornerRadius x:Key="TextBlockCodeCornerRadius">2</CornerRadius>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
index 446d247..df5a151 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="TextBoxTextCaretBrush" Color="White" />
 
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="Transparent" />
@@ -27,31 +24,7 @@
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBorderBrush" Color="#7FC1FF" />
 
-    <sys:Double x:Key="TextBoxDefaultHeight">30</sys:Double>
-    <sys:Double x:Key="TextBoxSmallHeight">22</sys:Double>
-    <sys:Double x:Key="TextBoxLargeHeight">38</sys:Double>
-    <sys:Double x:Key="TextBoxWrapperDefaultHeight">32</sys:Double>
-    <sys:Double x:Key="TextBoxWrapperSmallHeight">24</sys:Double>
-    <sys:Double x:Key="TextBoxWrapperLargeHeight">40</sys:Double>
-
-    <CornerRadius x:Key="TextBoxDefaultCornerRadius">3</CornerRadius>
-
-    <CornerRadius x:Key="TextBoxPrefixCornerRadius">3 0 0 3</CornerRadius>
-    <CornerRadius x:Key="TextBoxSuffixCornerRadius">0 3 3 0</CornerRadius>
-    <CornerRadius x:Key="TextBoxSuffixContentCornerRadius">3 0 0 3</CornerRadius>
-    <CornerRadius x:Key="TextBoxPrefixContentCornerRadius">0 3 3 0</CornerRadius>
-    <CornerRadius x:Key="TextBoxBothContentCornerRadius">0 0 0 0</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>
 
     <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="#0059D6" />
     <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="White" />
-
-    <StreamGeometry x:Key="TextBoxClearButtonData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxRevealButtonData">M12 4C5 4 1 10 1 12C1 14 5 20 12 20C19 20 23 14 23 12C23 10 19 4 12 4ZM17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12ZM12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxHideButtonData">M2.02949 4.67856C2.7593 4.28654 3.66871 4.56038 4.06073 5.29018C6.21313 9.29726 8.83179 11.5 12.0001 11.5C15.1685 11.5 17.7871 9.29726 19.9395 5.29018C20.3315 4.56038 21.241 4.28655 21.9708 4.67856C22.7006 5.07058 22.9744 5.97999 22.5824 6.7098C21.9049 7.97104 21.1385 9.15419 20.2743 10.199L23.2001 14.1C23.6971 14.7627 23.5628 15.7029 22.9001 16.2C22.2373 16.697 21.2971 16.5627 20.8001 15.9L18.1186 12.3246C17.448 12.8501 16.7322 13.2957 15.9687 13.6441L17.4046 17.4733C17.6955 18.249 17.3025 19.1136 16.5268 19.4045C15.7511 19.6954 14.8865 19.3024 14.5956 18.5267L13.0956 14.5267C13.0852 14.4988 13.0756 14.4709 13.0669 14.4428C12.7193 14.4806 12.3638 14.5 12.0001 14.5C11.6365 14.5 11.281 14.4806 10.9333 14.4428C10.9246 14.4709 10.9151 14.4988 10.9046 14.5267L9.40463 18.5267C9.11375 19.3024 8.24913 19.6954 7.47345 19.4045C6.69777 19.1136 6.30476 18.249 6.59564 17.4733L8.03159 13.6441C7.26806 13.2957 6.55223 12.8501 5.88163 12.3246L3.20009 15.9C2.70303 16.5627 1.76283 16.697 1.10009 16.2C0.437347 15.7029 0.303032 14.7627 0.800088 14.1L3.72589 10.1989C2.86177 9.15415 2.09533 7.97101 1.41787 6.70979C1.02585 5.97999 1.29969 5.07057 2.02949 4.67856Z</StreamGeometry>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
index 0c35d26..03d0391 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
@@ -1,17 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-
-    <sys:Double x:Key="ToggleButtonDefaultFontSize">14</sys:Double>
-    <FontWeight x:Key="ToggleButtonDefaultFontWeight">600</FontWeight>
-
-    <Thickness x:Key="ToggleButtonDefaultPadding">12 6</Thickness>
-    <Thickness x:Key="ToggleButtonLargePadding">16 10</Thickness>
-    <Thickness x:Key="ToggleButtonSmallPadding">6 2</Thickness>
-    <Thickness x:Key="ToggleButtonBorderThickness">1</Thickness>
-    <CornerRadius x:Key="ToggleButtonCornerRadius">3</CornerRadius>
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.20" Color="White" />
@@ -78,7 +65,7 @@
     <SolidColorBrush x:Key="ToggleButtonSuccessIndeterminatePointeroverForeground" Color="#7FD184" />
     <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverForeground" Color="#FFC772" />
     <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverForeground" Color="#FD9983" />
-    
+
     <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="#A9D7FF" />
     <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" Color="#9DDCF9" />
     <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" Color="#C6CACD" />
@@ -94,4 +81,4 @@
     <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedForeground" Color="#FDBEAC" />
 
     <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Opacity="0.35" Color="#F9F9F9" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
index 736383c..0d3ce91 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Opacity="0.20" Color="White" />
@@ -15,19 +12,4 @@
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#277731" />
 
     <SolidColorBrush x:Key="ToggleSwitchIndicatorBorderBrush" Opacity="0.09" Color="#F9F9F9" />
-    <sys:Double x:Key="SizeSwitchDefaultHeight">24</sys:Double>
-    <sys:Double x:Key="SizeSwitchSmallHeight">16</sys:Double>
-    <sys:Double x:Key="SizeSwitchLargeHeight">32</sys:Double>
-    <sys:Double x:Key="SizeSwitchDefaultWidth">40</sys:Double>
-    <sys:Double x:Key="SizeSwitchSmallWidth">26</sys:Double>
-    <sys:Double x:Key="SizeSwitchLargeWidth">54</sys:Double>
-    <sys:Double x:Key="SizeSwitchIndicatorDefaultWidth">18</sys:Double>
-    <sys:Double x:Key="SizeSwitchIndicatorSmallWidth">12</sys:Double>
-    <sys:Double x:Key="SizeSwitchIndicatorLargeWidth">24</sys:Double>
-
-    <sys:Double x:Key="SizeSwitchDefaultFontSize">12</sys:Double>
-    <sys:Double x:Key="SizeSwitchLargeFontSize">14</sys:Double>
-
-    <Thickness x:Key="ToggleSwitchHeaderMargin">8 4</Thickness>
-    <Thickness x:Key="ToggleSwitchOnContentMargin">8 4</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
index 7f3ab09..5b9f30b 100644
--- a/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Tooltip.axaml
@@ -1,14 +1,5 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="ToolTipTriangleGlyph">M24 0V1C20 1 18.5 2 16.5 4C14.5 6 14 7 12 7C10 7 9.5 6 7.5 4C5.5 2 4 1 0 1V0H24Z</PathGeometry>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ToolTipBackground" Color="#C6CACD" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="Black" />
     <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
-    <CornerRadius x:Key="ToolTipCornerRadius">6</CornerRadius>
-    <Thickness x:Key="ToolTipPadding">12 8</Thickness>
-    <sys:Double x:Key="ToolTipMaxWidth">320</sys:Double>
-    <Thickness x:Key="ToolTipBorderThickness">0</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
index 8cd363b..22802dd 100644
--- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
@@ -1,13 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <sys:Double x:Key="TreeViewItemIndent">20</sys:Double>
-    <sys:Double x:Key="TreeViewItemIconSize">8</sys:Double>
-    <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
-
-    <StreamGeometry x:Key="ExpanderIconData">M9.65618 3.44015L18.6322 11.2454C19.0906 11.644 19.0906 12.356 18.6322 12.7546L9.65618 20.5598C9.00895 21.1226 8 20.6629 8 19.8052V4.19475C8 3.33705 9.00895 2.87734 9.65618 3.44015Z</StreamGeometry>
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#F9F9F9" />
@@ -19,7 +10,4 @@
     <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-
-    <Thickness x:Key="TreeViewItemIconMargin">8 0</Thickness>
-    <Thickness x:Key="TreeViewItemPadding">0 4 8 4</Thickness>
-</ResourceDictionary>
+</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 3edcca5..b26cd37 100644
--- a/src/Semi.Avalonia/Themes/Dark/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Window.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="WindowDefaultBackground" Color="#16161A" />
     <SolidColorBrush x:Key="WindowDefaultForeground" Color="#F9F9F9" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Index.axaml b/src/Semi.Avalonia/Themes/Index.axaml
index 9a6bcf6..3e5ed36 100644
--- a/src/Semi.Avalonia/Themes/Index.axaml
+++ b/src/Semi.Avalonia/Themes/Index.axaml
@@ -8,6 +8,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/Controls.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
diff --git a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
index 7c9823f..537edd9 100644
--- a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
@@ -1,13 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1A000000</BoxShadows>
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" />
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
-    <Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
-    <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
-    <CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</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>
-    <x:Double x:Key="AutoCompleteMaxDropdownHeight">600</x:Double>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml
index fbdd48f..d326fcb 100644
--- a/src/Semi.Avalonia/Themes/Light/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Border.axaml
@@ -1,12 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <SolidColorBrush x:Key="BorderCardBackground">White</SolidColorBrush>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BorderCardBackground" Color="White" />
     <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <CornerRadius x:Key="RadiusCardCornerRadius">4</CornerRadius>
-    <Thickness x:Key="ThicknessCardPadding">20</Thickness>
-    <Thickness x:Key="ThicknessCardMargin">4</Thickness>
-    <Thickness x:Key="ThicknessCardBorderThickness">1</Thickness>
-    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1A000000</BoxShadows>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Button.axaml b/src/Semi.Avalonia/Themes/Light/Button.axaml
index bc0746c..ec3144a 100644
--- a/src/Semi.Avalonia/Themes/Light/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Button.axaml
@@ -1,19 +1,6 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-
-    <sys:Double x:Key="ButtonDefaultFontSize">14</sys: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>
-
-    <Thickness x:Key="ButtonBorderThickness">1</Thickness>
-
-    <CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
-
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Light  -->
     <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="#0077FA" />
     <SolidColorBrush x:Key="ButtonDefaultSecondaryForeground" Color="#0095EE" />
@@ -91,5 +78,4 @@
 
     <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Gray" />
     <!--  end Solid  -->
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
index 714d5b8..5183887 100644
--- a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
@@ -1,15 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="ButtonSpinnerIncreaseButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
-    <PathGeometry x:Key="ButtonSpinnerDecreaseButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="White" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Opacity="0.08" Color="#1C1F23" />
-
-    <CornerRadius x:Key="ButtonSpinnerButtonGroupCornerRadius">3</CornerRadius>
-    <Thickness x:Key="ButtonSpinnerButtonGroupBorderThickness">1</Thickness>
-
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/Calendar.axaml b/src/Semi.Avalonia/Themes/Light/Calendar.axaml
index 7262aa6..004048d 100644
--- a/src/Semi.Avalonia/Themes/Light/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Calendar.axaml
@@ -1,37 +1,26 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="using:System">
-    <!--  Add Resources Here  -->
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CalendarBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <Thickness x:Key="CalendarBorderThickness">1</Thickness>
-    <CornerRadius x:Key="CalendarCornerRadius">6</CornerRadius>
-    <GridLength x:Key="CalendarItemWeekDayNameHeight">40</GridLength>
     <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.62" Color="#1C1F23" />
-    <PathGeometry x:Key="CalendarItemPreviousIconGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</PathGeometry>
-    <PathGeometry x:Key="CalendarItemNextIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
 
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
-    <Thickness x:Key="CalendarItemCalendarButtonBorderThickness">0</Thickness>
     <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="#0077FA" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="White" />
-    <FontWeight x:Key="CalendarItemCalendarButtonSelectedFontWeight">600</FontWeight>
     <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Opacity="0.65" Color="#1C1F23" />
-    <CornerRadius x:Key="CalendarItemCalendarButtonCornerRadius">3</CornerRadius>
 
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
-    <CornerRadius x:Key="CalendarItemCalendarDayButtonCornerRadius">3</CornerRadius>
 
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
@@ -45,7 +34,4 @@
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Opacity="0.62" Color="#1C1F23" />
-
-    <sys:Double x:Key="CalendarMinWidth">240</sys:Double>
-    <sys:Double x:Key="CalendarMinHeight">250</sys:Double>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
index 4781976..fc2cb0d 100644
--- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
@@ -1,28 +1,17 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--    -->
     <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#1C1F23" />
-    <PathGeometry x:Key="CalendarDatePickerIconGlyph">M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z</PathGeometry>
     <SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.05" Color="#FF2E3238" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
-    <Thickness x:Key="CalendarDatePickerBorderThickness">1</Thickness>
-    <CornerRadius x:Key="CalendarDatePickerCornerRadius">3</CornerRadius>
     <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#FF0077FA" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
-    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1A000000</BoxShadows>
-    <x:Double x:Key="CalendarDatePickerInnerDefaultHeight">30</x:Double>
-    <x:Double x:Key="CalendarDatePickerInnerSmallHeight">22</x:Double>
-    <x:Double x:Key="CalendarDatePickerInnerLargeHeight">38</x:Double>
-    <x:Double x:Key="CalendarDatePickerDefaultHeight">32</x:Double>
-    <x:Double x:Key="CalendarDatePickerSmallHeight">24</x:Double>
-    <x:Double x:Key="CalendarDatePickerLargeHeight">40</x:Double>
 
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="#0062D6" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml
index b73f10b..5846e21 100644
--- a/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CaptionButtons.axaml
@@ -1,14 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="WindowCloseIconGlyph">M13.46,12L19,17.54V19H17.54L12,13.46L6.46,19H5V17.54L10.54,12L5,6.46V5H6.46L12,10.54L17.54,5H19V6.46L13.46,12Z</PathGeometry>
-    <PathGeometry x:Key="WindowMaximizeGlyph">M4,4H20V20H4V4M6,8V18H18V8H6Z</PathGeometry>
-    <PathGeometry x:Key="WindowMinimizeGlyph">M20,14H4V10H20</PathGeometry>
-    <PathGeometry x:Key="WindowRestoreGlyph">M4,8H8V4H20V16H16V20H4V8M16,8V14H18V6H10V8H16M6,12V18H14V12H6Z</PathGeometry>
-    <PathGeometry x:Key="WindowExpandGlyph">M10,21V19H6.41L10.91,14.5L9.5,13.09L5,17.59V14H3V21H10M14.5,10.91L19,6.41V10H21V3H14V5H17.59L13.09,9.5L14.5,10.91Z</PathGeometry>
-    <PathGeometry x:Key="WindowCollapseGlyph">M19.5,3.09L15,7.59V4H13V11H20V9H16.41L20.91,4.5L19.5,3.09M4,13V15H7.59L3.09,19.5L4.5,20.91L9,16.41V20H11V13H4Z</PathGeometry>
     <SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="CaptionButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="#D52515" />
     <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="#B2140C" />
     <SolidColorBrush x:Key="CaptionButtonForeground" Opacity="0.62" Color="#1C1F23" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Carousel.axaml b/src/Semi.Avalonia/Themes/Light/Carousel.axaml
index fb02b11..561a92f 100644
--- a/src/Semi.Avalonia/Themes/Light/Carousel.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Carousel.axaml
@@ -1,7 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="CarouselButtonGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</PathGeometry>
-
     <SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
     <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Opacity="0.7" Color="Black" />
     <SolidColorBrush x:Key="CarouselButtonPressedForeground" Opacity="0.7" Color="Black" />
@@ -9,8 +6,4 @@
     <SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Opacity="0.7" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
-
-    <x:Double x:Key="CarouselIndicatorLineSelectedWidth">48</x:Double>
-    <x:Double x:Key="CarouselIndicatorSelectedHeight">8</x:Double>
-    <Thickness x:Key="CarouselButtonMargin">8</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
index bc389a2..4218bd6 100644
--- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CheckBoxForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CheckBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
@@ -27,20 +26,6 @@
     <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="#98CDFD" />
     <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="#98CDFD" />
 
-    <sys:Double x:Key="CheckBoxFontSize">14</sys:Double>
-    <sys:Double x:Key="CheckBoxBoxWidth">16</sys:Double>
-    <sys:Double x:Key="CheckBoxBoxHeight">16</sys:Double>
-    <sys:Double x:Key="CheckBoxBoxGlyphWidth">10</sys:Double>
-    <sys:Double x:Key="CheckBoxBoxGlyphHeight">10</sys:Double>
-    <FontWeight x:Key="CheckBoxFontWeight">400</FontWeight>
-
-    <CornerRadius x:Key="CheckBoxBoxCornerRadius">3</CornerRadius>
-    <Thickness x:Key="CheckBoxContentMargin">8 0 0 0</Thickness>
-    <Thickness x:Key="CheckBoxBoxBorderThickness">1</Thickness>
-
-    <PathGeometry x:Key="CheckBoxCheckGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
-    <PathGeometry x:Key="CheckBoxIndeterminateGlyph">M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z</PathGeometry>
-
     <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Color="#FFEAF5FF" />
     <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="#FF0077FA" />
     <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="#FF98CDFD" />
@@ -48,9 +33,4 @@
     <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Opacity="0.09" Color="#FF2E3238" />
     <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="#FF0062D6" />
     <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="#FF004FB3" />
-
-    <Thickness x:Key="CheckBoxCardBorderThickness">1</Thickness>
-    <Thickness x:Key="CheckBoxCardPadding">16</Thickness>
-    <CornerRadius x:Key="CheckBoxCardCornerRadius">3</CornerRadius>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
index 40e6a61..4571c3f 100644
--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -7,8 +7,6 @@
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#004FB3" />
 
-    <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
-
     <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#1C1F23" />
@@ -16,13 +14,8 @@
 
     <SolidColorBrush x:Key="ComboBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
-    <Thickness x:Key="ComboBoxItemDefaultPadding">8 4</Thickness>
-    <Thickness x:Key="ComboBoxSelectorDefaultPadding">8 0</Thickness>
-
-    <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1A000000</BoxShadows>
     <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="White" />
     <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
 
     <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#1C1F23" />
 
@@ -34,13 +27,6 @@
 
     <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <PathGeometry x:Key="ComboBoxIcon">
-        M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z
-    </PathGeometry>
-
-    <x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
-    <x:Double x:Key="ComboBoxSmallHeight">24</x:Double>
-    <x:Double x:Key="ComboBoxLargeHeight">40</x:Double>
 
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Opacity="0.08" Color="#FF1C1F23" />
@@ -48,4 +34,4 @@
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBorderBrush" Color="#0062D6" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
index 95dfb36..1116060 100644
--- a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FFF93920" />
     <SolidColorBrush x:Key="DataValidationErrorsBackground" Color="#FFFEF2ED" />
     <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Color="#FFFEF2ED" />
@@ -9,4 +8,4 @@
     <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Color="#FFFDB7A5" />
     <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Color="#FFFEF2ED" />
     <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FFF93920" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/DatePicker.axaml b/src/Semi.Avalonia/Themes/Light/DatePicker.axaml
deleted file mode 100644
index 6964b5d..0000000
--- a/src/Semi.Avalonia/Themes/Light/DatePicker.axaml
+++ /dev/null
@@ -1,4 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="DatePickerIconGlyph">M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z</PathGeometry>
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
index 4e8b885..cd685fb 100644
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -1,11 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="White" />
-    <Thickness x:Key="DateTimePickerListItemPadding">0 3 0 6</Thickness>
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#1C1F23" />
@@ -14,13 +11,7 @@
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Opacity="0.13" Color="#2E3238" />
 
-    <PathGeometry x:Key="DateTimePickerButtonUpGlyph">M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z</PathGeometry>
-    <PathGeometry x:Key="DateTimePickerButtonDownGlyph">M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z</PathGeometry>
-    <PathGeometry x:Key="DateTimePickerAcceptGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
-    <PathGeometry x:Key="DateTimePickerDismissGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</PathGeometry>
-
     <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
-    <sys:Double x:Key="DateTimePickerListBoxItemHeight">30</sys:Double>
 
 
     <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
@@ -34,15 +25,4 @@
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
-
-    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 8 0 #1A000000</BoxShadows>
-    <Thickness x:Key="DateTimePickerFlyoutPadding">16 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>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Expander.axaml b/src/Semi.Avalonia/Themes/Light/Expander.axaml
index a4dc506..8787625 100644
--- a/src/Semi.Avalonia/Themes/Light/Expander.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Expander.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Opacity="0.35" Color="#1C1F23" />
@@ -9,18 +7,4 @@
     <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="ExpanderContentForeground" Opacity="0.8" Color="#1C1F23" />
-
-    <FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
-    <sys:Double x:Key="ExpanderIconSize">8</sys:Double>
-
-    <CornerRadius x:Key="ExpanderHeaderCornerRadius">3</CornerRadius>
-    <Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
-    <Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
-    <Thickness x:Key="ExpanderEndIconMargin">0 0 8 0</Thickness>
-    <Thickness x:Key="ExpanderContentMargin">16 4 16 8</Thickness>
-    <Thickness x:Key="ExpanderFrontIconMargin">8 0 0 0</Thickness>
-    <Thickness x:Key="ExpanderDownContentBorderThickness">0 0 0 1</Thickness>
-    <Thickness x:Key="ExpanderUpContentBorderThickness">0 1 0 0</Thickness>
-    <Thickness x:Key="ExpanderLeftContentBorderThickness">1 0 0 0</Thickness>
-    <Thickness x:Key="ExpanderRightContentBorderThickness">0 0 1 0</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
index bad27c3..a738a99 100644
--- a/src/Semi.Avalonia/Themes/Light/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
@@ -1,18 +1,5 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="FlyoutBackground" Color="White" />
     <SolidColorBrush x:Key="FlyoutForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <FontWeight x:Key="FlyoutFontWeight">400</FontWeight>
-    <Thickness x:Key="FlyoutBorderThickness">1</Thickness>
-    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
-    <sys:Double x:Key="FlyoutMinHeight">100</sys:Double>
-    <sys:Double x:Key="FlyoutMinWidth">100</sys:Double>
-    <sys:Double x:Key="FlyoutMaxHeight">600</sys:Double>
-    <sys:Double x:Key="FlyoutMaxWidth">600</sys:Double>
-    <CornerRadius x:Key="FlyoutCornerRadius">6</CornerRadius>
-    <Thickness x:Key="FlyoutPadding">8</Thickness>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml b/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml
index d422063..2667522 100644
--- a/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Themes/Light/GridSplitter.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="GridSplitterBackground" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="#CBE7FE" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
index 8c35c3d..ce87252 100644
--- a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
@@ -1,6 +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">
     <SolidColorBrush x:Key="HeaderedContentControlDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="HeaderedContentControlDefaultBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <CornerRadius x:Key="HeaderedContentControlCornerRadius">4</CornerRadius>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Label.axaml b/src/Semi.Avalonia/Themes/Light/Label.axaml
index b2ee04d..35d79e9 100644
--- a/src/Semi.Avalonia/Themes/Light/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Label.axaml
@@ -1,17 +1,5 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Typography related resources are combined with TextBlock  -->
-
-    <Thickness x:Key="LabelTagBorderThickness">1</Thickness>
-    <Thickness x:Key="LabelTagSmallPadding">8 2</Thickness>
-    <Thickness x:Key="LabelTagLargePadding">8 4</Thickness>
-    <sys:Double x:Key="LabelTagSmallHeight">20</sys:Double>
-    <sys:Double x:Key="LabelTagLargeHeight">24</sys:Double>
-    <sys:Double x:Key="LabelTagFontSize">12</sys:Double>
-    <CornerRadius x:Key="LabelTagSquareCornerRadius">3</CornerRadius>
-    <CornerRadius x:Key="LabelTagCircleCornerRadius">9999</CornerRadius>
-
     <SolidColorBrush x:Key="LabelTagLightAmberForeground" Color="#784606" />
     <SolidColorBrush x:Key="LabelTagLightAmberBackground" Opacity="0.15" Color="#F0B114" />
     <SolidColorBrush x:Key="LabelTagLightBlueForeground" Color="#003D8F" />
@@ -104,6 +92,4 @@
     <SolidColorBrush x:Key="LabelTagSolidWhiteBackground" Color="#FFFFFF" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#C6CACD" />
     <SolidColorBrush x:Key="LabelTagSolidWhiteForeground" Color="#1C1F23" />
-
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/Light.axaml
index 3eb48db..c6bf379 100644
--- a/src/Semi.Avalonia/Themes/Light/Light.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Light.axaml
@@ -13,9 +13,7 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/CheckBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ComboBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/DataValidationErrors.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/DatePicker.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/DropDownButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Expander.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/GridSplitter.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml" />
@@ -24,25 +22,20 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Menu.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/NotificationCard.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/NumericUpDown.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ProgressBar.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/RadioButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/RefreshContainer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ScrollViewer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Slider.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/SplitButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/SplitView.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TabControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TabItem.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TextBlock.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TextBox.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TimePicker.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ToggleButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ToggleSwitch.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Tooltip.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TreeView.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Window.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Flyout.axaml" />
-
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
index b4cd718..8dbf5be 100644
--- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
@@ -1,7 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Thickness x:Key="ListBoxItemDefaultPadding">8 4</Thickness>
-
     <SolidColorBrush x:Key="ListBoxItemDefaultForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ListBoxItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ListBoxItemIconHoverForeground" Color="#1C1F23" />
@@ -14,6 +11,4 @@
     <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <CornerRadius x:Key="ListBoxItemCornerRadius">3</CornerRadius>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml
index f17ad09..d97dfae 100644
--- a/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#1C1F23" />
     <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ManagedFileChooserSeparatorBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <PathGeometry x:Key="ManagedFileChooserUpButtonGlyph">M20 18V20H13.5C9.91 20 7 17.09 7 13.5V7.83L3.91 10.92L2.5 9.5L8 4L13.5 9.5L12.09 10.91L9 7.83V13.5C9 16 11 18 13.5 18H20Z</PathGeometry>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml
index 15551a3..80d1d52 100644
--- a/src/Semi.Avalonia/Themes/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml
@@ -1,47 +1,22 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
-
-    <PathGeometry x:Key="MenuScrollViewerUpButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
-    <PathGeometry x:Key="MenuScrollViewerDownButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
-    <PathGeometry x:Key="MenuItemExpandIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Opacity="0.62" Color="#1C1F23" />
 
     <!--  MenuFlyout  -->
     <SolidColorBrush x:Key="MenuFlyoutBackground" Color="White" />
     <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
-    <Thickness x:Key="MenuFlyoutPadding">8</Thickness>
-    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
-    <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
-    <sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double>
-    <sys:Double x:Key="MenuFlyoutMinWidth">100</sys:Double>
-    <sys:Double x:Key="MenuFlyoutMaxHeight">400</sys:Double>
-    <sys:Double x:Key="MenuFlyoutMaxWidth">600</sys:Double>
-
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="White" />
     <SolidColorBrush x:Key="MenuItemForeground" Color="#1C1F23" />
-    <Thickness x:Key="MenuItemPadding">16 8</Thickness>
 
     <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
-    <sys:Double x:Key="MenuItemSeparatorHeight">1</sys:Double>
-    <Thickness x:Key="MenuItemSeparatorMargin">2</Thickness>
     <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.09" Color="#2E3238" />
 
-    <Thickness x:Key="MenuItemIconMargin">0 0 12 0</Thickness>
-    <Thickness x:Key="MenuItemInputGestureTextMargin">4 0</Thickness>
-
     <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="Gray" />
     <SolidColorBrush x:Key="MenuItemExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="MenuItemExpandIconOpenForeground" Color="#1C1F23" />
-    <Thickness x:Key="MenuItemExpandIconMargin">4 0</Thickness>
 
     <SolidColorBrush x:Key="MenuItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="#1C1F23" />
     <SolidColorBrush x:Key="MenuItemDisabledExpandIconForeground" Opacity="0.35" Color="#1C1F23" />
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
index a8ae94d..a3201eb 100644
--- a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="NotificationCardForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="NotificationCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="NotificationCardBackground" Color="White" />
@@ -9,12 +6,4 @@
     <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#3BB346" />
     <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FC8800" />
     <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#F93920" />
-    <sys:Double x:Key="NotificationCardWidth">320</sys:Double>
-    <Thickness x:Key="NotificationCardBorderThickness">1</Thickness>
-    <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
-    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
-    <Geometry x:Key="NotificationCardInformationIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</Geometry>
-    <Geometry x:Key="NotificationCardSuccessIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</Geometry>
-    <Geometry x:Key="NotificationCardWarningIconPathData">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</Geometry>
-    <Geometry x:Key="NotificationCardErrorIconPathData">M23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12ZM13.5 17.5C13.5 16.6716 12.8284 16 12 16C11.1716 16 10.5 16.6716 10.5 17.5C10.5 18.3284 11.1716 19 12 19C12.8284 19 13.5 18.3284 13.5 17.5ZM12 5C10.9138 5 10.0507 5.91244 10.1109 6.99692L10.4168 12.5023C10.4635 13.3426 11.1584 14 12 14C12.8416 14 13.5365 13.3426 13.5832 12.5023L13.8891 6.99692C13.9493 5.91244 13.0862 5 12 5Z</Geometry>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/NumericUpDown.axaml b/src/Semi.Avalonia/Themes/Light/NumericUpDown.axaml
deleted file mode 100644
index 27105a5..0000000
--- a/src/Semi.Avalonia/Themes/Light/NumericUpDown.axaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <CornerRadius x:Key="NumericUpDownCornerRadius">3</CornerRadius>
-    <x:Double x:Key="NumericUpDownWrapperDefaultHeight">32</x:Double>
-    <x:Double x:Key="NumericUpDownWrapperSmallHeight">24</x:Double>
-    <x:Double x:Key="NumericUpDownWrapperLargeHeight">40</x:Double>
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml
index 25e68d3..a452166 100644
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
+    <!--  Color Resources  -->
     <Color x:Key="SemiRed0Color">#FEF2ED</Color>
     <Color x:Key="SemiRed1Color">#FEDDD2</Color>
     <Color x:Key="SemiRed2Color">#FDB7A5</Color>
@@ -408,4 +408,4 @@
     <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="{StaticResource SemiGrey1Color}" />
     <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
     <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.02" Color="{StaticResource SemiGrey8Color}" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
index fb388c7..2944dbb 100644
--- a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
@@ -1,16 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#0077FA" />
-    <CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
     <SolidColorBrush x:Key="ProgressBarBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
-    <FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
     <SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="#0077FA" />
     <SolidColorBrush x:Key="ProgressBarSecondaryForeground" Color="#0095EE" />
     <SolidColorBrush x:Key="ProgressBarTertiaryForeground" Color="#6B7075" />
     <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#3BB346" />
     <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FC8800" />
     <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#F93920" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
index e766323..97225ac 100644
--- a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
@@ -1,12 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <sys:Double x:Key="RadioButtonIconRadius">16</sys:Double>
-    <sys:Double x:Key="RadioButtonGlyphRadius">6</sys:Double>
-    <sys:Double x:Key="RadioButtonFontSize">14</sys:Double>
-    <Thickness x:Key="RadioButtonIconMargin">0 2 8 0</Thickness>
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="RadioButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
@@ -34,21 +26,9 @@
     <SolidColorBrush x:Key="RadioButtonForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="RadioButtonDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-    <CornerRadius x:Key="RadioButtonBoxCornerRadius">3</CornerRadius>
 
     <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.05" Color="#2E3238" />
 
-    <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>
-
-    <sys:Double x:Key="RadioButtonButtonSmallFontSize">12</sys:Double>
-    <sys:Double x:Key="RadioButtonButtonDefaultFontSize">12</sys:Double>
-    <sys:Double x:Key="RadioButtonButtonLargeFontSize">14</sys:Double>
 
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#1C1F23" />
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
@@ -57,7 +37,6 @@
     <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="White" />
     <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
-    <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>
 
     <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
@@ -69,7 +48,4 @@
     <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="RadioButtonCardUncheckDisabledBackground" Opacity="0.05" Color="#2E3238" />
-
-    <CornerRadius x:Key="RadioButtonCardCornerRadius">3</CornerRadius>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml
index d39c60f..397a7bb 100644
--- a/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml
@@ -1,7 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="RefreshContainerIconForeground" Color="#0077FA" />
     <SolidColorBrush x:Key="RefreshContainerIconBackground" Color="Transparent" />
-    <x:Double x:Key="RefreshContainerIconSize">24</x:Double>
-    <PathGeometry x:Key="RefreshContainerIconGlyph">M14.2 3.78966C9.66551 2.57466 5.00465 5.26561 3.78964 9.80007C3.12066 12.2967 3.63433 14.8301 4.99177 16.8102C5.46019 17.4935 5.28601 18.4271 4.60273 18.8955C3.91945 19.364 2.98581 19.1898 2.51739 18.5065C0.685557 15.8344 -0.0134454 12.4023 0.891867 9.02361C2.5357 2.88875 8.84157 -0.751945 14.9764 0.891885C21.1113 2.53572 24.752 8.84159 23.1082 14.9765C22.8937 15.7767 22.0712 16.2515 21.271 16.0371C20.4708 15.8227 19.996 15.0002 20.2104 14.2C21.4254 9.66553 18.7344 5.00467 14.2 3.78966Z</PathGeometry>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml
index 8530964..8ced04d 100644
--- a/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml
@@ -1,17 +1,8 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <sys:Double x:Key="ScrollBarThickness">14</sys:Double>
-    <sys:Double x:Key="ScrollBarThumbThickness">10</sys:Double>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ScrollBarButtonDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ScrollBarBackground" Color="Transparent" />
-    <PathGeometry x:Key="ScrollBarLeftGlyph">M16.3176 6.95628V17.0878C16.3176 17.4871 15.8725 17.7253 15.5402 17.5038L7.94161 12.438C7.64474 12.2401 7.64474 11.8039 7.94161 11.606L15.5402 6.54025C15.8725 6.31873 16.3176 6.55693 16.3176 6.95628Z</PathGeometry>
-    <PathGeometry x:Key="ScrollBarRightGlyph">M9 17.0657V6.93425C9 6.5349 9.44507 6.29671 9.77735 6.51823L17.376 11.584C17.6728 11.7819 17.6728 12.2181 17.376 12.416L9.77735 17.4818C9.44507 17.7033 9 17.4651 9 17.0657Z</PathGeometry>
-    <PathGeometry x:Key="ScrollBarUpGlyph">M17.0839 16.3212H6.9524C6.55305 16.3212 6.31486 15.8761 6.53638 15.5438L11.6021 7.94521C11.8 7.64834 12.2363 7.64834 12.4342 7.94521L17.4999 15.5438C17.7214 15.8761 17.4832 16.3212 17.0839 16.3212Z</PathGeometry>
-    <PathGeometry x:Key="ScrollBarDownGlyph">M6.95249 7.72265L17.084 7.72265C17.4833 7.72265 17.7215 8.16772 17.5 8.5L12.4343 16.0986C12.2363 16.3955 11.8001 16.3955 11.6022 16.0986L6.53647 8.5C6.31495 8.16772 6.55315 7.72265 6.95249 7.72265Z</PathGeometry>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Slider.axaml b/src/Semi.Avalonia/Themes/Light/Slider.axaml
index 01d5543..57b2c29 100644
--- a/src/Semi.Avalonia/Themes/Light/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Slider.axaml
@@ -1,28 +1,14 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="SliderTrackForeground" Color="#0077FA" />
     <SolidColorBrush x:Key="SliderTrackBackground" Opacity="0.05" Color="#2E3238" />
-    <sys:Double x:Key="SliderTrackWidth">4</sys:Double>
-    <CornerRadius x:Key="SliderTrackCornerRadius">3</CornerRadius>
-    <sys:Double x:Key="SliderThumbWidth">16</sys:Double>
-    <sys:Double x:Key="SliderThumbHeight">16</sys:Double>
-    <CornerRadius x:Key="SliderThumbCornerRadius">24</CornerRadius>
-    <Thickness x:Key="SliderBorderThickness">0</Thickness>
-    <BoxShadows x:Key="SliderThumbBoxShadow">0 0 1 1 #1A000000</BoxShadows>
 
-    <sys:Double x:Key="SliderTickHorizontalHeight">4</sys:Double>
-    <sys:Double x:Key="SliderTickVerticalWidth">4</sys:Double>
     <SolidColorBrush x:Key="SliderTickForeground" Color="#C6CACD" />
     <SolidColorBrush x:Key="SliderThumbBackground" Color="White" />
     <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="#004FB3" />
-    <Thickness x:Key="SliderThumbBorderThickness">2</Thickness>
 
     <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#CBE7FE" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="#CBE7FE" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="#F9F9F9" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/SplitButton.axaml b/src/Semi.Avalonia/Themes/Light/SplitButton.axaml
deleted file mode 100644
index 8ef2922..0000000
--- a/src/Semi.Avalonia/Themes/Light/SplitButton.axaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="SplitButtonIconGlyph">M20.5598 9.65618L12.7546 18.6322C12.3559 19.0906 11.644 19.0906 11.2453 18.6322L3.4401 9.65618C2.8773 9.00895 3.33701 8 4.19471 8L19.8052 8C20.6629 8 21.1226 9.00895 20.5598 9.65618Z</PathGeometry>
-    <sys:Double x:Key="SplitButtonSeparatorWidth">1</sys:Double>
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/SplitView.axaml b/src/Semi.Avalonia/Themes/Light/SplitView.axaml
index c6b235d..e29053f 100644
--- a/src/Semi.Avalonia/Themes/Light/SplitView.axaml
+++ b/src/Semi.Avalonia/Themes/Light/SplitView.axaml
@@ -1,13 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="using:System">
-    <!--  Add Resources Here  -->
-    <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>
-    <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="SplitViewSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="SplitViewPaneBackground" Color="White" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TabControl.axaml b/src/Semi.Avalonia/Themes/Light/TabControl.axaml
deleted file mode 100644
index 9017e8d..0000000
--- a/src/Semi.Avalonia/Themes/Light/TabControl.axaml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/TabItem.axaml b/src/Semi.Avalonia/Themes/Light/TabItem.axaml
index 664042f..eb37e1c 100644
--- a/src/Semi.Avalonia/Themes/Light/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TabItem.axaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Line  -->
     <SolidColorBrush x:Key="TabItemLinePipeBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TabItemLinePipeSelectedBackground" Color="#0077FA" />
@@ -14,6 +11,4 @@
 
     <SolidColorBrush x:Key="TabItemLineHeaderBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TabItemLineHeaderPointeroverBackground" Color="Transparent" />
-    <FontWeight x:Key="TabItemSelectedFontWeight">600</FontWeight>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TextBlock.axaml b/src/Semi.Avalonia/Themes/Light/TextBlock.axaml
index 4f7474b..cef1903 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBlock.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#1C1F23" />
@@ -15,28 +13,4 @@
     <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.2" Color="#2E3238" />
 
     <SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.2" Color="#0077FA" />
-
-    <sys:Double x:Key="TextBlockCodeFontSize">12</sys:Double>
-
-    <sys:Double x:Key="TextBlockFontSize">14</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH1FontSize">32</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH2FontSize">28</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH3FontSize">24</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH4FontSize">20</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH5FontSize">18</sys:Double>
-    <sys:Double x:Key="TextBlockTitleH6FontSize">16</sys:Double>
-    <FontWeight x:Key="TextBlockFontWeight">400</FontWeight>
-    <FontWeight x:Key="TextBlockTitleFontWeight">600</FontWeight>
-    <FontWeight x:Key="TextBlockLinkFontWeight">600</FontWeight>
-    <FontWeight x:Key="TextBlockStrongFontWeight">600</FontWeight>
-
-    <Thickness x:Key="TextBlockTitleH1Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH2Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH3Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH4Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH5Margin">0</Thickness>
-    <Thickness x:Key="TextBlockTitleH6Margin">0</Thickness>
-    <Thickness x:Key="TextBlockParagraphMargin">0</Thickness>
-    <Thickness x:Key="TextBlockCodeBorder">1</Thickness>
-    <CornerRadius x:Key="TextBlockCodeCornerRadius">2</CornerRadius>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
index b4f9efd..7153e51 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -24,31 +24,6 @@
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxBorderedPointeroverBorderBrush" Color="#0062D6" />
 
-    <x:Double x:Key="TextBoxDefaultHeight">30</x:Double>
-    <x:Double x:Key="TextBoxSmallHeight">22</x:Double>
-    <x:Double x:Key="TextBoxLargeHeight">38</x:Double>
-    <x:Double x:Key="TextBoxWrapperDefaultHeight">32</x:Double>
-    <x:Double x:Key="TextBoxWrapperSmallHeight">24</x:Double>
-    <x:Double x:Key="TextBoxWrapperLargeHeight">40</x:Double>
-
-    <CornerRadius x:Key="TextBoxDefaultCornerRadius">3</CornerRadius>
-
-    <CornerRadius x:Key="TextBoxPrefixCornerRadius">3 0 0 3</CornerRadius>
-    <CornerRadius x:Key="TextBoxSuffixCornerRadius">0 3 3 0</CornerRadius>
-    <CornerRadius x:Key="TextBoxSuffixContentCornerRadius">3 0 0 3</CornerRadius>
-    <CornerRadius x:Key="TextBoxPrefixContentCornerRadius">0 3 3 0</CornerRadius>
-    <CornerRadius x:Key="TextBoxBothContentCornerRadius">0 0 0 0</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>
-
     <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="#0059D6" />
     <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="White" />
-
-    <StreamGeometry x:Key="TextBoxClearButtonData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxRevealButtonData">M12 4C5 4 1 10 1 12C1 14 5 20 12 20C19 20 23 14 23 12C23 10 19 4 12 4ZM17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12ZM12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxHideButtonData">M2.02949 4.67856C2.7593 4.28654 3.66871 4.56038 4.06073 5.29018C6.21313 9.29726 8.83179 11.5 12.0001 11.5C15.1685 11.5 17.7871 9.29726 19.9395 5.29018C20.3315 4.56038 21.241 4.28655 21.9708 4.67856C22.7006 5.07058 22.9744 5.97999 22.5824 6.7098C21.9049 7.97104 21.1385 9.15419 20.2743 10.199L23.2001 14.1C23.6971 14.7627 23.5628 15.7029 22.9001 16.2C22.2373 16.697 21.2971 16.5627 20.8001 15.9L18.1186 12.3246C17.448 12.8501 16.7322 13.2957 15.9687 13.6441L17.4046 17.4733C17.6955 18.249 17.3025 19.1136 16.5268 19.4045C15.7511 19.6954 14.8865 19.3024 14.5956 18.5267L13.0956 14.5267C13.0852 14.4988 13.0756 14.4709 13.0669 14.4428C12.7193 14.4806 12.3638 14.5 12.0001 14.5C11.6365 14.5 11.281 14.4806 10.9333 14.4428C10.9246 14.4709 10.9151 14.4988 10.9046 14.5267L9.40463 18.5267C9.11375 19.3024 8.24913 19.6954 7.47345 19.4045C6.69777 19.1136 6.30476 18.249 6.59564 17.4733L8.03159 13.6441C7.26806 13.2957 6.55223 12.8501 5.88163 12.3246L3.20009 15.9C2.70303 16.5627 1.76283 16.697 1.10009 16.2C0.437347 15.7029 0.303032 14.7627 0.800088 14.1L3.72589 10.1989C2.86177 9.15415 2.09533 7.97101 1.41787 6.70979C1.02585 5.97999 1.29969 5.07057 2.02949 4.67856Z</StreamGeometry>
-
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TimePicker.axaml b/src/Semi.Avalonia/Themes/Light/TimePicker.axaml
deleted file mode 100644
index 8f0f635..0000000
--- a/src/Semi.Avalonia/Themes/Light/TimePicker.axaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="TimePickerIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM13.5 6.5V11.3787L17.0607 14.9393C17.6464 15.5251 17.6464 16.4749 17.0607 17.0607C16.4749 17.6464 15.5251 17.6464 14.9393 17.0607L10.9393 13.0607C10.658 12.7794 10.5 12.3978 10.5 12V6.5C10.5 5.67157 11.1716 5 12 5C12.8284 5 13.5 5.67157 13.5 6.5Z</PathGeometry>
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
index 714ef0c..595cd9e 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
@@ -1,17 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-
-    <sys:Double x:Key="ToggleButtonDefaultFontSize">14</sys:Double>
-    <FontWeight x:Key="ToggleButtonDefaultFontWeight">600</FontWeight>
-
-    <Thickness x:Key="ToggleButtonDefaultPadding">12 6</Thickness>
-    <Thickness x:Key="ToggleButtonLargePadding">16 10</Thickness>
-    <Thickness x:Key="ToggleButtonSmallPadding">6 2</Thickness>
-    <Thickness x:Key="ToggleButtonBorderThickness">1</Thickness>
-    <CornerRadius x:Key="ToggleButtonCornerRadius">3</CornerRadius>
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
@@ -94,4 +81,4 @@
     <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedForeground" Color="#B2140C" />
 
     <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Opacity="0.35" Color="#1C1F23" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
index 34f4d87..a01024b 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
@@ -1,7 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Opacity="0.13" Color="#2E3238" />
@@ -15,22 +12,4 @@
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#A4E0A7" />
 
     <SolidColorBrush x:Key="ToggleSwitchIndicatorBorderBrush" Opacity="0.09" Color="#1C1F23" />
-
-    <BoxShadows x:Key="ToggleSwitchKnobBoxShadows">0 0 1 1 #222E3238</BoxShadows>
-
-    <sys:Double x:Key="SizeSwitchDefaultHeight">24</sys:Double>
-    <sys:Double x:Key="SizeSwitchSmallHeight">16</sys:Double>
-    <sys:Double x:Key="SizeSwitchLargeHeight">32</sys:Double>
-    <sys:Double x:Key="SizeSwitchDefaultWidth">40</sys:Double>
-    <sys:Double x:Key="SizeSwitchSmallWidth">26</sys:Double>
-    <sys:Double x:Key="SizeSwitchLargeWidth">54</sys:Double>
-    <sys:Double x:Key="SizeSwitchIndicatorDefaultWidth">18</sys:Double>
-    <sys:Double x:Key="SizeSwitchIndicatorSmallWidth">12</sys:Double>
-    <sys:Double x:Key="SizeSwitchIndicatorLargeWidth">24</sys:Double>
-
-    <sys:Double x:Key="SizeSwitchDefaultFontSize">12</sys:Double>
-    <sys:Double x:Key="SizeSwitchLargeFontSize">14</sys:Double>
-
-    <Thickness x:Key="ToggleSwitchHeaderMargin">8 4</Thickness>
-    <Thickness x:Key="ToggleSwitchOnContentMargin">8 4</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Tooltip.axaml b/src/Semi.Avalonia/Themes/Light/Tooltip.axaml
index 895ccee..4a81dce 100644
--- a/src/Semi.Avalonia/Themes/Light/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Tooltip.axaml
@@ -1,14 +1,5 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="ToolTipTriangleGlyph">M24 0V1C20 1 18.5 2 16.5 4C14.5 6 14 7 12 7C10 7 9.5 6 7.5 4C5.5 2 4 1 0 1V0H24Z</PathGeometry>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ToolTipBackground" Color="#41464C" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="White" />
     <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
-    <CornerRadius x:Key="ToolTipCornerRadius">6</CornerRadius>
-    <Thickness x:Key="ToolTipPadding">12 8</Thickness>
-    <sys:Double x:Key="ToolTipMaxWidth">320</sys:Double>
-    <Thickness x:Key="ToolTipBorderThickness">0</Thickness>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TreeView.axaml b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
index 6146a23..96e61d4 100644
--- a/src/Semi.Avalonia/Themes/Light/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
@@ -1,13 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <sys:Double x:Key="TreeViewItemIndent">20</sys:Double>
-    <sys:Double x:Key="TreeViewItemIconSize">8</sys:Double>
-    <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
-
-    <StreamGeometry x:Key="ExpanderIconData">M9.65618 3.44015L18.6322 11.2454C19.0906 11.644 19.0906 12.356 18.6322 12.7546L9.65618 20.5598C9.00895 21.1226 8 20.6629 8 19.8052V4.19475C8 3.33705 9.00895 2.87734 9.65618 3.44015Z</StreamGeometry>
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#1C1F23" />
@@ -19,7 +10,4 @@
     <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
-
-    <Thickness x:Key="TreeViewItemIconMargin">8 0</Thickness>
-    <Thickness x:Key="TreeViewItemPadding">0 4 8 4</Thickness>
-</ResourceDictionary>
+</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 79237c5..b2e8f39 100644
--- a/src/Semi.Avalonia/Themes/Light/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Window.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="WindowDefaultBackground" Color="White" />
     <SolidColorBrush x:Key="WindowDefaultForeground" Color="#1C1F23" />
-</ResourceDictionary>
+</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
new file mode 100644
index 0000000..7b8d779
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml
@@ -0,0 +1,11 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
+    <Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
+    <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
+    <CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</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>
+    <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
new file mode 100644
index 0000000..3e35801
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Border.axaml
@@ -0,0 +1,7 @@
+<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>
+    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
+</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
new file mode 100644
index 0000000..275ccea
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Button.axaml
@@ -0,0 +1,12 @@
+<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>
+
+    <Thickness x:Key="ButtonBorderThickness">1</Thickness>
+
+    <CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
+</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
new file mode 100644
index 0000000..cec5d0c
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="ButtonSpinnerIncreaseButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
+    <PathGeometry x:Key="ButtonSpinnerDecreaseButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
+
+    <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
new file mode 100644
index 0000000..d8a7552
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Calendar.axaml
@@ -0,0 +1,15 @@
+<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>
+    <GridLength x:Key="CalendarItemWeekDayNameHeight">40</GridLength>
+    <PathGeometry x:Key="CalendarItemPreviousIconGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</PathGeometry>
+    <PathGeometry x:Key="CalendarItemNextIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
+
+    <Thickness x:Key="CalendarItemCalendarButtonBorderThickness">0</Thickness>
+    <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
new file mode 100644
index 0000000..e743c10
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="CalendarDatePickerIconGlyph">M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z</PathGeometry>
+    <Thickness x:Key="CalendarDatePickerBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CalendarDatePickerCornerRadius">3</CornerRadius>
+    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <x:Double x:Key="CalendarDatePickerInnerDefaultHeight">30</x:Double>
+    <x:Double x:Key="CalendarDatePickerInnerSmallHeight">22</x:Double>
+    <x:Double x:Key="CalendarDatePickerInnerLargeHeight">38</x:Double>
+    <x:Double x:Key="CalendarDatePickerDefaultHeight">32</x:Double>
+    <x:Double x:Key="CalendarDatePickerSmallHeight">24</x:Double>
+    <x:Double x:Key="CalendarDatePickerLargeHeight">40</x:Double>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/Shared/CaptionButtons.axaml
new file mode 100644
index 0000000..4ab5b16
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/CaptionButtons.axaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="WindowCloseIconGlyph">M13.46,12L19,17.54V19H17.54L12,13.46L6.46,19H5V17.54L10.54,12L5,6.46V5H6.46L12,10.54L17.54,5H19V6.46L13.46,12Z</PathGeometry>
+    <PathGeometry x:Key="WindowMaximizeGlyph">M4,4H20V20H4V4M6,8V18H18V8H6Z</PathGeometry>
+    <PathGeometry x:Key="WindowMinimizeGlyph">M20,14H4V10H20</PathGeometry>
+    <PathGeometry x:Key="WindowRestoreGlyph">M4,8H8V4H20V16H16V20H4V8M16,8V14H18V6H10V8H16M6,12V18H14V12H6Z</PathGeometry>
+    <PathGeometry x:Key="WindowExpandGlyph">M10,21V19H6.41L10.91,14.5L9.5,13.09L5,17.59V14H3V21H10M14.5,10.91L19,6.41V10H21V3H14V5H17.59L13.09,9.5L14.5,10.91Z</PathGeometry>
+    <PathGeometry x:Key="WindowCollapseGlyph">M19.5,3.09L15,7.59V4H13V11H20V9H16.41L20.91,4.5L19.5,3.09M4,13V15H7.59L3.09,19.5L4.5,20.91L9,16.41V20H11V13H4Z</PathGeometry>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml
new file mode 100644
index 0000000..c225086
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="CarouselButtonGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</PathGeometry>
+
+    <x:Double x:Key="CarouselIndicatorLineSelectedWidth">48</x:Double>
+    <x:Double x:Key="CarouselIndicatorSelectedHeight">8</x:Double>
+    <Thickness x:Key="CarouselButtonMargin">8</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
new file mode 100644
index 0000000..f00ba9d
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="CheckBoxFontSize">14</x:Double>
+    <x:Double x:Key="CheckBoxBoxWidth">16</x:Double>
+    <x:Double x:Key="CheckBoxBoxHeight">16</x:Double>
+    <x:Double x:Key="CheckBoxBoxGlyphWidth">10</x:Double>
+    <x:Double x:Key="CheckBoxBoxGlyphHeight">10</x:Double>
+    <FontWeight x:Key="CheckBoxFontWeight">400</FontWeight>
+
+    <CornerRadius x:Key="CheckBoxBoxCornerRadius">3</CornerRadius>
+    <Thickness x:Key="CheckBoxContentMargin">8 0 0 0</Thickness>
+    <Thickness x:Key="CheckBoxBoxBorderThickness">1</Thickness>
+
+    <PathGeometry x:Key="CheckBoxCheckGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
+    <PathGeometry x:Key="CheckBoxIndeterminateGlyph">M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z</PathGeometry>
+
+    <Thickness x:Key="CheckBoxCardBorderThickness">1</Thickness>
+    <Thickness x:Key="CheckBoxCardPadding">16</Thickness>
+    <CornerRadius x:Key="CheckBoxCardCornerRadius">3</CornerRadius>
+</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
new file mode 100644
index 0000000..7c83ebb
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
@@ -0,0 +1,17 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
+
+    <Thickness x:Key="ComboBoxItemDefaultPadding">8 4</Thickness>
+    <Thickness x:Key="ComboBoxSelectorDefaultPadding">8 0</Thickness>
+
+    <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
+
+    <PathGeometry x:Key="ComboBoxIcon">
+        M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z
+    </PathGeometry>
+
+    <x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
+    <x:Double x:Key="ComboBoxSmallHeight">24</x:Double>
+    <x:Double x:Key="ComboBoxLargeHeight">40</x:Double>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/DatePicker.axaml b/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml
similarity index 95%
rename from src/Semi.Avalonia/Themes/Dark/DatePicker.axaml
rename to src/Semi.Avalonia/Themes/Shared/DatePicker.axaml
index 6964b5d..9503121 100644
--- a/src/Semi.Avalonia/Themes/Dark/DatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DatePicker.axaml
@@ -1,4 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <PathGeometry x:Key="DatePickerIconGlyph">M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z</PathGeometry>
-</ResourceDictionary>
+</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
new file mode 100644
index 0000000..cb22130
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Thickness x:Key="DateTimePickerListItemPadding">0 3 0 6</Thickness>
+    <PathGeometry x:Key="DateTimePickerButtonUpGlyph">M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z</PathGeometry>
+    <PathGeometry x:Key="DateTimePickerButtonDownGlyph">M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z</PathGeometry>
+    <PathGeometry x:Key="DateTimePickerAcceptGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
+    <PathGeometry x:Key="DateTimePickerDismissGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</PathGeometry>
+
+    <x:Double x:Key="DateTimePickerListBoxItemHeight">30</x:Double>
+
+
+    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <Thickness x:Key="DateTimePickerFlyoutPadding">16 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/Light/DropDownButton.axaml b/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml
similarity index 89%
rename from src/Semi.Avalonia/Themes/Light/DropDownButton.axaml
rename to src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml
index cd4f571..ee0f49f 100644
--- a/src/Semi.Avalonia/Themes/Light/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml
@@ -1,4 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <PathGeometry x:Key="DropDownButtonIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
-</ResourceDictionary>
+</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
new file mode 100644
index 0000000..969cec3
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Expander.axaml
@@ -0,0 +1,15 @@
+<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>
+
+    <CornerRadius x:Key="ExpanderHeaderCornerRadius">3</CornerRadius>
+    <Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
+    <Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
+    <Thickness x:Key="ExpanderEndIconMargin">0 0 8 0</Thickness>
+    <Thickness x:Key="ExpanderContentMargin">16 4 16 8</Thickness>
+    <Thickness x:Key="ExpanderFrontIconMargin">8 0 0 0</Thickness>
+    <Thickness x:Key="ExpanderDownContentBorderThickness">0 0 0 1</Thickness>
+    <Thickness x:Key="ExpanderUpContentBorderThickness">0 1 0 0</Thickness>
+    <Thickness x:Key="ExpanderLeftContentBorderThickness">1 0 0 0</Thickness>
+    <Thickness x:Key="ExpanderRightContentBorderThickness">0 0 1 0</Thickness>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Flyout.axaml b/src/Semi.Avalonia/Themes/Shared/Flyout.axaml
new file mode 100644
index 0000000..3495b17
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Flyout.axaml
@@ -0,0 +1,11 @@
+<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>
+    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <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>
+</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
new file mode 100644
index 0000000..c6e24ac
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <CornerRadius x:Key="HeaderedContentControlCornerRadius">4</CornerRadius>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Label.axaml b/src/Semi.Avalonia/Themes/Shared/Label.axaml
new file mode 100644
index 0000000..ffc7296
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Label.axaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Thickness x:Key="LabelTagBorderThickness">1</Thickness>
+    <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>
+</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
new file mode 100644
index 0000000..c920a66
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Thickness x:Key="ListBoxItemDefaultPadding">8 4</Thickness>
+    <CornerRadius x:Key="ListBoxItemCornerRadius">3</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
new file mode 100644
index 0000000..26a4f0a
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="ManagedFileChooserUpButtonGlyph">M20 18V20H13.5C9.91 20 7 17.09 7 13.5V7.83L3.91 10.92L2.5 9.5L8 4L13.5 9.5L12.09 10.91L9 7.83V13.5C9 16 11 18 13.5 18H20Z</PathGeometry>
+</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
new file mode 100644
index 0000000..e6b4150
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Menu.axaml
@@ -0,0 +1,24 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="MenuScrollViewerUpButtonGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</PathGeometry>
+    <PathGeometry x:Key="MenuScrollViewerDownButtonGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
+    <PathGeometry x:Key="MenuItemExpandIconGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
+    <!--  MenuFlyout  -->
+    <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
+    <Thickness x:Key="MenuFlyoutPadding">8</Thickness>
+    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
+    <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>
+
+    <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
new file mode 100644
index 0000000..530a879
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="NotificationCardWidth">320</x:Double>
+    <Thickness x:Key="NotificationCardBorderThickness">1</Thickness>
+    <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
+    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <Geometry x:Key="NotificationCardInformationIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</Geometry>
+    <Geometry x:Key="NotificationCardSuccessIconPathData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</Geometry>
+    <Geometry x:Key="NotificationCardWarningIconPathData">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</Geometry>
+    <Geometry x:Key="NotificationCardErrorIconPathData">M23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12ZM13.5 17.5C13.5 16.6716 12.8284 16 12 16C11.1716 16 10.5 16.6716 10.5 17.5C10.5 18.3284 11.1716 19 12 19C12.8284 19 13.5 18.3284 13.5 17.5ZM12 5C10.9138 5 10.0507 5.91244 10.1109 6.99692L10.4168 12.5023C10.4635 13.3426 11.1584 14 12 14C12.8416 14 13.5365 13.3426 13.5832 12.5023L13.8891 6.99692C13.9493 5.91244 13.0862 5 12 5Z</Geometry>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/NumericUpDown.axaml b/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml
similarity index 87%
rename from src/Semi.Avalonia/Themes/Dark/NumericUpDown.axaml
rename to src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml
index 27105a5..507e6ac 100644
--- a/src/Semi.Avalonia/Themes/Dark/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/NumericUpDown.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <CornerRadius x:Key="NumericUpDownCornerRadius">3</CornerRadius>
     <x:Double x:Key="NumericUpDownWrapperDefaultHeight">32</x:Double>
     <x:Double x:Key="NumericUpDownWrapperSmallHeight">24</x:Double>
     <x:Double x:Key="NumericUpDownWrapperLargeHeight">40</x:Double>
-</ResourceDictionary>
+</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
new file mode 100644
index 0000000..56142f7
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/ProgressBar.axaml
@@ -0,0 +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>
+</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
new file mode 100644
index 0000000..df34b02
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/RadioButton.axaml
@@ -0,0 +1,25 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="RadioButtonIconRadius">16</x:Double>
+    <x:Double x:Key="RadioButtonGlyphRadius">6</x:Double>
+    <x:Double x:Key="RadioButtonFontSize">14</x:Double>
+    <Thickness x:Key="RadioButtonIconMargin">0 2 8 0</Thickness>
+
+
+    <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>
+
+    <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>
+
+    <CornerRadius x:Key="RadioButtonCardCornerRadius">3</CornerRadius>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/Shared/RefreshContainer.axaml
new file mode 100644
index 0000000..1782c7f
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/RefreshContainer.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="RefreshContainerIconSize">24</x:Double>
+    <PathGeometry x:Key="RefreshContainerIconGlyph">M14.2 3.78966C9.66551 2.57466 5.00465 5.26561 3.78964 9.80007C3.12066 12.2967 3.63433 14.8301 4.99177 16.8102C5.46019 17.4935 5.28601 18.4271 4.60273 18.8955C3.91945 19.364 2.98581 19.1898 2.51739 18.5065C0.685557 15.8344 -0.0134454 12.4023 0.891867 9.02361C2.5357 2.88875 8.84157 -0.751945 14.9764 0.891885C21.1113 2.53572 24.752 8.84159 23.1082 14.9765C22.8937 15.7767 22.0712 16.2515 21.271 16.0371C20.4708 15.8227 19.996 15.0002 20.2104 14.2C21.4254 9.66553 18.7344 5.00467 14.2 3.78966Z</PathGeometry>
+</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
new file mode 100644
index 0000000..a08a04e
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="ScrollBarThickness">14</x:Double>
+    <x:Double x:Key="ScrollBarThumbThickness">10</x:Double>
+    <PathGeometry x:Key="ScrollBarLeftGlyph">M16.3176 6.95628V17.0878C16.3176 17.4871 15.8725 17.7253 15.5402 17.5038L7.94161 12.438C7.64474 12.2401 7.64474 11.8039 7.94161 11.606L15.5402 6.54025C15.8725 6.31873 16.3176 6.55693 16.3176 6.95628Z</PathGeometry>
+    <PathGeometry x:Key="ScrollBarRightGlyph">M9 17.0657V6.93425C9 6.5349 9.44507 6.29671 9.77735 6.51823L17.376 11.584C17.6728 11.7819 17.6728 12.2181 17.376 12.416L9.77735 17.4818C9.44507 17.7033 9 17.4651 9 17.0657Z</PathGeometry>
+    <PathGeometry x:Key="ScrollBarUpGlyph">M17.0839 16.3212H6.9524C6.55305 16.3212 6.31486 15.8761 6.53638 15.5438L11.6021 7.94521C11.8 7.64834 12.2363 7.64834 12.4342 7.94521L17.4999 15.5438C17.7214 15.8761 17.4832 16.3212 17.0839 16.3212Z</PathGeometry>
+    <PathGeometry x:Key="ScrollBarDownGlyph">M6.95249 7.72265L17.084 7.72265C17.4833 7.72265 17.7215 8.16772 17.5 8.5L12.4343 16.0986C12.2363 16.3955 11.8001 16.3955 11.6022 16.0986L6.53647 8.5C6.31495 8.16772 6.55315 7.72265 6.95249 7.72265Z</PathGeometry>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Slider.axaml b/src/Semi.Avalonia/Themes/Shared/Slider.axaml
new file mode 100644
index 0000000..cfefeae
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Slider.axaml
@@ -0,0 +1,13 @@
+<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>
+    <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>
+    <BoxShadows x:Key="SliderThumbBoxShadow">0 0 1 1 #1AFFFFFF</BoxShadows>
+
+    <x:Double x:Key="SliderTickHorizontalHeight">4</x:Double>
+    <x:Double x:Key="SliderTickVerticalWidth">4</x:Double>
+    <Thickness x:Key="SliderThumbBorderThickness">2</Thickness>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/SplitButton.axaml b/src/Semi.Avalonia/Themes/Shared/SplitButton.axaml
new file mode 100644
index 0000000..a304813
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/SplitButton.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="SplitButtonIconGlyph">M20.5598 9.65618L12.7546 18.6322C12.3559 19.0906 11.644 19.0906 11.2453 18.6322L3.4401 9.65618C2.8773 9.00895 3.33701 8 4.19471 8L19.8052 8C20.6629 8 21.1226 9.00895 20.5598 9.65618Z</PathGeometry>
+    <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/SplitView.axaml b/src/Semi.Avalonia/Themes/Shared/SplitView.axaml
new file mode 100644
index 0000000..944eb37
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/SplitView.axaml
@@ -0,0 +1,10 @@
+<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>
+    <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/Dark/TabControl.axaml b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
similarity index 56%
rename from src/Semi.Avalonia/Themes/Dark/TabControl.axaml
rename to src/Semi.Avalonia/Themes/Shared/TabItem.axaml
index 9017e8d..9e9c07e 100644
--- a/src/Semi.Avalonia/Themes/Dark/TabControl.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">
-    <!--  Add Resources Here  -->
-</ResourceDictionary>
+    <FontWeight x:Key="TabItemSelectedFontWeight">600</FontWeight>
+</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
new file mode 100644
index 0000000..dc39c51
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
@@ -0,0 +1,25 @@
+<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>
+    <FontWeight x:Key="TextBlockLinkFontWeight">600</FontWeight>
+    <FontWeight x:Key="TextBlockStrongFontWeight">600</FontWeight>
+
+    <Thickness x:Key="TextBlockTitleH1Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH2Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH3Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH4Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH5Margin">0</Thickness>
+    <Thickness x:Key="TextBlockTitleH6Margin">0</Thickness>
+    <Thickness x:Key="TextBlockParagraphMargin">0</Thickness>
+    <Thickness x:Key="TextBlockCodeBorder">1</Thickness>
+    <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
new file mode 100644
index 0000000..46d2a43
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
@@ -0,0 +1,25 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="TextBoxDefaultHeight">30</x:Double>
+    <x:Double x:Key="TextBoxSmallHeight">22</x:Double>
+    <x:Double x:Key="TextBoxLargeHeight">38</x:Double>
+    <x:Double x:Key="TextBoxWrapperDefaultHeight">32</x:Double>
+    <x:Double x:Key="TextBoxWrapperSmallHeight">24</x:Double>
+    <x:Double x:Key="TextBoxWrapperLargeHeight">40</x:Double>
+
+    <CornerRadius x:Key="TextBoxDefaultCornerRadius">3</CornerRadius>
+
+    <CornerRadius x:Key="TextBoxPrefixCornerRadius">3 0 0 3</CornerRadius>
+    <CornerRadius x:Key="TextBoxSuffixCornerRadius">0 3 3 0</CornerRadius>
+    <CornerRadius x:Key="TextBoxSuffixContentCornerRadius">3 0 0 3</CornerRadius>
+    <CornerRadius x:Key="TextBoxPrefixContentCornerRadius">0 3 3 0</CornerRadius>
+    <CornerRadius x:Key="TextBoxBothContentCornerRadius">0 0 0 0</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>
+
+    <StreamGeometry x:Key="TextBoxClearButtonData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
+    <StreamGeometry x:Key="PasswordBoxRevealButtonData">M12 4C5 4 1 10 1 12C1 14 5 20 12 20C19 20 23 14 23 12C23 10 19 4 12 4ZM17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12ZM12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z</StreamGeometry>
+    <StreamGeometry x:Key="PasswordBoxHideButtonData">M2.02949 4.67856C2.7593 4.28654 3.66871 4.56038 4.06073 5.29018C6.21313 9.29726 8.83179 11.5 12.0001 11.5C15.1685 11.5 17.7871 9.29726 19.9395 5.29018C20.3315 4.56038 21.241 4.28655 21.9708 4.67856C22.7006 5.07058 22.9744 5.97999 22.5824 6.7098C21.9049 7.97104 21.1385 9.15419 20.2743 10.199L23.2001 14.1C23.6971 14.7627 23.5628 15.7029 22.9001 16.2C22.2373 16.697 21.2971 16.5627 20.8001 15.9L18.1186 12.3246C17.448 12.8501 16.7322 13.2957 15.9687 13.6441L17.4046 17.4733C17.6955 18.249 17.3025 19.1136 16.5268 19.4045C15.7511 19.6954 14.8865 19.3024 14.5956 18.5267L13.0956 14.5267C13.0852 14.4988 13.0756 14.4709 13.0669 14.4428C12.7193 14.4806 12.3638 14.5 12.0001 14.5C11.6365 14.5 11.281 14.4806 10.9333 14.4428C10.9246 14.4709 10.9151 14.4988 10.9046 14.5267L9.40463 18.5267C9.11375 19.3024 8.24913 19.6954 7.47345 19.4045C6.69777 19.1136 6.30476 18.249 6.59564 17.4733L8.03159 13.6441C7.26806 13.2957 6.55223 12.8501 5.88163 12.3246L3.20009 15.9C2.70303 16.5627 1.76283 16.697 1.10009 16.2C0.437347 15.7029 0.303032 14.7627 0.800088 14.1L3.72589 10.1989C2.86177 9.15415 2.09533 7.97101 1.41787 6.70979C1.02585 5.97999 1.29969 5.07057 2.02949 4.67856Z</StreamGeometry>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TimePicker.axaml b/src/Semi.Avalonia/Themes/Shared/TimePicker.axaml
similarity index 63%
rename from src/Semi.Avalonia/Themes/Dark/TimePicker.axaml
rename to src/Semi.Avalonia/Themes/Shared/TimePicker.axaml
index 8f0f635..ce13e51 100644
--- a/src/Semi.Avalonia/Themes/Dark/TimePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TimePicker.axaml
@@ -1,7 +1,3 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <PathGeometry x:Key="TimePickerIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM13.5 6.5V11.3787L17.0607 14.9393C17.6464 15.5251 17.6464 16.4749 17.0607 17.0607C16.4749 17.6464 15.5251 17.6464 14.9393 17.0607L10.9393 13.0607C10.658 12.7794 10.5 12.3978 10.5 12V6.5C10.5 5.67157 11.1716 5 12 5C12.8284 5 13.5 5.67157 13.5 6.5Z</PathGeometry>
-</ResourceDictionary>
+</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
new file mode 100644
index 0000000..7f4d3b3
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
@@ -0,0 +1,10 @@
+<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="ToggleButtonDefaultPadding">12 6</Thickness>
+    <Thickness x:Key="ToggleButtonLargePadding">16 10</Thickness>
+    <Thickness x:Key="ToggleButtonSmallPadding">6 2</Thickness>
+    <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
new file mode 100644
index 0000000..ad1ba7b
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
@@ -0,0 +1,17 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="SizeSwitchDefaultHeight">24</x:Double>
+    <x:Double x:Key="SizeSwitchSmallHeight">16</x:Double>
+    <x:Double x:Key="SizeSwitchLargeHeight">32</x:Double>
+    <x:Double x:Key="SizeSwitchDefaultWidth">40</x:Double>
+    <x:Double x:Key="SizeSwitchSmallWidth">26</x:Double>
+    <x:Double x:Key="SizeSwitchLargeWidth">54</x:Double>
+    <x:Double x:Key="SizeSwitchIndicatorDefaultWidth">18</x:Double>
+    <x:Double x:Key="SizeSwitchIndicatorSmallWidth">12</x:Double>
+    <x:Double x:Key="SizeSwitchIndicatorLargeWidth">24</x:Double>
+
+    <x:Double x:Key="SizeSwitchDefaultFontSize">12</x:Double>
+    <x:Double x:Key="SizeSwitchLargeFontSize">14</x:Double>
+
+    <Thickness x:Key="ToggleSwitchHeaderMargin">8 4</Thickness>
+    <Thickness x:Key="ToggleSwitchOnContentMargin">8 4</Thickness>
+</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
new file mode 100644
index 0000000..dc0c96e
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="ToolTipTriangleGlyph">M24 0V1C20 1 18.5 2 16.5 4C14.5 6 14 7 12 7C10 7 9.5 6 7.5 4C5.5 2 4 1 0 1V0H24Z</PathGeometry>
+    <CornerRadius x:Key="ToolTipCornerRadius">6</CornerRadius>
+    <Thickness x:Key="ToolTipPadding">12 8</Thickness>
+    <x:Double x:Key="ToolTipMaxWidth">320</x:Double>
+    <Thickness x:Key="ToolTipBorderThickness">0</Thickness>
+</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
new file mode 100644
index 0000000..b591259
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/TreeView.axaml
@@ -0,0 +1,10 @@
+<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>
+    <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
+
+    <StreamGeometry x:Key="ExpanderIconData">M9.65618 3.44015L18.6322 11.2454C19.0906 11.644 19.0906 12.356 18.6322 12.7546L9.65618 20.5598C9.00895 21.1226 8 20.6629 8 19.8052V4.19475C8 3.33705 9.00895 2.87734 9.65618 3.44015Z</StreamGeometry>
+
+    <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/_index.axaml b/src/Semi.Avalonia/Themes/Shared/_index.axaml
new file mode 100644
index 0000000..12db9e4
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml
@@ -0,0 +1,42 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <!--  Controls  -->
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Border.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Button.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Calendar.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/CaptionButtons.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Carousel.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/CheckBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ComboBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/DatePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/DropDownButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Expander.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Label.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ListBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Menu.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/NotificationCard.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/NumericUpDown.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ProgressBar.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/RadioButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/RefreshContainer.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ScrollViewer.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Slider.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/SplitButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/SplitView.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/TabItem.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/TextBlock.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/TextBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/TimePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ToggleButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Tooltip.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/TreeView.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Flyout.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file