diff --git a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
index abcbd39..4dc7d42 100644
--- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
@@ -7,7 +7,6 @@
     x:DataType="viewModels:ColorItemViewModel">
     <StreamGeometry x:Key="CopyIcon">M5 7C3.89543 7 3 7.89543 3 9V19C3 20.1046 3.89543 21 5 21H15C16.1046 21 17 20.1046 17 19V9C17 7.89543 16.1046 7 15 7H5Z,M7 4C7 2.89543 7.89543 2 9 2H20C21.1046 2 22 2.89543 22 4V15C22 16.1046 21.1046 17 20 17H19V8C19 6 18 5 16 5H7V4Z</StreamGeometry>
     <ControlTheme x:Key="{x:Type controls:ColorDetailControl}" TargetType="controls:ColorDetailControl">
-        <!--  Add Resources Here  -->
         <Setter Property="controls:ColorDetailControl.Template">
             <ControlTemplate TargetType="controls:ColorDetailControl">
                 <StackPanel>
diff --git a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
index a557a7b..b3d46be 100644
--- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
@@ -5,9 +5,7 @@
     xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
     x:CompileBindings="True"
     x:DataType="viewModels:FunctionalColorGroupViewModel">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type controls:FunctionalColorGroupControl}" TargetType="controls:FunctionalColorGroupControl">
-        <!--  Add Resources Here  -->
         <Setter Property="controls:FunctionalColorGroupControl.Template">
             <ControlTemplate x:DataType="viewModels:FunctionalColorGroupViewModel" TargetType="controls:FunctionalColorGroupControl">
                 <Grid RowDefinitions="Auto, *">
diff --git a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml b/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
index ccdbbf4..12fc2df 100644
--- a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
+++ b/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
@@ -1,8 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="NavigationTab" TargetType="TabControl">
         <Setter Property="TabControl.Template">
-            <!--    -->
             <ControlTemplate TargetType="TabControl">
                 <Border
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
diff --git a/demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml b/demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml
index acbfbff..da8124c 100644
--- a/demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml
+++ b/demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="SplitViewToggleButton" TargetType="ToggleButton">
         <Setter Property="ToggleButton.Template">
             <ControlTemplate TargetType="ToggleButton">
diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
index 4a5bbbc..0c12b22 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -5,8 +5,11 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pages="using:Semi.Avalonia.Demo.Pages"
+    xmlns:views="clr-namespace:Semi.Avalonia.Demo.Views"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    x:CompileBindings="True"
+    x:DataType="views:MainViewModel"
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -36,43 +39,29 @@
                         Margin="8,0"
                         VerticalAlignment="Center"
                         Classes="Secondary"
-                        Text="{Binding #tab.SelectedItem.Header}" />
+                        Text="{ReflectionBinding #tab.SelectedItem.Header}" />
                 </StackPanel>
                 <StackPanel Grid.Column="1" Orientation="Horizontal">
-                    <Button Theme="{DynamicResource BorderlessButton}" Click="OpenDocumentation">
+                    <Button Click="OpenDocumentation" Theme="{DynamicResource BorderlessButton}">
                         <PathIcon
                             Width="16"
                             Height="16"
                             Data="M12 21.5C10.65 20.65 8.2 20 6.5 20C4.85 20 3.15 20.3 1.75 21.05C1.65 21.1 1.6 21.1 1.5 21.1C1.25 21.1 1 20.85 1 20.6V6C1.6 5.55 2.25 5.25 3 5C4.11 4.65 5.33 4.5 6.5 4.5C8.45 4.5 10.55 4.9 12 6C13.45 4.9 15.55 4.5 17.5 4.5C18.67 4.5 19.89 4.65 21 5C21.75 5.25 22.4 5.55 23 6V20.6C23 20.85 22.75 21.1 22.5 21.1C22.4 21.1 22.35 21.1 22.25 21.05C20.85 20.3 19.15 20 17.5 20C15.8 20 13.35 20.65 12 21.5M12 8V19.5C13.35 18.65 15.8 18 17.5 18C18.7 18 19.9 18.15 21 18.5V7C19.9 6.65 18.7 6.5 17.5 6.5C15.8 6.5 13.35 7.15 12 8M13 11.5C14.11 10.82 15.6 10.5 17.5 10.5C18.41 10.5 19.26 10.59 20 10.78V9.23C19.13 9.08 18.29 9 17.5 9C15.73 9 14.23 9.28 13 9.84V11.5M17.5 11.67C15.79 11.67 14.29 11.93 13 12.46V14.15C14.11 13.5 15.6 13.16 17.5 13.16C18.54 13.16 19.38 13.24 20 13.4V11.9C19.13 11.74 18.29 11.67 17.5 11.67M20 14.57C19.13 14.41 18.29 14.33 17.5 14.33C15.67 14.33 14.17 14.6 13 15.13V16.82C14.11 16.16 15.6 15.83 17.5 15.83C18.54 15.83 19.38 15.91 20 16.07V14.57Z"
                             Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                     </Button>
-                    <Button Theme="{DynamicResource BorderlessButton}" Click="OpenRepository">
+                    <Button Click="OpenRepository" Theme="{DynamicResource BorderlessButton}">
                         <PathIcon
                             Width="16"
                             Height="16"
                             Data="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"
                             Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                     </Button>
-                    <ToggleSwitch
-                        Grid.Column="1"
-                        Padding="4"
-                        IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
-                        Theme="{DynamicResource ButtonToggleSwitch}">
-                        <ToggleSwitch.OnContent>
-                            <PathIcon
-                                Width="16"
-                                Height="16"
-                                Data="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 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z"
-                                Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                        </ToggleSwitch.OnContent>
-                        <ToggleSwitch.OffContent>
-                            <PathIcon
-                                Width="16"
-                                Height="16"
-                                Data="M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13"
-                                Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                        </ToggleSwitch.OffContent>
-                    </ToggleSwitch>
+                    <ComboBox
+                        MinWidth="100"
+                        PlaceholderText="Select a theme"
+                        DisplayMemberBinding="{Binding Name}"
+                        ItemsSource="{Binding Themes}"
+                        SelectedItem="{Binding SelectedTheme}" />
                 </StackPanel>
             </Grid>
 
diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
index a6aec59..b7e74a8 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
@@ -1,8 +1,10 @@
 using System;
+using System.Collections.ObjectModel;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Styling;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Semi.Avalonia.Demo.Views;
 
@@ -11,6 +13,7 @@ public partial class MainView : UserControl
     public MainView()
     {
         InitializeComponent();
+        this.DataContext = new MainViewModel();
     }
 
     private void ToggleButton_OnIsCheckedChanged(object sender, RoutedEventArgs e)
@@ -38,4 +41,36 @@ public partial class MainView : UserControl
         var launcher = top.Launcher;
         await launcher.LaunchUriAsync(new Uri("https://docs.irihi.tech/semi"));
     }
+}
+
+public partial class MainViewModel: ObservableObject
+{
+    public ObservableCollection<ThemeItem> Themes { get; } = new()
+    {
+        new ThemeItem("Light", ThemeVariant.Light),
+        new ThemeItem("Dark", ThemeVariant.Dark),
+        new ThemeItem("Aquatic", SemiTheme.Aquatic),
+        new ThemeItem("Desert", SemiTheme.Desert),
+        new ThemeItem("Dust", SemiTheme.Dust),
+        new ThemeItem("NightSky", SemiTheme.NightSky),
+    };
+    
+    [ObservableProperty] private ThemeItem? _selectedTheme;
+    
+    partial void OnSelectedThemeChanged(ThemeItem? oldValue, ThemeItem? newValue)
+    {
+        if (newValue is null) return;
+        var app = Application.Current;
+        if (app is not null)
+        {
+            app.RequestedThemeVariant = newValue.Theme;
+        }
+    }
+    
+}
+
+public class ThemeItem(string name, ThemeVariant theme)
+{
+    public string Name { get; set; } = name;
+    public ThemeVariant Theme { get; set; } = theme;
 }
\ No newline at end of file
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
index 514af34..ea7d2a7 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
@@ -5,7 +5,6 @@
     xmlns:converters="using:Avalonia.Controls.Converters"
     xmlns:primitives="using:Avalonia.Controls.Primitives"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml" />
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
index 67a5f86..f49f41c 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
@@ -4,7 +4,6 @@
     xmlns:converters="using:Avalonia.Controls.Converters"
     xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <pc:AccentColorConverter x:Key="AccentColorConverter" />
     <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft" />
     <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight" />
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml
index 3389404..8b7fe64 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml
@@ -3,8 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="using:Avalonia.Controls.Converters"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-
     <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
     <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
 
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
index a2f5ced..4bc308e 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
@@ -4,7 +4,6 @@
     xmlns:controls="using:Avalonia.Controls"
     xmlns:converters="using:Avalonia.Controls.Converters"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
     <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
     <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
diff --git a/src/Semi.Avalonia.DataGrid/DataGrid.axaml b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
index 7793490..6a25ff3 100644
--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:collections="using:Avalonia.Collections"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="DataGridCellTextBlockTheme" TargetType="TextBlock">
         <Setter Property="Margin" Value="{DynamicResource DataGridCellTextBlockDefaultMargin}" />
         <Setter Property="VerticalAlignment" Value="Center" />
diff --git a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml b/src/Semi.Avalonia.TreeDataGrid/Dark.axaml
index 2f5ee54..f49426f 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Dark.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="TreeDataGridGridLinesBrush" Opacity="0.08" Color="White" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPressedBackground" Opacity="0.20" Color="White" />
diff --git a/src/Semi.Avalonia.TreeDataGrid/Index.axaml b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
index b557af1..f67ed3c 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Index.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
@@ -1,5 +1,4 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
diff --git a/src/Semi.Avalonia.TreeDataGrid/Light.axaml b/src/Semi.Avalonia.TreeDataGrid/Light.axaml
index f15e970..73c6c8b 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Light.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Light.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="TreeDataGridGridLinesBrush" Opacity="0.08" Color="#1C1F23" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPressedBackground" Opacity="0.13" Color="#2E3238" />
diff --git a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml
index b48fab4..dd2a475 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <StreamGeometry x:Key="TreeDataGridSortIconDescendingPath">
         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
     </StreamGeometry>
diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
index 9a83369..c9e2cbe 100644
--- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls.TreeDataGrid">
-    <!--  Add Resources Here  -->
     <Design.PreviewWith>
         <StackPanel Margin="20">
             <TreeDataGridColumnHeader Header="123" />
diff --git a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
index d3e18ef..8aa84a6 100644
--- a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
@@ -9,9 +9,9 @@
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
-        <Setter Property="AutoCompleteBox.VerticalAlignment" Value="Center" />
-        <Setter Property="AutoCompleteBox.MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
-        <Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
+        <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="AutoCompleteBox">
                 <DataValidationErrors>
diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index 0a46233..27ce9d5 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -113,6 +113,7 @@
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidPrimaryPressedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
@@ -128,6 +129,7 @@
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidPrimaryPressedForeground}" />
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
@@ -209,9 +211,9 @@
         </Style>
 
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidDisabledForeground}" />
             <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDisabledBorderBrush}" />
         </Style>
     </ControlTheme>
 
@@ -252,12 +254,12 @@
         BasedOn="{StaticResource {x:Type Button}}"
         TargetType="Button">
         <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderlessBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonBorderlessBackground}" />
         </Style>
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderlessBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonBorderlessBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
diff --git a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
index e7526b4..8af8827 100644
--- a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
@@ -8,9 +8,9 @@
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="ButtonSpinnerRepeatButton" TargetType="RepeatButton">
-        <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSpinnerRepeatButtonBackground}" />
-        <Setter Property="RepeatButton.Cursor" Value="Hand" />
-        <Setter Property="RepeatButton.Template">
+        <Setter Property="Background" Value="{DynamicResource ButtonSpinnerRepeatButtonBackground}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Template">
             <ControlTemplate>
                 <ContentPresenter
                     x:Name="PART_ContentPresenter"
@@ -38,10 +38,10 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type ButtonSpinner}" TargetType="ButtonSpinner">
-        <Setter Property="ButtonSpinner.BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}" />
-        <Setter Property="ButtonSpinner.BorderThickness" Value="0" />
-        <Setter Property="ButtonSpinner.MinWidth" Value="300" />
-        <Setter Property="ButtonSpinner.Template">
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="MinWidth" Value="300" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ButtonSpinner">
                 <Grid ColumnDefinitions="Auto, *, Auto">
                     <Border
@@ -97,5 +97,8 @@
             <Setter Property="Grid.Column" Value="0" />
             <Setter Property="Margin" Value="0 0 4 0" />
         </Style>
+        <Style Selector="^:pointerover /template/ Border#ButtonGroup">
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonPointeroverBorderBrush}"/>
+        </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/Calendar.axaml b/src/Semi.Avalonia/Controls/Calendar.axaml
index 14d3264..15a6bbb 100644
--- a/src/Semi.Avalonia/Controls/Calendar.axaml
+++ b/src/Semi.Avalonia/Controls/Calendar.axaml
@@ -2,14 +2,12 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-
     <ControlTheme x:Key="{x:Type Calendar}" TargetType="Calendar">
         <Setter Property="Foreground" Value="{DynamicResource CalendarForeground}" />
         <Setter Property="Background" Value="{DynamicResource CalendarBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource CalendarBorderThickness}" />
-        <Setter Property="Calendar.CornerRadius" Value="{DynamicResource CalendarCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CalendarCornerRadius}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Template">
@@ -31,9 +29,9 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type CalendarItem}" TargetType="CalendarItem">
-        <Setter Property="CalendarItem.MinWidth" Value="{DynamicResource CalendarMinWidth}" />
-        <Setter Property="CalendarItem.MinHeight" Value="{DynamicResource CalendarMinHeight}" />
-        <Setter Property="CalendarItem.DayTitleTemplate">
+        <Setter Property="MinWidth" Value="{DynamicResource CalendarMinWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalendarMinHeight}" />
+        <Setter Property="DayTitleTemplate">
             <Template>
                 <TextBlock
                     HorizontalAlignment="Center"
@@ -45,7 +43,7 @@
             </Template>
         </Setter>
 
-        <Setter Property="CalendarItem.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="CalendarItem">
                 <Border
                     Padding="16"
@@ -146,13 +144,13 @@
         <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarButtonForeground}" />
         <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarItemCalendarButtonBorderBrush}" />
-        <Setter Property="CalendarButton.CornerRadius" Value="{DynamicResource CalendarItemCalendarButtonCornerRadius}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CalendarItemCalendarButtonCornerRadius}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="ClipToBounds" Value="False" />
-        <Setter Property="CalendarButton.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="CalendarButton.VerticalContentAlignment" Value="Center" />
-        <Setter Property="CalendarButton.HorizontalAlignment" Value="Stretch" />
-        <Setter Property="CalendarButton.VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="Template">
             <ControlTemplate TargetType="CalendarButton">
                 <ContentControl
diff --git a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
index d9deb27..077726c 100644
--- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
         <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
@@ -103,7 +102,6 @@
                                     CornerRadius="{DynamicResource CalendarCornerRadius}">
                                     <Calendar
                                         Name="PART_Calendar"
-                                        BorderThickness="0"
                                         CornerRadius="{Binding $parent[Border].CornerRadius}"
                                         DisplayDate="{TemplateBinding DisplayDate}"
                                         DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
@@ -141,6 +139,7 @@
         <Style Selector="^:pointerover">
             <Style Selector="^ /template/ Border#Background">
                 <Setter Property="Background" Value="{DynamicResource CalendarDatePickerPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerPointeroverBorderBrush}" />
             </Style>
         </Style>
 
diff --git a/src/Semi.Avalonia/Controls/CaptionButtons.axaml b/src/Semi.Avalonia/Controls/CaptionButtons.axaml
index 1ab3b00..753cc3a 100644
--- a/src/Semi.Avalonia/Controls/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Controls/CaptionButtons.axaml
@@ -2,8 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-
     <ControlTheme x:Key="CaptionButton" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CaptionButtonPressedBackground}" />
diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml
index d6beab9..4b48df4 100644
--- a/src/Semi.Avalonia/Controls/Carousel.axaml
+++ b/src/Semi.Avalonia/Controls/Carousel.axaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="clr-namespace:Semi.Avalonia.Converters"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <converters:ItemToObjectConverter x:Key="ItemsConverter" />
     <ControlTheme x:Key="{x:Type Carousel}" TargetType="Carousel">
         <Setter Property="Template">
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 0068c66..4742a82 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -32,6 +32,7 @@
         <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="MaxDropDownHeight" Value="504" />
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
         <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Cursor" Value="Hand" />
@@ -114,8 +115,7 @@
                             ClipToBounds="False"
                             InheritsTransform="True"
                             IsLightDismissEnabled="True"
-                            IsOpen="{TemplateBinding IsDropDownOpen,
-                                                     Mode=TwoWay}"
+                            IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
                             PlacementTarget="Background"
                             WindowManagerAddShadowHint="False">
                             <Border
@@ -194,6 +194,7 @@
         <!--  Disabled State  -->
         <Style Selector="^:disabled">
             <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorDisabledBorderBrush}" />
             <Style Selector="^ /template/ ContentControl#ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />
             </Style>
@@ -299,10 +300,12 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPointeroverForeground}" />
             <Setter Property="Background" Value="{DynamicResource ComboBoxItemPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:focus /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemFocusForeground}" />
             <Setter Property="Background" Value="{DynamicResource ComboBoxItemFocusBackground}" />
         </Style>
 
@@ -311,10 +314,12 @@
         </Style>
 
         <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPressedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ComboBoxItemPressedBackground}" />
         </Style>
 
         <Style Selector="^:selected">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemSelectedForeground}" />
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedBackground}" />
             </Style>
diff --git a/src/Semi.Avalonia/Controls/DataValidationErrors.axaml b/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
index a91ebf0..b5dcab8 100644
--- a/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:collections="clr-namespace:System.Collections;assembly=netstandard">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type DataValidationErrors}" TargetType="DataValidationErrors">
         <Setter Property="Template">
             <ControlTemplate TargetType="DataValidationErrors">
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 253ac10..9603b19 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -2,13 +2,14 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
         <Setter Property="Width" Value="296" />
         <Setter Property="MinWidth" Value="296" />
         <Setter Property="MaxHeight" Value="300" />
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Background" Value="{DynamicResource DateTimePickerPopupBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerPopupBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CornerRadius" Value="6" />
         <Setter Property="Template">
             <ControlTemplate TargetType="DatePickerPresenter">
diff --git a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
index 6addc9c..6fa26a2 100644
--- a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
@@ -2,8 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-
     <ControlTheme x:Key="DateTimePickerFlyoutButton" TargetType="Button">
         <Setter Property="RenderTransform" Value="none" />
         <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
@@ -26,6 +24,7 @@
 
         <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource DateTimePickerButtonPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerButtonPointeroverBorderBrush}" />
         </Style>
 
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
diff --git a/src/Semi.Avalonia/Controls/DropDownButton.axaml b/src/Semi.Avalonia/Controls/DropDownButton.axaml
index 1528e70..d94d29d 100644
--- a/src/Semi.Avalonia/Controls/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Controls/DropDownButton.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type DropDownButton}" TargetType="DropDownButton">
         <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
@@ -230,11 +229,11 @@
             </Style>
         </Style>
         <Style Selector="^:disabled /template/ Border#RootBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDisabledBorderBrush}" />
             <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidDisabledForeground}" />
         </Style>
     </ControlTheme>
 
diff --git a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
index a0465d4..09a16db 100644
--- a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
+++ b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
@@ -1,6 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-
     <ControlTheme x:Key="{x:Type EmbeddableControlRoot}" TargetType="EmbeddableControlRoot">
         <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
diff --git a/src/Semi.Avalonia/Controls/Expander.axaml b/src/Semi.Avalonia/Controls/Expander.axaml
index a7aea15..b151aba 100644
--- a/src/Semi.Avalonia/Controls/Expander.axaml
+++ b/src/Semi.Avalonia/Controls/Expander.axaml
@@ -9,7 +9,7 @@
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="ExpanderHeaderToggleButtonTheme" TargetType="ToggleButton">
-        <Setter Property="ToggleButton.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="ToggleButton">
                 <ContentPresenter
                     Padding="{TemplateBinding Padding}"
@@ -19,13 +19,13 @@
         </Setter>
     </ControlTheme>
     <ControlTheme x:Key="{x:Type Expander}" TargetType="Expander">
-        <Setter Property="Expander.BorderThickness" Value="1" />
-        <Setter Property="Expander.BorderBrush" Value="{DynamicResource ExpanderSeparatorBorderBrush}" />
-        <Setter Property="Expander.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="Expander.HorizontalAlignment" Value="Stretch" />
-        <Setter Property="Expander.HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Expander.VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="Expander.Template">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ExpanderSeparatorBorderBrush}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="Expander">
                 <DockPanel>
                     <LayoutTransformControl x:Name="ExpanderHeaderLayoutContainer" Margin="{DynamicResource ExpanderHeaderMargin}">
@@ -37,8 +37,7 @@
                             Background="{DynamicResource ExpanderHeaderDefaultBackground}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            IsChecked="{TemplateBinding IsExpanded,
-                                                        Mode=TwoWay}"
+                            IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"
                             IsEnabled="{TemplateBinding IsEnabled}"
                             TextElement.FontWeight="{DynamicResource ExpanderHeaderFontWeight}"
                             TextElement.Foreground="{DynamicResource ExpanderHeaderForeground}"
@@ -77,8 +76,7 @@
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Foreground="{DynamicResource ExpanderContentForeground}"
-                                IsVisible="{TemplateBinding IsExpanded,
-                                                            Mode=TwoWay}" />
+                                IsVisible="{TemplateBinding IsExpanded, Mode=TwoWay}" />
                         </Border>
                     </LayoutTransformControl>
                 </DockPanel>
diff --git a/src/Semi.Avalonia/Controls/GridSplitter.axaml b/src/Semi.Avalonia/Controls/GridSplitter.axaml
index 0748fa6..cbb9414 100644
--- a/src/Semi.Avalonia/Controls/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Controls/GridSplitter.axaml
@@ -6,8 +6,8 @@
         <Setter Property="Focusable" Value="True" />
         <Setter Property="MinWidth" Value="6" />
         <Setter Property="MinHeight" Value="6" />
-        <Setter Property="GridSplitter.ClipToBounds" Value="False" />
-        <Setter Property="GridSplitter.Padding" Value="2" />
+        <Setter Property="ClipToBounds" Value="False" />
+        <Setter Property="Padding" Value="2" />
         <Setter Property="Background" Value="{DynamicResource GridSplitterBackground}" />
         <Setter Property="PreviewContent">
             <Template>
diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml
index 34439ec..c8b738d 100644
--- a/src/Semi.Avalonia/Controls/ListBox.axaml
+++ b/src/Semi.Avalonia/Controls/ListBox.axaml
@@ -16,7 +16,7 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-        <Setter Property="ListBox.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBox">
                 <Border
                     Name="border"
@@ -43,10 +43,10 @@
         </Setter>
     </ControlTheme>
     <ControlTheme x:Key="{x:Type ListBoxItem}" TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemDefaultBackground}" />
-        <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemDefaultPadding}" />
-        <Setter Property="ListBoxItem.CornerRadius" Value="{DynamicResource ListBoxItemCornerRadius}" />
-        <Setter Property="ListBoxItem.Template">
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemDefaultBackground}" />
+        <Setter Property="Padding" Value="{DynamicResource ListBoxItemDefaultPadding}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ListBoxItemCornerRadius}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <ContentPresenter
                     Name="PART_ContentPresenter"
@@ -75,16 +75,19 @@
 
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemPointeroverForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
         </Style>
 
         <!--  Pressed State  -->
         <Style Selector="^:pressed">
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemPressedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
         </Style>
 
         <!--  Selected State  -->
         <Style Selector="^:selected">
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background"
@@ -95,13 +98,13 @@
 
     <!-- RadioGroup -->
     <ControlTheme x:Key="RadioGroupListBox" TargetType="ListBox">
-        <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource RadioGroupListBoxItem}" />
-        <Setter Property="ListBox.ItemsPanel">
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource RadioGroupListBoxItem}" />
+        <Setter Property="ItemsPanel">
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" />
             </ItemsPanelTemplate>
         </Setter>
-        <Setter Property="ListBox.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBox">
                 <Border
                     Background="{TemplateBinding Background}"
@@ -117,17 +120,17 @@
         </Setter>
     </ControlTheme>
     <ControlTheme x:Key="RadioGroupListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.HorizontalAlignment" Value="Left" />
-        <Setter Property="ListBoxItem.VerticalAlignment" Value="Top" />
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.HorizontalContentAlignment" Value="Left" />
-        <Setter Property="ListBoxItem.VerticalContentAlignment" Value="Center" />
-        <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupFontSize}" />
-        <Setter Property="ListBoxItem.CornerRadius" Value="{DynamicResource ListBoxItemRadioGroupBoxCornerRadius}" />
-        <Setter Property="ListBoxItem.Foreground" Value="{DynamicResource ListBoxItemRadioGroupForeground}" />
-        <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemRadioGroupDefaultBackground}" />
-        <Setter Property="ListBoxItem.BorderBrush" Value="{DynamicResource ListBoxItemRadioGroupDefaultBorderBrush}" />
-        <Setter Property="ListBoxItem.Template">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupFontSize}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ListBoxItemRadioGroupBoxCornerRadius}" />
+        <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupForeground}" />
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemRadioGroupDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ListBoxItemRadioGroupDefaultBorderBrush}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Border
                     Name="RootBorder"
@@ -280,19 +283,18 @@
     <ControlTheme x:Key="ButtonRadioGroupListBox"
                   BasedOn="{StaticResource RadioGroupListBox}"
                   TargetType="ListBox">
-        <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource ButtonRadioGroupListBoxItem}" />
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource ButtonRadioGroupListBoxItem}" />
     </ControlTheme>
     <ControlTheme x:Key="ButtonRadioGroupListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.CornerRadius" Value="{DynamicResource ListBoxItemRadioGroupButtonCornerRadius}" />
-        <Setter Property="ListBoxItem.VerticalContentAlignment" Value="Center" />
-        <Setter Property="ListBoxItem.Margin" Value="2" />
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.FontWeight" Value="{DynamicResource ListBoxItemRadioGroupButtonFontWeight}" />
-        <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonDefaultFontSize}" />
-        <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonDefaultPadding}" />
-        <Setter Property="ListBoxItem.Foreground"
-                Value="{DynamicResource ListBoxItemRadioGroupButtonUncheckedForeground}" />
-        <Setter Property="ListBoxItem.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource ListBoxItemRadioGroupButtonCornerRadius}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Margin" Value="2" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="FontWeight" Value="{DynamicResource ListBoxItemRadioGroupButtonFontWeight}" />
+        <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonDefaultFontSize}" />
+        <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonDefaultPadding}" />
+        <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupButtonUncheckedForeground}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <ContentPresenter
                     x:Name="PART_ContentPresenter"
@@ -345,19 +347,19 @@
     <ControlTheme x:Key="CardRadioGroupListBox"
                   BasedOn="{StaticResource RadioGroupListBox}"
                   TargetType="ListBox">
-        <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource CardRadioGroupListBoxItem}" />
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource CardRadioGroupListBoxItem}" />
     </ControlTheme>
     <ControlTheme x:Key="CardRadioGroupListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupCardPadding}" />
-        <Setter Property="ListBoxItem.BorderThickness" Value="1" />
-        <Setter Property="ListBoxItem.CornerRadius" Value="{DynamicResource ListBoxItemRadioGroupCardCornerRadius}" />
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.HorizontalAlignment" Value="Left" />
-        <Setter Property="ListBoxItem.VerticalAlignment" Value="Center" />
-        <Setter Property="ListBoxItem.HorizontalContentAlignment" Value="Left" />
-        <Setter Property="ListBoxItem.VerticalContentAlignment" Value="Center" />
-        <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemRadioGroupCardDefaultBackground}" />
-        <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupFontSize}" />
+        <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupCardPadding}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ListBoxItemRadioGroupCardCornerRadius}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemRadioGroupCardDefaultBackground}" />
+        <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupFontSize}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Border
@@ -531,17 +533,17 @@
     <ControlTheme x:Key="PureCardRadioGroupListBox"
                   BasedOn="{StaticResource RadioGroupListBox}"
                   TargetType="ListBox">
-        <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource PureCardRadioGroupListBoxItem}" />
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource PureCardRadioGroupListBoxItem}" />
     </ControlTheme>
     <ControlTheme x:Key="PureCardRadioGroupListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.CornerRadius" Value="{DynamicResource ListBoxItemRadioGroupCardCornerRadius}" />
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.VerticalContentAlignment" Value="Center" />
-        <Setter Property="ListBoxItem.BorderThickness" Value="1" />
-        <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupFontSize}" />
-        <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupCardPadding}" />
-        <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemRadioGroupCardDefaultBackground}" />
-        <Setter Property="ListBoxItem.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource ListBoxItemRadioGroupCardCornerRadius}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupFontSize}" />
+        <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupCardPadding}" />
+        <Setter Property="Background" Value="{DynamicResource ListBoxItemRadioGroupCardDefaultBackground}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <ContentPresenter
                     x:Name="PART_ContentPresenter"
@@ -603,7 +605,7 @@
     <ControlTheme x:Key="CheckGroupListBox"
                   BasedOn="{StaticResource RadioGroupListBox}"
                   TargetType="ListBox">
-        <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource CheckGroupListBoxItem}" />
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource CheckGroupListBoxItem}" />
     </ControlTheme>
     <ControlTheme x:Key="CheckGroupListBoxItem" TargetType="ListBoxItem">
         <Setter Property="Padding" Value="8,0,0,0" />
@@ -784,7 +786,7 @@
     <ControlTheme x:Key="CardCheckGroupListBox"
                   BasedOn="{StaticResource RadioGroupListBox}"
                   TargetType="ListBox">
-        <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource CardCheckGroupListBoxItem}" />
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource CardCheckGroupListBoxItem}" />
     </ControlTheme>
     <ControlTheme x:Key="CardCheckGroupListBoxItem" TargetType="ListBoxItem">
         <Setter Property="Cursor" Value="Hand" />
@@ -793,7 +795,7 @@
         <Setter Property="BorderThickness" Value="{DynamicResource ListBoxItemCheckCardBorderThickness}" />
         <Setter Property="CornerRadius" Value="{DynamicResource ListBoxItemCheckCardCornerRadius}" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="ListBoxItem.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Border
                     Name="RootBorder"
diff --git a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
index b86b576..e461318 100644
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -6,7 +6,6 @@
     xmlns:internal="clr-namespace:Avalonia.Dialogs.Internal;assembly=Avalonia.Dialogs"
     xmlns:cvt="using:Avalonia.Controls.Converters"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <Design.PreviewWith>
         <Border
             Width="800"
diff --git a/src/Semi.Avalonia/Controls/Menu.axaml b/src/Semi.Avalonia/Controls/Menu.axaml
index 7bf0dda..a60c05e 100644
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/src/Semi.Avalonia/Controls/Menu.axaml
@@ -234,6 +234,15 @@
             <Style Selector="^ /template/ Border#PART_LayoutRoot">
                 <Setter Property="Background" Value="{DynamicResource MenuItemPointeroverBackground}" />
             </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource MenuItemPointeroverForeground}" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_InputGestureText">
+                <Setter Property="Foreground" Value="{DynamicResource MenuItemPointeroverForeground}" />
+            </Style>
+            <Style Selector="^ /template/ PathIcon#PART_ExpandIcon">
+                <Setter Property="Foreground" Value="{DynamicResource MenuItemPointeroverForeground}" />
+            </Style>
         </Style>
 
         <!--  Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed  -->
@@ -356,6 +365,9 @@
             <Style Selector="^ /template/ Border#PART_LayoutRoot">
                 <Setter Property="Background" Value="{DynamicResource MenuItemPointeroverBackground}" />
             </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource MenuItemPointeroverForeground}" />
+            </Style>
         </Style>
 
         <!--  Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed  -->
diff --git a/src/Semi.Avalonia/Controls/NumericUpDown.axaml b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
index b970893..3a4210d 100644
--- a/src/Semi.Avalonia/Controls/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
         <Setter Property="NumericUpDown.VerticalAlignment" Value="Center" />
         <Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
diff --git a/src/Semi.Avalonia/Controls/RefreshContainer.axaml b/src/Semi.Avalonia/Controls/RefreshContainer.axaml
index 48497c7..c785d79 100644
--- a/src/Semi.Avalonia/Controls/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Controls/RefreshContainer.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type RefreshContainer}" TargetType="RefreshContainer">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/Semi.Avalonia/Controls/RepeatButton.axaml b/src/Semi.Avalonia/Controls/RepeatButton.axaml
index 357c94f..ed8bafd 100644
--- a/src/Semi.Avalonia/Controls/RepeatButton.axaml
+++ b/src/Semi.Avalonia/Controls/RepeatButton.axaml
@@ -108,6 +108,7 @@
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidPrimaryPressedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
@@ -123,6 +124,7 @@
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidPrimaryPressedForeground}" />
                 <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
@@ -204,9 +206,9 @@
         </Style>
 
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidDisabledForeground}" />
             <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDisabledBorderBrush}" />
         </Style>
     </ControlTheme>
 
@@ -247,12 +249,12 @@
         BasedOn="{StaticResource {x:Type RepeatButton}}"
         TargetType="RepeatButton">
         <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderlessBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonBorderlessBackground}" />
         </Style>
         <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderlessBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonBorderlessBackground}" />
             <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
diff --git a/src/Semi.Avalonia/Controls/Slider.axaml b/src/Semi.Avalonia/Controls/Slider.axaml
index 1af8a6b..af43caf 100644
--- a/src/Semi.Avalonia/Controls/Slider.axaml
+++ b/src/Semi.Avalonia/Controls/Slider.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="SliderHorizontalRepeatButton" TargetType="RepeatButton">
         <Setter Property="Template">
             <ControlTemplate TargetType="RepeatButton">
diff --git a/src/Semi.Avalonia/Controls/SplitButton.axaml b/src/Semi.Avalonia/Controls/SplitButton.axaml
index 027b580..98e76d7 100644
--- a/src/Semi.Avalonia/Controls/SplitButton.axaml
+++ b/src/Semi.Avalonia/Controls/SplitButton.axaml
@@ -224,6 +224,7 @@
         <!-- only for ToggleSplitButton -->
         <Style Selector="^:checked:disabled /template/ Button">
             <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -306,7 +307,7 @@
 
         <Style Selector="^:disabled /template/ Button">
             <Setter Property="Background" Value="{DynamicResource ButtonSolidDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidDisabledForeground}" />
         </Style>
     </ControlTheme>
 
diff --git a/src/Semi.Avalonia/Controls/SplitView.axaml b/src/Semi.Avalonia/Controls/SplitView.axaml
index 852ffc2..f940c67 100644
--- a/src/Semi.Avalonia/Controls/SplitView.axaml
+++ b/src/Semi.Avalonia/Controls/SplitView.axaml
@@ -1,6 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-
     <ControlTheme x:Key="{x:Type SplitView}" TargetType="SplitView">
         <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
         <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index bd514f1..a408fd3 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type TabControl}" TargetType="TabControl">
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
diff --git a/src/Semi.Avalonia/Controls/TabStrip.axaml b/src/Semi.Avalonia/Controls/TabStrip.axaml
index fa5a9d1..23ea298 100644
--- a/src/Semi.Avalonia/Controls/TabStrip.axaml
+++ b/src/Semi.Avalonia/Controls/TabStrip.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type TabStrip}" TargetType="TabStrip">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 30b425c..2c4314b 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -24,25 +24,25 @@
     </MenuFlyout>
 
     <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
-        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
-        <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDefaultBackground}" />
-        <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
-        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
-        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
-        <Setter Property="TextBox.BackgroundSizing" Value="OuterBorderEdge" />
-        <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
-        <Setter Property="TextBox.FontSize" Value="14" />
-        <Setter Property="TextBox.Cursor" Value="Ibeam" />
-        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
-        <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
-        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
-        <Setter Property="TextBox.VerticalAlignment" Value="Center" />
-        <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
-        <Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Cursor" Value="Ibeam" />
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="Padding" Value="{DynamicResource TextBoxContentPadding}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-        <Setter Property="TextBox.ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
-        <Setter Property="TextBox.Template">
+        <Setter Property="ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="TextBox">
                 <DataValidationErrors>
                     <Border
@@ -131,6 +131,7 @@
 
         <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
@@ -197,8 +198,8 @@
                 <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
-                <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
             </Style>
 
             <Style Selector="^:error">
@@ -230,25 +231,25 @@
     </ControlTheme>
 
     <ControlTheme x:Key="NonErrorTextBox" TargetType="TextBox">
-        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
-        <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDefaultBackground}" />
-        <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
-        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
-        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
-        <Setter Property="TextBox.BackgroundSizing" Value="OuterBorderEdge" />
-        <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
-        <Setter Property="TextBox.FontSize" Value="14" />
-        <Setter Property="TextBox.Cursor" Value="Ibeam" />
-        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
-        <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
-        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
-        <Setter Property="TextBox.VerticalAlignment" Value="Center" />
-        <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
-        <Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Cursor" Value="Ibeam" />
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="Padding" Value="{DynamicResource TextBoxContentPadding}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-        <Setter Property="TextBox.ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
-        <Setter Property="TextBox.Template">
+        <Setter Property="ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="TextBox">
                 <DataValidationErrors Theme="{DynamicResource SilentDataValidationErrors}">
                     <Border
@@ -337,6 +338,7 @@
 
         <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
@@ -403,8 +405,8 @@
                 <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
-                <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
             </Style>
 
             <Style Selector="^:error">
@@ -436,19 +438,19 @@
     </ControlTheme>
 
     <ControlTheme x:Key="LooklessTextBox" TargetType="TextBox">
-        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
-        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
-        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.FontSize" Value="14" />
-        <Setter Property="TextBox.Cursor" Value="Ibeam" />
-        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
-        <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
-        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
-        <Setter Property="TextBox.VerticalAlignment" Value="Center" />
-        <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
-        <Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Cursor" Value="Ibeam" />
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="Padding" Value="{DynamicResource TextBoxContentPadding}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-        <Setter Property="TextBox.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="TextBox">
                 <Border Name="PART_ContentPresenterBorder" MinHeight="{TemplateBinding MinHeight}">
                     <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
diff --git a/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml b/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml
index 6267f74..8b3e72e 100644
--- a/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml
+++ b/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml
@@ -2,9 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type ThemeVariantScope}" TargetType="ThemeVariantScope">
-        <!--  Add Resources Here  -->
         <Setter Property="TextElement.Foreground" Value="{DynamicResource DefaultForeground}" />
         <Setter Property="TextElement.FontSize" Value="{DynamicResource DefaultFontSize}" />
         <Setter Property="TextElement.FontFamily" Value="{DynamicResource DefaultFontFamily}" />
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index e913134..a2ea653 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -2,14 +2,14 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-
     <ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
         <Setter Property="Width" Value="242" />
         <Setter Property="MinWidth" Value="242" />
         <Setter Property="MaxHeight" Value="300" />
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Background" Value="{DynamicResource DateTimePickerPopupBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerPopupBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CornerRadius" Value="6" />
         <Setter Property="Template">
             <ControlTemplate TargetType="TimePickerPresenter">
diff --git a/src/Semi.Avalonia/Controls/TitleBar.axaml b/src/Semi.Avalonia/Controls/TitleBar.axaml
index de0b3cd..3fa988e 100644
--- a/src/Semi.Avalonia/Controls/TitleBar.axaml
+++ b/src/Semi.Avalonia/Controls/TitleBar.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type TitleBar}" TargetType="TitleBar">
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
diff --git a/src/Semi.Avalonia/Controls/ToggleButton.axaml b/src/Semi.Avalonia/Controls/ToggleButton.axaml
index 730a0e8..b069fa3 100644
--- a/src/Semi.Avalonia/Controls/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleButton.axaml
@@ -98,6 +98,7 @@
         <Style Selector="^:checked">
             <Setter Property="Foreground" Value="{DynamicResource ToggleButtonCheckedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryCheckedBorderBrush}" />
             <Style Selector="^.Primary">
                 <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
             </Style>
@@ -138,9 +139,12 @@
                 </Style>
             </Style>
             <Style Selector="^:pressed">
+                <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedForeground}" />
                 <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBorderBrush}" />
                 <Style Selector="^.Primary">
                     <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^.Secondary">
                     <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPressedBackground}" />
@@ -256,6 +260,9 @@
 
         <Style Selector="^:disabled">
             <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultDisabledForeground}" />
+            <Style Selector="^:checked">
+                <Setter Property="Foreground" Value="{DynamicResource ToggleButtonCheckedDisabledForeground}" />
+            </Style>
         </Style>
 
         <Style Selector="^.Large">
diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
index f495b36..c4d92b7 100644
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -54,6 +54,8 @@
                         TemplatedControl.IsTemplateFocusTarget="True"
                         Width="{DynamicResource ToggleSwitchDefaultWidth}"
                         Height="{DynamicResource ToggleSwitchDefaultHeight}"
+                        BorderBrush="{DynamicResource ToggleSwitchDefaultBorderBrush}"
+                        BorderThickness="1"
                         CornerRadius="100">
                         <Border.Transitions>
                             <Transitions>
@@ -294,6 +296,8 @@
                     Cursor="Hand"
                     Width="{DynamicResource ToggleSwitchDefaultWidth}"
                     Height="{DynamicResource ToggleSwitchDefaultHeight}"
+                    BorderBrush="{DynamicResource ToggleSwitchDefaultBorderBrush}"
+                    BorderThickness="1"
                     CornerRadius="100">
                     <Border.Transitions>
                         <Transitions>
diff --git a/src/Semi.Avalonia/Controls/Tooltip.axaml b/src/Semi.Avalonia/Controls/Tooltip.axaml
index 080b8a1..8e6b405 100644
--- a/src/Semi.Avalonia/Controls/Tooltip.axaml
+++ b/src/Semi.Avalonia/Controls/Tooltip.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type ToolTip}" TargetType="ToolTip">
         <Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
         <Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
diff --git a/src/Semi.Avalonia/Controls/TreeView.axaml b/src/Semi.Avalonia/Controls/TreeView.axaml
index 658ad7b..bccadae 100644
--- a/src/Semi.Avalonia/Controls/TreeView.axaml
+++ b/src/Semi.Avalonia/Controls/TreeView.axaml
@@ -23,10 +23,10 @@
     </Design.PreviewWith>
 
     <ControlTheme x:Key="{x:Type TreeView}" TargetType="TreeView">
-        <Setter Property="TreeView.Background" Value="Transparent" />
-        <Setter Property="TreeView.BorderBrush" Value="Transparent" />
-        <Setter Property="TreeView.BorderThickness" Value="0" />
-        <Setter Property="TreeView.Padding" Value="8 0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="8 0" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
@@ -94,11 +94,11 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type TreeViewItem}" TargetType="TreeViewItem">
-        <Setter Property="TreeViewItem.Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
-        <Setter Property="TreeViewItem.Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
-        <Setter Property="TreeViewItem.CornerRadius" Value="3" />
-        <Setter Property="TreeViewItem.VerticalAlignment" Value="Center" />
-        <Setter Property="TreeViewItem.Template">
+        <Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
+        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="TreeViewItem">
                 <StackPanel>
                     <Border
@@ -112,17 +112,14 @@
                         TemplatedControl.IsTemplateFocusTarget="True">
                         <Grid
                             Name="PART_Header"
-                            Margin="{TemplateBinding Level,
-                                                     Mode=OneWay,
-                                                     Converter={StaticResource TreeViewItemLeftMarginConverter}}"
+                            Margin="{TemplateBinding Level, Mode=OneWay, Converter={StaticResource TreeViewItemLeftMarginConverter}}"
                             ColumnDefinitions="Auto, *">
                             <ToggleButton
                                 Name="PART_ExpandCollapseChevron"
                                 Grid.Column="0"
                                 Padding="{DynamicResource TreeViewItemIconMargin}"
                                 Focusable="False"
-                                IsChecked="{TemplateBinding IsExpanded,
-                                                            Mode=TwoWay}"
+                                IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"
                                 Theme="{StaticResource ToggleButtonTreeViewItemIconButton}" />
                             <ContentPresenter
                                 Name="PART_HeaderPresenter"
@@ -167,6 +164,9 @@
         <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" />
         </Style>
+        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
+        </Style>
 
         <!--  Disabled Selected state  -->
         <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">
diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml
index 73279bf..65432c3 100644
--- a/src/Semi.Avalonia/Themes/Dark/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml
@@ -23,6 +23,7 @@
 
     <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedForeground" Color="White" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="#A9D7FF" />
 
     <SolidColorBrush x:Key="ButtonSolidSecondaryBackground" Color="#40B4F3" />
@@ -69,7 +70,9 @@
     <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#FD9983" />
     <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#FDBEAC" />
 
+    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Transparent" />
     <!--  end Solid  -->
 
     <!--  Outline -->
@@ -82,6 +85,11 @@
     <SolidColorBrush x:Key="ButtonOutlineDangerBorderBrush" Color="#FC725A" />
     <!--  end Outline  -->
 
+    <!--  Borderless -->
+    <SolidColorBrush x:Key="ButtonBorderlessBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonBorderlessBorderBrush" Color="Transparent" />
+    <!--  end Borderless  -->
+
     <SolidColorBrush x:Key="ButtonInputInnerForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="#7FC1FF" />
     <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="#A9D7FF" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
index 86a3abd..29fa9fd 100644
--- a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="#35363C" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Opacity="0.04" Color="#2E3238" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Opacity="0.6" Color="#F9F9F9" />
diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
index 817c7e1..ef751e8 100644
--- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -3,7 +3,9 @@
     <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 5d8a707..02a1b71 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -4,6 +4,7 @@
     <SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.20" Color="White" />
     <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="#54A9FF" />
@@ -24,9 +25,13 @@
     <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ComboBoxItemFocusBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
     <SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
 
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index 8a9b1a9..2b873a6 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -1,6 +1,7 @@
 <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="#43444A" />
+    <SolidColorBrush x:Key="DateTimePickerPopupBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#F9F9F9" />
@@ -20,6 +21,7 @@
     <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
index 01b9e96..9511231 100644
--- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
@@ -3,8 +3,11 @@
     <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxItemPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
     <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
index 67fb339..80ae504 100644
--- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -12,6 +12,7 @@
     <SolidColorBrush x:Key="MenuItemForeground" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="White" />
+    <SolidColorBrush x:Key="MenuItemPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.16" Color="White" />
 
diff --git a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
index f9b5024..9d1e8d9 100644
--- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
@@ -4,6 +4,7 @@
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxDefaultBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.2" Color="White" />
     <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="TextBoxForeground" Color="#F9F9F9" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
index 3f05a77..9cc471a 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
@@ -4,6 +4,7 @@
     <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.20" Color="White" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />
 
@@ -15,6 +16,7 @@
     <SolidColorBrush x:Key="ToggleButtonDefaultDangerForeground" Color="#FC725A" />
 
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#40B4F3" />
     <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#888D92" />
     <SolidColorBrush x:Key="ToggleButtonSuccessCheckedBackground" Color="#5DC264" />
@@ -28,7 +30,9 @@
     <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#FFC772" />
     <SolidColorBrush x:Key="ToggleButtonDangerCheckedPointeroverBackground" Color="#FD9983" />
 
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#9DDCF9" />
     <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#C6CACD" />
     <SolidColorBrush x:Key="ToggleButtonSuccessCheckedPressedBackground" Color="#A6E1A8" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
index f5d6888..9e098a1 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -1,4 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToggleSwitchDefaultBorderBrush" Color="Transparent" />
+
     <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" />
diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
index 22802dd..4ecbd61 100644
--- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
@@ -5,8 +5,10 @@
     <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
diff --git a/src/Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml b/src/Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml
new file mode 100644
index 0000000..257c726
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="AdornerLayerStroke" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml b/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml
new file mode 100644
index 0000000..28b911a
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml
@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Color x:Key="WindowColor">#202020</Color>
+    <Color x:Key="WindowTextColor">#FFFFFF</Color>
+    <Color x:Key="HotlightColor">#75E9FC</Color>
+    <Color x:Key="GrayTextColor">#A6A6A6</Color>
+    <Color x:Key="HighlightTextColor">#263B50</Color>
+    <Color x:Key="HighlightColor">#8EE3F0</Color>
+    <Color x:Key="ButtonTextColor">#FFFFFF</Color>
+    <Color x:Key="ButtonFaceColor">#202020</Color>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml
new file mode 100644
index 0000000..d1b18c5
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Color="{StaticResource ButtonTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Border.axaml b/src/Semi.Avalonia/Themes/HighContrast/Border.axaml
new file mode 100644
index 0000000..8c393fc
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Border.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BorderCardBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="BorderCardBorderBrush" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Button.axaml b/src/Semi.Avalonia/Themes/HighContrast/Button.axaml
new file mode 100644
index 0000000..a159fd3
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Button.axaml
@@ -0,0 +1,48 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Light  -->
+    <SolidColorBrush x:Key="ButtonDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ButtonDefaultBackground" Color="{StaticResource ButtonFaceColor}" />
+    <SolidColorBrush x:Key="ButtonDefaultPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <!--  end Light  -->
+
+    <!--  Solid  -->
+    <SolidColorBrush x:Key="ButtonSolidForeground" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="{StaticResource ButtonFaceColor}" />
+
+    <SolidColorBrush x:Key="ButtonSolidPrimaryBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Color="{StaticResource ButtonFaceColor}" />
+    <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Transparent" />
+    <!--  end Solid  -->
+
+    <!--  Borderless -->
+    <SolidColorBrush x:Key="ButtonBorderlessBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonBorderlessBorderBrush" Color="Transparent" />
+    <!--  end Borderless  -->
+
+    <!--  Outline -->
+    <SolidColorBrush x:Key="ButtonOutlineBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonOutlineBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ButtonOutlinePointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ButtonOutlinePressedBackground" Color="{StaticResource WindowColor}" />
+    <!--  end Outline  -->
+
+    <SolidColorBrush x:Key="ButtonInputInnerForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="{StaticResource HighlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml
new file mode 100644
index 0000000..a3bbf1b
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="{StaticResource ButtonFaceColor}" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPressedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonDisabledBackground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBorderBrush" Color="{StaticResource ButtonTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Calendar.axaml b/src/Semi.Avalonia/Themes/HighContrast/Calendar.axaml
new file mode 100644
index 0000000..e82244f
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Calendar.axaml
@@ -0,0 +1,35 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="CalendarBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="CalendarForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="CalendarBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemIconForeground" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBorderBrush" Color="Transparent" />
+
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayBackground" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonBlackoutForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonInactiveForeground" Color="{StaticResource GrayTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml
new file mode 100644
index 0000000..3bc7595
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="CalendarDatePickerIconForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="{StaticResource ButtonTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/CaptionButtons.axaml b/src/Semi.Avalonia/Themes/HighContrast/CaptionButtons.axaml
new file mode 100644
index 0000000..b44919e
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/CaptionButtons.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="CaptionButtonPressedBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="CaptionButtonClosePointeroverBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="CaptionButtonClosePressedBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="CaptionButtonForeground" Color="{StaticResource ButtonTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Carousel.axaml b/src/Semi.Avalonia/Themes/HighContrast/Carousel.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Carousel.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml
new file mode 100644
index 0000000..05ed7a2
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml
@@ -0,0 +1,34 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="CheckBoxForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="CheckBoxGlyphFill" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxGlyphDisabledFill" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="CheckBoxDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="CheckBoxDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CheckBoxPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CheckBoxCheckedPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="CheckBoxDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBackground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="CheckBoxCardCheckedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxCardPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxCardPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="CheckBoxCardCheckedPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ComboBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/ComboBox.axaml
new file mode 100644
index 0000000..bd83982
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/ComboBox.axaml
@@ -0,0 +1,39 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ComboBoxSelectorBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxIconFocusForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ComboBoxDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Color="{StaticResource ButtonTextColor}" />
+
+    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="ComboBoxItemBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemFocusBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Color="{StaticResource WindowColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml
new file mode 100644
index 0000000..40df42c
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml
@@ -0,0 +1,11 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Opacity="0.4" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FC725A" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/DatePicker.axaml b/src/Semi.Avalonia/Themes/HighContrast/DatePicker.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/DatePicker.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml
new file mode 100644
index 0000000..2ad6df5
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml
@@ -0,0 +1,28 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="DateTimePickerPopupBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedBackground" Color="{StaticResource WindowColor}" />
+
+    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Color="{StaticResource WindowTextColor}" />
+
+
+    <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="DateTimePickerButtonBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="DateTimePickerButtonForeground" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="DateTimePickerIconForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Color="{StaticResource GrayTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml b/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml
new file mode 100644
index 0000000..60c1a26
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml
@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Color x:Key="WindowColor">#FFFAEF</Color>
+    <Color x:Key="WindowTextColor">#3D3D3D</Color>
+    <Color x:Key="HotlightColor">#1C5E75</Color>
+    <Color x:Key="GrayTextColor">#676767</Color>
+    <Color x:Key="HighlightTextColor">#FFF5E3</Color>
+    <Color x:Key="HighlightColor">#903909</Color>
+    <Color x:Key="ButtonTextColor">#202020</Color>
+    <Color x:Key="ButtonFaceColor">#FFFAEF</Color>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/DropDownButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/DropDownButton.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/DropDownButton.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml b/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml
new file mode 100644
index 0000000..6d4f033
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml
@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Color x:Key="WindowColor">#2D3236</Color>
+    <Color x:Key="WindowTextColor">#FFFFFF</Color>
+    <Color x:Key="HotlightColor">#70EBDE</Color>
+    <Color x:Key="GrayTextColor">#A6A6A6</Color>
+    <Color x:Key="HighlightTextColor">#212D3B</Color>
+    <Color x:Key="HighlightColor">#A1BFDE</Color>
+    <Color x:Key="ButtonTextColor">#B6F6F0</Color>
+    <Color x:Key="ButtonFaceColor">#2D3236</Color>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Expander.axaml b/src/Semi.Avalonia/Themes/HighContrast/Expander.axaml
new file mode 100644
index 0000000..6b50395
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Expander.axaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ExpanderSeparatorBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ExpanderHeaderDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ExpanderHeaderDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ExpanderHeaderHoverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ExpanderHeaderPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ExpanderContentForeground" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Flyout.axaml b/src/Semi.Avalonia/Themes/HighContrast/Flyout.axaml
new file mode 100644
index 0000000..85cf63b
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Flyout.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="FlyoutBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="FlyoutForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="FlyoutBorderBrush" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/GridSplitter.axaml b/src/Semi.Avalonia/Themes/HighContrast/GridSplitter.axaml
new file mode 100644
index 0000000..c452ddc
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/GridSplitter.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="GridSplitterBackground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="GridSplitterPreviewBackground" Color="{StaticResource HotlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml
new file mode 100644
index 0000000..2d0c943
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="HeaderedContentControlDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="HeaderedContentControlDefaultBorderBrush" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
new file mode 100644
index 0000000..8f8b9d1
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="HyperlinkButtonDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="HyperlinkButtonOverForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="{StaticResource HighlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Label.axaml b/src/Semi.Avalonia/Themes/HighContrast/Label.axaml
new file mode 100644
index 0000000..9b91be8
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Label.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ListBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/ListBox.axaml
new file mode 100644
index 0000000..48235fc
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/ListBox.axaml
@@ -0,0 +1,96 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- ListBox -->
+    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Color="{StaticResource HighlightTextColor}" />
+    <!-- RadioGroupListBox -->
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPressedBackground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDisabledBackground" Color="{StaticResource WindowColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconPressedBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupUncheckIconDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+
+
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDefaultBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBackground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckIconDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCheckGlyphFill" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupDefaultBorderBrush" Color="{StaticResource WindowTextColor}" />
+
+    <!-- ButtonRadioGroupListBox -->
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedPointeroverBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <!-- CardRadioGroupListBox -->
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardDefaultBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardCheckPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardUncheckPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupCardUncheckPressedBackground" Color="{StaticResource WindowColor}" />
+
+    <!-- CheckGroupListBox -->
+    <SolidColorBrush x:Key="ListBoxItemCheckForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemCheckGlyphFill" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckGlyphDisabledFill" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemCheckDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedDefaultBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBackground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+
+    <!-- CardCheckGroupListBox -->
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ListBoxItemCheckCardCheckedPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/HighContrast/ManagedFileChooser.axaml
new file mode 100644
index 0000000..5d95e4f
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/ManagedFileChooser.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ManagedFileChooserTextForeground" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Menu.axaml b/src/Semi.Avalonia/Themes/HighContrast/Menu.axaml
new file mode 100644
index 0000000..c31acdb
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Menu.axaml
@@ -0,0 +1,24 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Color="{StaticResource WindowTextColor}" />
+
+    <!--  MenuFlyout  -->
+    <SolidColorBrush x:Key="MenuFlyoutBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Color="{StaticResource WindowTextColor}" />
+
+    <!--  MenuItem  -->
+    <SolidColorBrush x:Key="MenuItemBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="MenuItemForeground" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="MenuItemSeparatorBackground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="MenuItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="MenuItemPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="MenuItemPressedBackground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="MenuItemInputGestureTextForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="MenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="MenuItemExpandIconOpenForeground" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="MenuItemDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="MenuItemDisabledExpandIconForeground" Color="{StaticResource GrayTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml b/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml
new file mode 100644
index 0000000..f62d65c
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml
@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Color x:Key="WindowColor">#000000</Color>
+    <Color x:Key="WindowTextColor">#FFFFFF</Color>
+    <Color x:Key="HotlightColor">#8080FF</Color>
+    <Color x:Key="GrayTextColor">#A6A6A6</Color>
+    <Color x:Key="HighlightTextColor">#2B2B2B</Color>
+    <Color x:Key="HighlightColor">#D6B4FD</Color>
+    <Color x:Key="ButtonTextColor">#FFEE32</Color>
+    <Color x:Key="ButtonFaceColor">#000000</Color>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml b/src/Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml
new file mode 100644
index 0000000..137082b
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="NotificationCardBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="NotificationCardBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="NotificationCardTitleForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="NotificationCardMessageForeground" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="{StaticResource WindowColor}" />
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/HighContrast/NumericUpDown.axaml b/src/Semi.Avalonia/Themes/HighContrast/NumericUpDown.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/NumericUpDown.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml b/src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml
new file mode 100644
index 0000000..a50d3f2
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ProgressBarBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="{StaticResource HighlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/RadioButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/RadioButton.axaml
new file mode 100644
index 0000000..2d38f7b
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/RadioButton.axaml
@@ -0,0 +1,49 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- RadioButton -->
+    <SolidColorBrush x:Key="RadioButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Color="{StaticResource WindowColor}" />
+
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+
+
+    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="RadioButtonForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="RadioButtonDefaultBorderBrush" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="RadioButtonGroupBackground" Opacity="0.12" Color="White" />
+
+    <!-- ButtonRadioButton -->
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <!-- CardRadioButton -->
+    <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Color="{StaticResource WindowColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml b/src/Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml
new file mode 100644
index 0000000..ec07dd6
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/HighContrast/ScrollViewer.axaml
new file mode 100644
index 0000000..87f6eab
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/ScrollViewer.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ScrollBarThumbForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ScrollBarBackground" Color="Transparent" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Slider.axaml b/src/Semi.Avalonia/Themes/HighContrast/Slider.axaml
new file mode 100644
index 0000000..48ddf85
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Slider.axaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="SliderTrackForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SliderTrackBackground" Color="{StaticResource HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="SliderTickForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SliderThumbBackground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="{StaticResource WindowColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/SplitButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/SplitButton.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/SplitButton.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/SplitView.axaml b/src/Semi.Avalonia/Themes/HighContrast/SplitView.axaml
new file mode 100644
index 0000000..2b37f50
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/SplitView.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="SplitViewSeparatorBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SplitViewMaskBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SplitViewPaneBackground" Color="{StaticResource WindowColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TabControl.axaml b/src/Semi.Avalonia/Themes/HighContrast/TabControl.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/TabControl.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml b/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
new file mode 100644
index 0000000..706934d
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
@@ -0,0 +1,11 @@
+<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="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="TabItemLinePipePressedBorderBrush" Color="{StaticResource HotlightColor}" />
+
+    <SolidColorBrush x:Key="TabItemLineHeaderForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="TabItemLineHeaderPointeroverForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="TabItemLineHeaderSelectedForeground" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TextBlock.axaml b/src/Semi.Avalonia/Themes/HighContrast/TextBlock.axaml
new file mode 100644
index 0000000..b01b4f4
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/TextBlock.axaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="TextBlockDefaultForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="TextBlockDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="TextBlockCodeForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="TextBlockCodeBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="TextBlockSelectionBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="TextBlockSelectionForeground" Color="{StaticResource HighlightTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TextBox.axaml b/src/Semi.Avalonia/Themes/HighContrast/TextBox.axaml
new file mode 100644
index 0000000..b539b05
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/TextBox.axaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="TextBoxTextCaretBrush" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="TextBoxDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="TextBoxPressedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="TextBoxForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="TextBoxInnerForeground" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="TextBoxDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="TextBoxDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="{StaticResource HighlightTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TimePicker.axaml b/src/Semi.Avalonia/Themes/HighContrast/TimePicker.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/TimePicker.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml
new file mode 100644
index 0000000..d652742
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml
@@ -0,0 +1,32 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledForeground" Color="{StaticResource WindowColor}" />
+
+    <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleButtonSuccessCheckedPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledBackground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml
new file mode 100644
index 0000000..311b49c
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml
@@ -0,0 +1,18 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToggleSwitchDefaultBorderBrush" Color="{StaticResource WindowTextColor}" />
+
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="{StaticResource WindowColor}" />
+
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="SimpleToggleSwitchContainerUnCheckedForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SimpleToggleSwitchContainerCheckedForeground" Color="{StaticResource HighlightTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml b/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
new file mode 100644
index 0000000..ec8ebf8
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToolTipBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToolTipForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ToolTipBorderBrush" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TreeView.axaml b/src/Semi.Avalonia/Themes/HighContrast/TreeView.axaml
new file mode 100644
index 0000000..f86f697
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/TreeView.axaml
@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Color="{StaticResource WindowColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Window.axaml b/src/Semi.Avalonia/Themes/HighContrast/Window.axaml
new file mode 100644
index 0000000..0288a75
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/Window.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="WindowDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="WindowDefaultForeground" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/_index.axaml b/src/Semi.Avalonia/Themes/HighContrast/_index.axaml
new file mode 100644
index 0000000..0a4ac27
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/HighContrast/_index.axaml
@@ -0,0 +1,47 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Border.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Button.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Calendar.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/CaptionButtons.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Carousel.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/CheckBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/ComboBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/DatePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/DropDownButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Expander.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Flyout.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/GridSplitter.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Label.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/ListBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/ManagedFileChooser.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Menu.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/NumericUpDown.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/RadioButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/ScrollViewer.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Slider.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/SplitButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/SplitView.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/TabControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/TabItem.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/TextBlock.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/TextBox.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/TimePicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Tooltip.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/TreeView.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/Window.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</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 adbc890..4365120 100644
--- a/src/Semi.Avalonia/Themes/Light/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Button.axaml
@@ -23,6 +23,7 @@
 
     <SolidColorBrush x:Key="ButtonSolidPrimaryBackground" Color="#0077FA" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="ButtonSolidPrimaryPressedForeground" Color="White" />
     <SolidColorBrush x:Key="ButtonSolidPrimaryPressedBackground" Color="#004FB3" />
 
     <SolidColorBrush x:Key="ButtonSolidSecondaryBackground" Color="#0095EE" />
@@ -69,7 +70,9 @@
     <SolidColorBrush x:Key="ButtonSolidDangerPointeroverBorderBrush" Color="#D52515" />
     <SolidColorBrush x:Key="ButtonSolidDangerPressedBorderBrush" Color="#B2140C" />
 
+    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Transparent" />
     <!--  end Solid  -->
 
     <!--  Outline -->
@@ -82,6 +85,11 @@
     <SolidColorBrush x:Key="ButtonOutlineDangerBorderBrush" Color="#F93920" />
     <!--  end Outline  -->
 
+    <!--  Borderless -->
+    <SolidColorBrush x:Key="ButtonBorderlessBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonBorderlessBorderBrush" Color="Transparent" />
+    <!--  end Borderless  -->
+
     <SolidColorBrush x:Key="ButtonInputInnerForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="#0062D6" />
     <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="#004FB3" />
diff --git a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
index c8a51fd..0e7e367 100644
--- a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonBackground" Color="White" />
     <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonSpinnerRepeatButtonPointeroverBorderBrush" Color="Transparent" />
     <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" />
diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
index 19a5b83..d1fbd4a 100644
--- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
@@ -4,6 +4,8 @@
     <SolidColorBrush x:Key="CalendarDatePickerIconPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarDatePickerBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="CalendarDatePickerPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalendarDatePickerPointeroverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
index 8fc128f..2225e15 100644
--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -4,6 +4,7 @@
     <SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="#0077FA" />
@@ -23,9 +24,13 @@
     <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxItemFocusBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
 
diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
index 8a6df07..b0aa476 100644
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -3,6 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="White" />
+    <SolidColorBrush x:Key="DateTimePickerPopupBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#1C1F23" />
@@ -22,6 +23,7 @@
     <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
index 4305590..26fd7c1 100644
--- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
@@ -3,8 +3,11 @@
     <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxItemPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml
index 3ec9c1a..4c4b620 100644
--- a/src/Semi.Avalonia/Themes/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml
@@ -12,6 +12,7 @@
     <SolidColorBrush x:Key="MenuItemForeground" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="MenuItemPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="MenuItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="MenuItemPressedBackground" Opacity="0.09" Color="#2E3238" />
 
diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
index 467e67b..08d6fa4 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -4,6 +4,7 @@
     <SolidColorBrush x:Key="TextBoxDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxDefaultBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="TextBoxForeground" Color="#1C1F23" />
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
index 2d27503..fe896d3 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
@@ -4,6 +4,7 @@
     <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ToggleButtonCheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />
 
@@ -15,6 +16,7 @@
     <SolidColorBrush x:Key="ToggleButtonDefaultDangerForeground" Color="#F93920" />
 
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#0095EE" />
     <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#6B7075" />
     <SolidColorBrush x:Key="ToggleButtonSuccessCheckedBackground" Color="#3BB346" />
@@ -28,7 +30,9 @@
     <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#D26700" />
     <SolidColorBrush x:Key="ToggleButtonDangerCheckedPointeroverBackground" Color="#D52515" />
 
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedForeground" Color="White" />
     <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#0063A7" />
     <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#41464C" />
     <SolidColorBrush x:Key="ToggleButtonSuccessCheckedPressedBackground" Color="#25772F" />
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
index b86d9b1..727a02f 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
@@ -1,4 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToggleSwitchDefaultBorderBrush" Color="Transparent" />
+
     <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" />
diff --git a/src/Semi.Avalonia/Themes/Light/TreeView.axaml b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
index 96e61d4..c4cc03c 100644
--- a/src/Semi.Avalonia/Themes/Light/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
@@ -5,8 +5,10 @@
     <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml
index 52c207f..5281aa0 100644
--- a/src/Semi.Avalonia/Themes/SemiTheme.axaml
+++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml
@@ -1,9 +1,14 @@
-<Styles x:Class="Semi.Avalonia.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles x:Class="Semi.Avalonia.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:semi="https://irihi.tech/semi">
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
                 <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Themes/HighContrast/Aquatic.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Themes/HighContrast/Desert.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dust}" Source="avares://Semi.Avalonia/Themes/HighContrast/Dusk.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Themes/HighContrast/NightSky.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs b/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs
index 23144a0..d178f31 100644
--- a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs
+++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs
@@ -10,6 +10,11 @@ namespace Semi.Avalonia;
 
 public class SemiTheme : Styles
 {
+    public static ThemeVariant Aquatic => new ThemeVariant(nameof(Aquatic), ThemeVariant.Dark);
+    public static ThemeVariant Desert => new ThemeVariant(nameof(Desert), ThemeVariant.Light);
+    public static ThemeVariant Dust => new ThemeVariant(nameof(Dust), ThemeVariant.Dark);
+    public static ThemeVariant NightSky => new ThemeVariant(nameof(NightSky), ThemeVariant.Dark);
+    
     private static readonly Dictionary<CultureInfo, ResourceDictionary> _localeToResource = new()
     {
         { new CultureInfo("zh-cn"), new zh_cn() },
diff --git a/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
index f35c245..137de36 100644
--- a/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
@@ -2,5 +2,5 @@
     <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>
+    <Thickness x:Key="ToolTipBorderThickness">1</Thickness>
 </ResourceDictionary>
\ No newline at end of file