doc: update docs for version preview6.1

Merge pull request #161 from irihitech/160-togglebutton-foreground
Togglebutton disabled Foreground
2026-03-03 00:00:55 +08:00 · 2023-03-28 23:55:11 +08:00 · 2023-03-28 23:30:02 +08:00 · 2023-03-28 23:27:35 +08:00 · 2023-03-28 23:14:27 +08:00 · 2023-03-28 23:04:44 +08:00
65 changed files with 2174 additions and 928 deletions
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Avalonia Theme inspired by Semi Design

 ## Installation
 ```bash
-dotnet add package Semi.Avalonia --version 0.1.0-preview6
+dotnet add package Semi.Avalonia --version 0.1.0-preview6.1
 ```
 Include Semi Design Styles in application:

@@ -25,8 +25,8 @@ That's all.

 DataGrid and ColorPicker are distributed in separated packages. Please install if you need. 
 ```bash
-dotnet add package Semi.Avalonia.ColorPicker --version 0.1.0-preview6
-dotnet add package Semi.Avalonia.DataGrid --version 0.1.0-preview6
+dotnet add package Semi.Avalonia.ColorPicker --version 0.1.0-preview6.1
+dotnet add package Semi.Avalonia.DataGrid --version 0.1.0-preview6.1
 ```
 ```xaml
 <Application.Styles>
@@ -48,6 +48,11 @@ https://github.com/irihitech/Semi.Avalonia/releases
 | 0.1.0-preview5.x    | 11.0-preview5    |
 | 0.1.0-preview6.x    | 11.0-preview6    |

+**NOTE**
+
+Semi Avalonia theme is moving forward together with Avalonia preview versions now. So new feature/fixes are not backported to previous preview versions. If you need a feature/fix for outdated avalonia preview version, please raise an issue so we can do that for you. 
+
+
 ## TODO
 * DataValidationErrors
 * FocusAdorner
--- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
@@ -21,8 +21,8 @@
                        HorizontalAlignment="Stretch"
                        Background="{TemplateBinding Background}"
                        CornerRadius="6" />
-                    <Grid ColumnDefinitions="*, Auto" RowDefinitions="*, *, *, *, *, *">
-                        <!--  Row 0-1 ResourceKey  -->
+                    <Grid ColumnDefinitions="*, Auto" RowDefinitions="*, *, *, *, *, *, *">
+                        <!--  Row 0-1-2 ResourceKey  -->
                        <TextBlock
                            Grid.Column="0"
                            Grid.ColumnSpan="2"
@@ -48,23 +48,43 @@
                                Data="{StaticResource CopyIcon}"
                                Foreground="{Binding $parent[Button].Foreground}" />
                        </Button>
-
-                        <!--  Row 2-3 HEX  -->
-                        <TextBlock
+                        <SelectableTextBlock
                            Grid.Row="2"
                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ColorResourceKey, Converter={x:Static ObjectConverters.IsNotNull}}"
+                            Text="{TemplateBinding ColorResourceKey}" />
+                        <Button
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Classes="Tertiary"
+                            Command="{Binding $parent[controls:ColorDetailControl].Copy}"
+                            CommandParameter="{x:Static controls:ColorDetailControl.KEY_ColorResourceKey}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ColorResourceKey, Converter={x:Static ObjectConverters.IsNotNull}}"
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{StaticResource CopyIcon}"
+                                Foreground="{Binding $parent[Button].Foreground}" />
+                        </Button>
+
+                        <!--  Row 3-4 HEX  -->
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
                            Grid.ColumnSpan="2"
                            Margin="4,8,0,0"
                            VerticalAlignment="Center"
                            Classes="Tertiary"
                            Text="ARGB" />
                        <SelectableTextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                            Grid.Column="0"
                            VerticalAlignment="Center"
                            Text="{TemplateBinding Hex}" />
                        <Button
-                            Grid.Row="3"
+                            Grid.Row="4"
                            Grid.Column="1"
                            Classes="Tertiary"
                            Command="{Binding $parent[controls:ColorDetailControl].Copy}"
@@ -77,9 +97,9 @@
                                Foreground="{Binding $parent[Button].Foreground}" />
                        </Button>

-                        <!--  Row 4-5 Opacity  -->
+                        <!--  Row 5-6 Opacity  -->
                        <TextBlock
-                            Grid.Row="4"
+                            Grid.Row="5"
                            Grid.Column="0"
                            Grid.ColumnSpan="2"
                            Margin="4,8,0,0"
@@ -87,12 +107,12 @@
                            Classes="Tertiary"
                            Text="Opacity" />
                        <SelectableTextBlock
-                            Grid.Row="5"
+                            Grid.Row="6"
                            Grid.Column="0"
                            VerticalAlignment="Center"
                            Text="{TemplateBinding OpacityNumber}" />
                        <Button
-                            Grid.Row="5"
+                            Grid.Row="6"
                            Grid.Column="1"
                            Classes="Tertiary"
                            Command="{Binding $parent[controls:ColorDetailControl].Copy}"
--- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.cs
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.cs
@@ -12,6 +12,7 @@ public class ColorDetailControl: TemplatedControl
    public const string KEY_ResourceKey = "ResourceKey";
    public const string KEY_Hex = "Hex";
    public const string KEY_Opacity = "Opacity";
+    public const string KEY_ColorResourceKey = "ColorResourceKey";
    
    public static readonly StyledProperty<string?> ResourceKeyProperty = AvaloniaProperty.Register<ColorDetailControl, string?>(
        nameof(ResourceKey));
@@ -30,6 +31,15 @@ public class ColorDetailControl: TemplatedControl
        set => SetValue(ResourceNameProperty, value);
    }

+    public static readonly StyledProperty<string?> ColorResourceKeyProperty = AvaloniaProperty.Register<ColorDetailControl, string?>(
+        nameof(ColorResourceKey));
+
+    public string? ColorResourceKey
+    {
+        get => GetValue(ColorResourceKeyProperty);
+        set => SetValue(ColorResourceKeyProperty, value);
+    }
+
    public static readonly DirectProperty<ColorDetailControl, string?> HexProperty = AvaloniaProperty.RegisterDirect<ColorDetailControl, string?>(
        nameof(Hex), o => o.Hex);
    private string? _hex;
@@ -49,6 +59,8 @@ public class ColorDetailControl: TemplatedControl
    }
    
    
+    
+    
    static ColorDetailControl()
    {
        BackgroundProperty.Changed.AddClassHandler<ColorDetailControl>((o, e) => o.OnBackgroundChanged(e));
@@ -77,6 +89,8 @@ public class ColorDetailControl: TemplatedControl
                    break;
                case KEY_Opacity: text = OpacityNumber;
                    break;
+                case KEY_ColorResourceKey: text = ColorResourceKey;
+                    break;
                default: text = string.Empty; break;
            }
        }
--- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs
+++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs
@@ -14,19 +14,19 @@ public class FunctionalColorGroupControl: TemplatedControl
        set => SetValue(TitleProperty, value);
    }
    
-    public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable> LightColorsProperty = AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable>(
+    public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> LightColorsProperty = AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(
        nameof(LightColors), o => o.LightColors, (o, v) => o.LightColors = v);
-    private IEnumerable _lightColors;
-    public IEnumerable LightColors
+    private IEnumerable? _lightColors;
+    public IEnumerable? LightColors
    {
        get => _lightColors;
        set => SetAndRaise(LightColorsProperty, ref _lightColors, value);
    }
    
-    public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable> DarkColorsProperty = AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable>(
+    public static readonly DirectProperty<FunctionalColorGroupControl, IEnumerable?> DarkColorsProperty = AvaloniaProperty.RegisterDirect<FunctionalColorGroupControl, IEnumerable?>(
        nameof(DarkColors), o => o.DarkColors, (o, v) => o.DarkColors = v);
-    private IEnumerable _darkColors;
-    public IEnumerable DarkColors
+    private IEnumerable? _darkColors;
+    public IEnumerable? DarkColors
    {
        get => _darkColors;
        set => SetAndRaise(DarkColorsProperty, ref _darkColors, value);
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -45,7 +45,7 @@
                Danger
            </Button>
        </StackPanel>
-        <TextBlock>DropdownButton</TextBlock>
+        <TextBlock>DropDownButton</TextBlock>
        <StackPanel Orientation="Horizontal" Spacing="8">
            <DropDownButton Content="Submit">
                <DropDownButton.Flyout>
@@ -55,7 +55,7 @@
                    </MenuFlyout>
                </DropDownButton.Flyout>
            </DropDownButton>
-            <DropDownButton Content="Submit" Theme="{DynamicResource SolidDropdownButton}">
+            <DropDownButton Content="Submit" Theme="{DynamicResource SolidDropDownButton}">
                <DropDownButton.Flyout>
                    <MenuFlyout Placement="BottomEdgeAlignedRight">
                        <MenuItem Header="Submit All" />
@@ -63,7 +63,7 @@
                    </MenuFlyout>
                </DropDownButton.Flyout>
            </DropDownButton>
-            <DropDownButton Content="Submit" Theme="{DynamicResource BorderlessDropdownButton}">
+            <DropDownButton Content="Submit" Theme="{DynamicResource BorderlessDropDownButton}">
                <DropDownButton.Flyout>
                    <MenuFlyout Placement="BottomEdgeAlignedRight">
                        <MenuItem Header="Submit All" />
--- a/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml
@@ -14,6 +14,7 @@
        <Style Selector="TextBlock">
            <Setter Property="HorizontalAlignment" Value="Center" />
            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Foreground" Value="#1C1F23" />
        </Style>
    </UserControl.Styles>
    <StackPanel Spacing="20">
--- a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml
@@ -8,21 +8,26 @@
    d:DesignWidth="800"
    mc:Ignorable="d">
    <ScrollViewer HorizontalScrollBarVisibility="Auto">
-        <StackPanel HorizontalAlignment="Left">
-            <CheckBox>Unchecked</CheckBox>
-            <CheckBox IsEnabled="False">Unchecked</CheckBox>
-            <CheckBox IsChecked="True">Checked</CheckBox>
-            <CheckBox IsChecked="True" IsEnabled="False">Checked</CheckBox>
-            <CheckBox IsChecked="{x:Null}" IsThreeState="True">Indeterminate</CheckBox>
-            <CheckBox
-                IsChecked="{x:Null}"
-                IsEnabled="False"
-                IsThreeState="True">
-                Indeterminate
-            </CheckBox>
+        <StackPanel HorizontalAlignment="Left" Spacing="20">
+            <TextBlock Text="CheckBox" />
+            <StackPanel Orientation="Horizontal">
+                <CheckBox>Unchecked</CheckBox>
+                <CheckBox IsChecked="True">Checked</CheckBox>
+                <CheckBox IsChecked="{x:Null}" IsThreeState="True">Indeterminate</CheckBox>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <CheckBox IsEnabled="False">Unchecked</CheckBox>
+                <CheckBox IsChecked="True" IsEnabled="False">Checked</CheckBox>
+                <CheckBox
+                    IsChecked="{x:Null}"
+                    IsEnabled="False"
+                    IsThreeState="True">
+                    Indeterminate
+                </CheckBox>
+            </StackPanel>
            <CheckBox Width="120" HorizontalAlignment="Left">Checkbox should wrap its text</CheckBox>
            <TextBlock Margin="0,16" Text="CardCheckBox" />
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Horizontal">
                <CheckBox Width="300" Theme="{DynamicResource CardCheckBox}">
                    <StackPanel>
                        <TextBlock FontWeight="Bold">复选框标题</TextBlock>
@@ -38,6 +43,18 @@
                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
                    </StackPanel>
                </CheckBox>
+                <CheckBox
+                    Width="300"
+                    IsChecked="{x:Null}"
+                    IsThreeState="True"
+                    Theme="{DynamicResource CardCheckBox}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">复选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </CheckBox>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
                <CheckBox
                    Width="300"
                    IsEnabled="False"
@@ -57,17 +74,6 @@
                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
                    </StackPanel>
                </CheckBox>
-                <CheckBox
-                    Width="300"
-                    IsChecked="{x:Null}"
-                    IsEnabled="True"
-                    IsThreeState="True"
-                    Theme="{DynamicResource CardCheckBox}">
-                    <StackPanel>
-                        <TextBlock FontWeight="Bold">复选框标题</TextBlock>
-                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
-                    </StackPanel>
-                </CheckBox>
                <CheckBox
                    Width="300"
                    IsChecked="{x:Null}"
@@ -81,7 +87,7 @@
                </CheckBox>
            </StackPanel>
            <TextBlock Margin="0,16" Text="PureCardCheckBox" />
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Horizontal">
                <CheckBox Width="300" Theme="{DynamicResource PureCardCheckBox}">
                    <StackPanel>
                        <TextBlock FontWeight="Bold">复选框标题</TextBlock>
@@ -97,6 +103,19 @@
                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
                    </StackPanel>
                </CheckBox>
+                <CheckBox
+                    Width="300"
+                    IsChecked="{x:Null}"
+                    IsEnabled="True"
+                    IsThreeState="True"
+                    Theme="{DynamicResource PureCardCheckBox}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">复选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </CheckBox>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
                <CheckBox
                    Width="300"
                    IsEnabled="False"
@@ -116,17 +135,6 @@
                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
                    </StackPanel>
                </CheckBox>
-                <CheckBox
-                    Width="300"
-                    IsChecked="{x:Null}"
-                    IsEnabled="True"
-                    IsThreeState="True"
-                    Theme="{DynamicResource PureCardCheckBox}">
-                    <StackPanel>
-                        <TextBlock FontWeight="Bold">复选框标题</TextBlock>
-                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
-                    </StackPanel>
-                </CheckBox>
                <CheckBox
                    Width="300"
                    IsChecked="{x:Null}"
@@ -141,4 +149,4 @@
            </StackPanel>
        </StackPanel>
    </ScrollViewer>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml
@@ -2,6 +2,7 @@
    x:Class="Semi.Avalonia.Demo.Pages.ColorPickerDemo"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:colorPicker="clr-namespace:Semi.Avalonia.ColorPicker;assembly=Semi.Avalonia.ColorPicker"
    xmlns:controls="using:Avalonia.Controls"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -15,11 +16,7 @@
            Spacing="20">
            <ColorView ColorSpectrumShape="Ring" />
            <ColorView ColorSpectrumShape="Box" />
-            <ColorView>
-                <ColorView.Palette>
-                    <controls:MaterialColorPalette />
-                </ColorView.Palette>
-            </ColorView>
+            <ColorView Palette="{DynamicResource SemiColorPalette}" />
        </StackPanel>
        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
            <ColorPicker ColorSpectrumShape="Ring">
@@ -29,7 +26,7 @@
            </ColorPicker>
            <ColorPicker ColorSpectrumShape="Box">
                <ColorPicker.Palette>
-                    <controls:MaterialColorPalette />
+                    <colorPicker:SemiColorLightPalette />
                </ColorPicker.Palette>
            </ColorPicker>
        </StackPanel>
--- a/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
@@ -27,5 +27,15 @@
            Maximum="100"
            Minimum="0"
            ShowButtonSpinner="False" />
+        <NumericUpDown
+            Width="200"
+            Classes="Large"
+            Maximum="100"
+            Minimum="0" />
+        <NumericUpDown
+            Width="200"
+            Classes="Small"
+            Maximum="100"
+            Minimum="0" />
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
@@ -47,27 +47,101 @@
                        <RadioButton Theme="{StaticResource ButtonRadioButton}">选项 2</RadioButton>
                    </StackPanel>
                </Border>
-                <RadioButton Margin="4" Theme="{StaticResource CardRadioButton}">
-                    <StackPanel>
-                        <TextBlock FontWeight="Bold">Option 1</TextBlock>
-                        <TextBlock Classes="Tertiary">Description 1</TextBlock>
-                    </StackPanel>
-                </RadioButton>
-                <RadioButton
-                    Margin="4"
-                    IsChecked="True"
-                    Theme="{StaticResource CardRadioButton}">
-                    <StackPanel>
-                        <TextBlock FontWeight="Bold">Option 2</TextBlock>
-                        <TextBlock Classes="Tertiary">Description 2</TextBlock>
-                    </StackPanel>
-                </RadioButton>
+                <StackPanel Orientation="Horizontal">
+                    <RadioButton Margin="4" Theme="{StaticResource CardRadioButton}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 1</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 1</TextBlock>
+                        </StackPanel>
+                    </RadioButton>
+                    <RadioButton
+                        Margin="4"
+                        IsChecked="True"
+                        Theme="{StaticResource CardRadioButton}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 2</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 2</TextBlock>
+                        </StackPanel>
+                    </RadioButton>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <RadioButton Margin="4" Theme="{StaticResource PureCardRadioButton}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 1</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 1</TextBlock>
+                        </StackPanel>
+                    </RadioButton>
+                    <RadioButton
+                        Margin="4"
+                        IsChecked="True"
+                        Theme="{StaticResource PureCardRadioButton}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 2</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 2</TextBlock>
+                        </StackPanel>
+                    </RadioButton>
+                </StackPanel>
            </StackPanel>
-            <StackPanel Orientation="Horizontal" />
            <StackPanel Orientation="Horizontal">
-                <CheckBox Margin="0,0,8,0">Avalonia</CheckBox>
-                <CheckBox Margin="0,0,8,0" IsChecked="True">WPF</CheckBox>
-                <CheckBox IsChecked="{x:Null}" IsThreeState="True">UWP</CheckBox>
+                <StackPanel Orientation="Horizontal">
+                    <CheckBox Margin="0,0,8,0">Avalonia</CheckBox>
+                    <CheckBox Margin="0,0,8,0" IsChecked="True">WPF</CheckBox>
+                    <CheckBox IsChecked="{x:Null}" IsThreeState="True">UWP</CheckBox>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <CheckBox Margin="4" Theme="{StaticResource CardCheckBox}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 1</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 1</TextBlock>
+                        </StackPanel>
+                    </CheckBox>
+                    <CheckBox
+                        IsChecked="True"
+                        Margin="4"
+                        Theme="{StaticResource CardCheckBox}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 2</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 2</TextBlock>
+                        </StackPanel>
+                    </CheckBox>
+                    <CheckBox
+                        IsThreeState="True"
+                        IsChecked="{x:Null}"
+                        Margin="4"
+                        Theme="{StaticResource CardCheckBox}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 3</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 3</TextBlock>
+                        </StackPanel>
+                    </CheckBox>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <CheckBox Margin="4" Theme="{StaticResource PureCardCheckBox}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 1</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 1</TextBlock>
+                        </StackPanel>
+                    </CheckBox>
+                    <CheckBox
+                        IsChecked="True"
+                        Margin="4"
+                        Theme="{StaticResource PureCardCheckBox}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 2</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 2</TextBlock>
+                        </StackPanel>
+                    </CheckBox>
+                    <CheckBox
+                        Margin="4"
+                        IsThreeState="True"
+                        IsChecked="{x:Null}"
+                        Theme="{StaticResource PureCardCheckBox}">
+                        <StackPanel>
+                            <TextBlock FontWeight="Bold">Option 3</TextBlock>
+                            <TextBlock Classes="Tertiary">Description 3</TextBlock>
+                        </StackPanel>
+                    </CheckBox>
+                </StackPanel>
            </StackPanel>
            <StackPanel Orientation="Horizontal">
                <ToggleSwitch
@@ -96,7 +170,7 @@
                </TabItem>
            </TabControl>
            <StackPanel Orientation="Horizontal" Spacing="20">
-                <ComboBox Width="200" PlaceholderText="Please Select" >
+                <ComboBox Width="200" PlaceholderText="Please Select">
                    <ComboBoxItem>Item 1</ComboBoxItem>
                    <ComboBoxItem>Item 2</ComboBoxItem>
                    <ComboBoxItem>Item 3</ComboBoxItem>
@@ -157,4 +231,4 @@
            </StackPanel>
        </StackPanel>
    </ScrollViewer>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
@@ -46,6 +46,7 @@
                            TextWrapping="Wrap" />
                        <controls:ColorDetailControl
                            Background="{Binding SelectedColor.Brush}"
+                            ColorResourceKey="{Binding SelectedColor.ColorResourceKey}"
                            IsVisible="{Binding SelectedColor, Converter={x:Static ObjectConverters.IsNotNull}}"
                            ResourceKey="{Binding SelectedColor.ResourceKey}"
                            ResourceName="{Binding SelectedColor.ColorDisplayName}" />
--- a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml
@@ -5,73 +5,163 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    mc:Ignorable="d">
-    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <TextBlock Text="Radio Buttons" />
-        <StackPanel>
-            <RadioButton>111</RadioButton>
-            <RadioButton>222</RadioButton>
-            <RadioButton>333</RadioButton>
-        </StackPanel>
-        <TextBlock Text="Radio Button as Button" />
-        <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
+    <ScrollViewer>
+        <StackPanel HorizontalAlignment="Left" Spacing="20">
+            <TextBlock Text="Radio Buttons" />
            <StackPanel Orientation="Horizontal">
-                <RadioButton Classes="Small" Theme="{DynamicResource ButtonRadioButton}">小1</RadioButton>
-                <RadioButton Classes="Small" Theme="{DynamicResource ButtonRadioButton}">小2</RadioButton>
+                <RadioButton>Unchecked</RadioButton>
+                <RadioButton IsChecked="True">Checked</RadioButton>
            </StackPanel>
-        </Border>
-        <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
            <StackPanel Orientation="Horizontal">
-                <RadioButton Theme="{DynamicResource ButtonRadioButton}">默认1</RadioButton>
-                <RadioButton Theme="{DynamicResource ButtonRadioButton}">默认2</RadioButton>
+                <RadioButton IsEnabled="False">Unchecked</RadioButton>
+                <RadioButton IsChecked="True" IsEnabled="False">Checked</RadioButton>
            </StackPanel>
-        </Border>
-        <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
+            <TextBlock Text="Radio Button as Button" />
            <StackPanel Orientation="Horizontal">
-                <RadioButton Classes="Large" Theme="{DynamicResource ButtonRadioButton}">大1</RadioButton>
-                <RadioButton Classes="Large" Theme="{DynamicResource ButtonRadioButton}">大2</RadioButton>
+                <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
+                    <StackPanel Orientation="Horizontal">
+                        <RadioButton Classes="Small" Theme="{DynamicResource ButtonRadioButton}">小1</RadioButton>
+                        <RadioButton
+                            Classes="Small"
+                            Theme="{DynamicResource ButtonRadioButton}"
+                            IsChecked="True">
+                            小2
+                        </RadioButton>
+                    </StackPanel>
+                </Border>
+                <Border Margin="8 0" HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
+                    <StackPanel Orientation="Horizontal">
+                        <RadioButton
+                            Classes="Small"
+                            Theme="{DynamicResource ButtonRadioButton}"
+                            IsEnabled="False">
+                            小1
+                        </RadioButton>
+                        <RadioButton
+                            Classes="Small"
+                            Theme="{DynamicResource ButtonRadioButton}"
+                            IsChecked="True"
+                            IsEnabled="False">
+                            小2
+                        </RadioButton>
+                    </StackPanel>
+                </Border>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
+                    <StackPanel Orientation="Horizontal">
+                        <RadioButton Theme="{DynamicResource ButtonRadioButton}">默认1</RadioButton>
+                        <RadioButton Theme="{DynamicResource ButtonRadioButton}" IsChecked="True">默认2</RadioButton>
+                    </StackPanel>
+                </Border>
+                <Border Margin="8 0" HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
+                    <StackPanel Orientation="Horizontal">
+                        <RadioButton Theme="{DynamicResource ButtonRadioButton}" IsEnabled="False">默认1</RadioButton>
+                        <RadioButton
+                            Theme="{DynamicResource ButtonRadioButton}"
+                            IsEnabled="False"
+                            IsChecked="True">
+                            默认2
+                        </RadioButton>
+                    </StackPanel>
+                </Border>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
+                    <StackPanel Orientation="Horizontal">
+                        <RadioButton Classes="Large" Theme="{DynamicResource ButtonRadioButton}">大1</RadioButton>
+                        <RadioButton
+                            Classes="Large"
+                            Theme="{DynamicResource ButtonRadioButton}"
+                            IsChecked="True">
+                            大2
+                        </RadioButton>
+                    </StackPanel>
+                </Border>
+                <Border Margin="8 0" HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
+                    <StackPanel Orientation="Horizontal">
+                        <RadioButton
+                            Classes="Large"
+                            Theme="{DynamicResource ButtonRadioButton}"
+                            IsEnabled="False">
+                            大1
+                        </RadioButton>
+                        <RadioButton
+                            Classes="Large"
+                            Theme="{DynamicResource ButtonRadioButton}"
+                            IsChecked="True"
+                            IsEnabled="False">
+                            大2
+                        </RadioButton>
+                    </StackPanel>
+                </Border>
+            </StackPanel>
+            <TextBlock Text="Radio Button as Card" />
+            <StackPanel Orientation="Horizontal">
+                <RadioButton Width="300" Theme="{DynamicResource CardRadioButton}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">单选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton IsChecked="True" Width="300" Theme="{DynamicResource CardRadioButton}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">单选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </RadioButton>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <RadioButton IsEnabled="False" Width="300" Theme="{DynamicResource CardRadioButton}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">单选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton 
+                    IsChecked="True"
+                    IsEnabled="False"
+                    Width="300"
+                    Theme="{DynamicResource CardRadioButton}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">单选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </RadioButton>
+            </StackPanel>
+            <TextBlock Text="Radio Button as Pure Card" />
+            <StackPanel Orientation="Horizontal">
+                <RadioButton Width="300" Theme="{DynamicResource PureCardRadioButton}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">单选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton IsChecked="True" Width="300" Theme="{DynamicResource PureCardRadioButton}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">单选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </RadioButton>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <RadioButton IsEnabled="False" Width="300" Theme="{DynamicResource PureCardRadioButton}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">单选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton
+                    IsChecked="True"
+                    IsEnabled="False"
+                    Width="300"
+                    Theme="{DynamicResource PureCardRadioButton}">
+                    <StackPanel>
+                        <TextBlock FontWeight="Bold">单选框标题</TextBlock>
+                        <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
+                    </StackPanel>
+                </RadioButton>
            </StackPanel>
-        </Border>
-        <TextBlock Text="Radio Button as Card" />
-        <StackPanel Orientation="Horizontal">
-            <RadioButton Width="300" Theme="{DynamicResource CardRadioButton}">
-                <StackPanel>
-                    <TextBlock FontWeight="Bold">单选框标题</TextBlock>
-                    <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
-                </StackPanel>
-            </RadioButton>
-            <RadioButton Width="300" Theme="{DynamicResource CardRadioButton}">
-                <StackPanel>
-                    <TextBlock FontWeight="Bold">单选框标题</TextBlock>
-                    <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
-                </StackPanel>
-            </RadioButton>
-            <RadioButton Width="300" Theme="{DynamicResource CardRadioButton}">
-                <StackPanel>
-                    <TextBlock FontWeight="Bold">单选框标题</TextBlock>
-                    <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
-                </StackPanel>
-            </RadioButton>
        </StackPanel>
-        <TextBlock Text="Radio Button as Pure Card" />
-        <StackPanel Orientation="Horizontal">
-            <RadioButton Width="300" Theme="{DynamicResource PureCardRadioButton}">
-                <StackPanel>
-                    <TextBlock FontWeight="Bold">单选框标题</TextBlock>
-                    <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
-                </StackPanel>
-            </RadioButton>
-            <RadioButton Width="300" Theme="{DynamicResource PureCardRadioButton}">
-                <StackPanel>
-                    <TextBlock FontWeight="Bold">单选框标题</TextBlock>
-                    <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
-                </StackPanel>
-            </RadioButton>
-            <RadioButton Width="300" Theme="{DynamicResource PureCardRadioButton}">
-                <StackPanel>
-                    <TextBlock FontWeight="Bold">单选框标题</TextBlock>
-                    <TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统</TextBlock>
-                </StackPanel>
-            </RadioButton>
-        </StackPanel>
-    </StackPanel>
-</UserControl>
+    </ScrollViewer>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml
@@ -7,23 +7,36 @@
    d:DesignHeight="450"
    d:DesignWidth="800"
    mc:Ignorable="d">
-    <StackPanel>
-        <TextBlock Text="Toggle Button" />
+    <StackPanel Spacing="20">
+        <TextBlock Text="Toggle Button (Default)" />
        <StackPanel Orientation="Horizontal" Spacing="20">
-            <ToggleButton>Primary</ToggleButton>
+            <ToggleButton>Default</ToggleButton>
+            <ToggleButton Classes="Primary">Primary</ToggleButton>
            <ToggleButton Classes="Secondary">Secondary</ToggleButton>
            <ToggleButton Classes="Tertiary">Tertiary</ToggleButton>
            <ToggleButton Classes="Warning">Warning</ToggleButton>
-            <ToggleButton Classes="Error">Error</ToggleButton>
+            <ToggleButton Classes="Danger">Danger</ToggleButton>
+            <ToggleButton Classes="Danger" IsEnabled="False">Danger</ToggleButton>
        </StackPanel>
-
-        <TextBlock Margin="0,20,0,0" Text="Toggle Button Three State" />
+        <TextBlock Text="Toggle Button Checked State" />
        <StackPanel Orientation="Horizontal" Spacing="20">
-            <ToggleButton Name="button" IsThreeState="True">Primary</ToggleButton>
-            <ToggleButton Classes="Secondary" IsThreeState="True">Secondary</ToggleButton>
-            <ToggleButton Classes="Tertiary" IsThreeState="True">Tertiary</ToggleButton>
-            <ToggleButton Classes="Warning" IsThreeState="True">Warning</ToggleButton>
-            <ToggleButton Classes="Error" IsThreeState="True">Error</ToggleButton>
+            <ToggleButton IsChecked="True">Default</ToggleButton>
+            <ToggleButton Classes="Primary" IsChecked="True">Primary</ToggleButton>
+            <ToggleButton Classes="Secondary" IsChecked="True">Secondary</ToggleButton>
+            <ToggleButton Classes="Tertiary" IsChecked="True">Tertiary</ToggleButton>
+            <ToggleButton Classes="Warning" IsChecked="True">Warning</ToggleButton>
+            <ToggleButton Classes="Danger" IsChecked="True">Danger</ToggleButton>
+            <ToggleButton Classes="Danger" IsChecked="True" IsEnabled="False">Danger</ToggleButton>
+        </StackPanel>
+        <TextBlock Text="Toggle Button Three State" />
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <ToggleButton IsThreeState="True" IsChecked="{x:Null}">Default</ToggleButton>
+            <ToggleButton Classes="Primary" IsThreeState="True" IsChecked="{x:Null}">Primary</ToggleButton>
+            <ToggleButton Classes="Secondary" IsThreeState="True" IsChecked="{x:Null}">Secondary</ToggleButton>
+            <ToggleButton Classes="Tertiary" IsThreeState="True" IsChecked="{x:Null}">Tertiary</ToggleButton>
+            <ToggleButton Classes="Warning" IsThreeState="True" IsChecked="{x:Null}">Warning</ToggleButton>
+            <ToggleButton Classes="Danger" IsThreeState="True" IsChecked="{x:Null}">Danger</ToggleButton>
+            <ToggleButton Classes="Danger" IsThreeState="True" IsChecked="{x:Null}" IsEnabled="False">Danger</ToggleButton>
        </StackPanel>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ToolTipDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ToolTipDemo.axaml
@@ -11,7 +11,8 @@
        <Border
            Margin="5"
            Padding="50,10"
-            Background="Yellow"
+            Classes="Hover"
+            Theme="{StaticResource CardBorder}"
            ToolTip.Tip="This is a ToolTip">
            <TextBlock>Hover Here</TextBlock>
        </Border>
@@ -23,7 +24,8 @@
            Name="Border"
            Margin="5"
            Padding="50,10"
-            Background="Yellow"
+            Classes="Hover"
+            Theme="{StaticResource CardBorder}"
            ToolTip.Placement="Bottom">
            <ToolTip.Tip>
                <StackPanel>
@@ -36,7 +38,8 @@
        <Border
            Margin="5"
            Padding="50,10"
-            Background="Yellow"
+            Classes="Hover"
+            Theme="{StaticResource CardBorder}"
            ToolTip.Placement="Top"
            ToolTip.Tip="Hello">
            <Border.Styles>
@@ -60,7 +63,8 @@
        <Border
            Margin="5"
            Padding="50,10"
-            Background="Yellow"
+            Classes="Hover"
+            Theme="{StaticResource CardBorder}"
            ToolTip.Placement="Top"
            ToolTip.Tip="Hello">
            <TextBlock>Top</TextBlock>
@@ -68,7 +72,8 @@
        <Border
            Margin="5"
            Padding="50,10"
-            Background="Yellow"
+            Classes="Hover"
+            Theme="{StaticResource CardBorder}"
            ToolTip.Placement="Left"
            ToolTip.Tip="Hello">
            <TextBlock>Left</TextBlock>
@@ -76,7 +81,8 @@
        <Border
            Margin="5"
            Padding="50,10"
-            Background="Yellow"
+            Classes="Hover"
+            Theme="{StaticResource CardBorder}"
            ToolTip.Placement="Right"
            ToolTip.Tip="Hello">
            <TextBlock>Right</TextBlock>
@@ -84,10 +90,11 @@
        <Border
            Margin="5"
            Padding="50,10"
-            Background="Yellow"
+            Classes="Hover"
+            Theme="{StaticResource CardBorder}"
            ToolTip.Placement="Bottom"
            ToolTip.Tip="Hello">
            <TextBlock>Bottom</TextBlock>
        </Border>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml
@@ -1,9 +1,13 @@
 <UserControl
-    x:Class="Semi.Avalonia.Demo.Pages.TreeViewDemo" xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450"
-    d:DesignWidth="800" mc:Ignorable="d">
-    <Panel>
+    x:Class="Semi.Avalonia.Demo.Pages.TreeViewDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Panel HorizontalAlignment="Left">
        <TreeView>
            <TreeViewItem Header="Level 1">
                <TreeViewItem Header="Level 2" />
--- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
@@ -11,11 +11,17 @@ namespace Semi.Avalonia.Demo.ViewModels;

 public class PaletteDemoViewModel: ObservableObject
 {
-    private readonly string[] _predefinedColorNames = { "Amber","Blue","Cyan","Green","Grey","Indigo","LightBlue","LightGreen","Lime","Orange","Pink","Purple","Red","Teal","Violet","Yellow" };
-    private IResourceDictionary _lightResourceDictionary;
-    private IResourceDictionary _darkResourceDictionary;
+    private readonly string[] _predefinedColorNames =
+    {
+        "Red", "Pink", "Purple", "Violet", "Indigo",
+        "Blue", "LightBlue", "Cyan", "Teal", "Green",
+        "LightGreen", "Lime", "Yellow", "Amber", "Orange",
+        "Grey"
+    };
+    private readonly IResourceDictionary? _lightResourceDictionary;
+    private readonly IResourceDictionary? _darkResourceDictionary;
    
-    private ColorItemViewModel _selectedColor;
+    private ColorItemViewModel _selectedColor = null!;

    public ColorItemViewModel SelectedColor
    {
@@ -24,14 +30,14 @@ public class PaletteDemoViewModel: ObservableObject
    }
    
    
-    private ObservableCollection<ColorListViewModel> _lightLists;
-    public ObservableCollection<ColorListViewModel> LightLists
+    private ObservableCollection<ColorListViewModel>? _lightLists;
+    public ObservableCollection<ColorListViewModel>? LightLists
    {
        get => _lightLists;
        set => SetProperty(ref _lightLists, value);
    }
-    private ObservableCollection<ColorListViewModel> _darkLists;
-    public ObservableCollection<ColorListViewModel> DarkLists
+    private ObservableCollection<ColorListViewModel>? _darkLists;
+    public ObservableCollection<ColorListViewModel>? DarkLists
    {
        get => _darkLists;
        set => SetProperty(ref _darkLists, value);
@@ -41,8 +47,8 @@ public class PaletteDemoViewModel: ObservableObject

    public PaletteDemoViewModel()
    {
-        _lightResourceDictionary = (ResourceDictionary)AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Light/Palette.axaml"));
-        _darkResourceDictionary = (ResourceDictionary)AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Dark/Palette.axaml"));
+        _lightResourceDictionary = AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Light/Palette.axaml")) as ResourceDictionary;
+        _darkResourceDictionary = AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Dark/Palette.axaml")) as ResourceDictionary;
        WeakReferenceMessenger.Default.Register<PaletteDemoViewModel, ColorItemViewModel>(this, OnClickColorItem);
    }

@@ -110,8 +116,12 @@ public class ColorListViewModel: ObservableObject
        set => SetProperty(ref _seriesName, value);
    }
    
-    internal void Initialize(IResourceDictionary resourceDictionary, string color, bool light)
+    internal void Initialize(IResourceDictionary? resourceDictionary, string color, bool light)
    {
+        if (resourceDictionary is null)
+        {
+            return;
+        }
        SeriesName = color;
        Color = new ObservableCollection<ColorItemViewModel>();
        
@@ -124,6 +134,7 @@ public class ColorListViewModel: ObservableObject
                {
                    string name = color + " " + i;
                    var item = new ColorItemViewModel(name, brush, key, light, i);
+                    item.ColorResourceKey = item.ResourceKey + "Color";
                    Color.Add(item);
                } 
            }
@@ -134,28 +145,28 @@ public class ColorListViewModel: ObservableObject
 public class ColorItemViewModel : ObservableObject
 {

-    private IBrush _brush;
+    private IBrush _brush = null!;
    public IBrush Brush
    {
        get => _brush;
        set => SetProperty(ref _brush, value);
    }
    
-    private IBrush _textBrush;
+    private IBrush _textBrush = null!;
    public IBrush TextBrush
    {
        get => _textBrush;
        set => SetProperty(ref _textBrush, value);
    }

-    private string _colorDisplayName;
+    private string _colorDisplayName = null!;
    public string ColorDisplayName
    {
        get => _colorDisplayName;
        set => SetProperty(ref _colorDisplayName, value);
    }

-    private string _resourceKey;
+    private string _resourceKey = null!;

    public string ResourceKey
    {
@@ -163,7 +174,15 @@ public class ColorItemViewModel : ObservableObject
        set => SetProperty(ref _resourceKey, value);
    }

-    private string _hex;
+    private string _colorResourceKey = null!;
+
+    public string ColorResourceKey
+    {
+        get => _colorResourceKey;
+        set => SetProperty(ref _colorResourceKey, value);
+    }
+
+    private string _hex = null!;

    public string Hex
    {
@@ -190,7 +209,7 @@ public class ColorItemViewModel : ObservableObject

 public class FunctionalColorGroupViewModel : ObservableObject
 {
-    private string _title;
+    private string _title = null!;
    public string Title
    {
        get => _title;
@@ -200,21 +219,22 @@ public class FunctionalColorGroupViewModel : ObservableObject
    public ObservableCollection<ColorItemViewModel> LightColors { get; set; } = new();
    public ObservableCollection<ColorItemViewModel> DarkColors { get; set; } = new();

-    public FunctionalColorGroupViewModel(string title, IResourceDictionary lightDictionary, IResourceDictionary darkDictionary, IReadOnlyList<Tuple<string, string>> tokens)
+    public FunctionalColorGroupViewModel(string title, IResourceDictionary? lightDictionary, IResourceDictionary? darkDictionary, IReadOnlyList<Tuple<string, string>> tokens)
    {
        Title = title;
        foreach (var token in tokens)
        {
            string key = token.Item1;
            string name = token.Item2;
-            if (lightDictionary.TryGetValue(key, out var lightValue))
+            if (lightDictionary?.TryGetValue(key, out var lightValue) ?? false)
            {
                if (lightValue is ISolidColorBrush lightBrush)
                {
                    LightColors.Add(new ColorItemViewModel(name, lightBrush, key, true, 0));
                }
            }
-            if (darkDictionary.TryGetValue(key, out var darkValue))
+
+            if (darkDictionary?.TryGetValue(key, out var darkValue) ?? false)
            {
                if (darkValue is ISolidColorBrush darkBrush)
                {
--- a/src/Package.props
+++ b/src/Package.props
@@ -3,10 +3,11 @@
        <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>10</LangVersion>
-        <Version>0.1.0-preview6</Version>
+        <Version>0.1.0-preview6.1</Version>
        <Authors>IRIHI Technology</Authors>
        <Description>Avalonia Theme inspired by Semi Design. </Description>
        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
        <AvaloniaVersion>11.0.0-preview6</AvaloniaVersion>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
    </PropertyGroup>
 </Project>
--- a/src/Semi.Avalonia.ColorPicker/Dark.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Dark.axaml
@@ -1,4 +1,7 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:colorPicker="clr-namespace:Semi.Avalonia.ColorPicker">
    <!--  Add Resources Here  -->
    <SolidColorBrush x:Key="ColorViewRadioButtonForeground" Color="#54A9FF" />
    <SolidColorBrush x:Key="ColorViewRadioButtonBackground" Color="#1C1F23" />
@@ -40,4 +43,6 @@
    <CornerRadius x:Key="ColorPreviewerCornerRadius">3</CornerRadius>

    <BoxShadows x:Key="ColorPreviewerMainBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
+
+    <colorPicker:SemiColorDarkPalette x:Key="SemiColorPalette" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia.ColorPicker/Light.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Light.axaml
@@ -1,4 +1,7 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:colorPicker="clr-namespace:Semi.Avalonia.ColorPicker">
    <!--  Add Resources Here  -->
    <SolidColorBrush x:Key="ColorViewRadioButtonForeground" Color="#0077FA" />
    <SolidColorBrush x:Key="ColorViewRadioButtonBackground" Color="White" />
@@ -40,4 +43,5 @@
    <CornerRadius x:Key="ColorPreviewerCornerRadius">3</CornerRadius>

    <BoxShadows x:Key="ColorPreviewerMainBoxShadow">0 0 14 0 #1A000000</BoxShadows>
+    <colorPicker:SemiColorLightPalette x:Key="SemiColorPalette" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <Import Project="../Package.props"/>
+    <Import Project="../Package.props" />

    <PropertyGroup>
        <Title>Semi.Avalonia.ColorPicker</Title>
--- a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs
+++ b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs
@@ -0,0 +1,231 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Semi.Avalonia.ColorPicker;
+
+public class SemiColorDarkPalette: IColorPalette
+{
+    private static readonly Color[,] Colors = new Color[,]
+    {
+        {
+            //Red
+            Color.FromUInt32(0xFF6C090B),
+            Color.FromUInt32(0xFF901110),
+            Color.FromUInt32(0xFFB42019),
+            Color.FromUInt32(0xFFD73324),
+            Color.FromUInt32(0xFFFB4932),
+            Color.FromUInt32(0xFFFC725A),
+            Color.FromUInt32(0xFFFD9983),
+            Color.FromUInt32(0xFFFDBEAC),
+            Color.FromUInt32(0xFFFEE0D5),
+            Color.FromUInt32(0xFFFFF3EF),
+        },
+        {
+            //Pink
+            Color.FromUInt32(0xFF5C0730),
+            Color.FromUInt32(0xFF800E41),
+            Color.FromUInt32(0xFFA41751),
+            Color.FromUInt32(0xFFC72261),
+            Color.FromUInt32(0xFFEB2F71),
+            Color.FromUInt32(0xFFEF5686),
+            Color.FromUInt32(0xFFF37E9F),
+            Color.FromUInt32(0xFFF7A8BC),
+            Color.FromUInt32(0xFFFBD3DC),
+            Color.FromUInt32(0xFFFDEEF1),
+        },
+        {
+            //Purple
+            Color.FromUInt32(0xFF4A1061),
+            Color.FromUInt32(0xFF5E1776),
+            Color.FromUInt32(0xFF731F8A),
+            Color.FromUInt32(0xFF89289F),
+            Color.FromUInt32(0xFFA033B3),
+            Color.FromUInt32(0xFFB553C2),
+            Color.FromUInt32(0xFFCA78D1),
+            Color.FromUInt32(0xFFDDA0E1),
+            Color.FromUInt32(0xFFEFCEF0),
+            Color.FromUInt32(0xFFF7EBF7),
+        },
+        {
+            //Violet
+            Color.FromUInt32(0xFF401B77),
+            Color.FromUInt32(0xFF4C248C),
+            Color.FromUInt32(0xFF582EA0),
+            Color.FromUInt32(0xFF6439B5),
+            Color.FromUInt32(0xFF7246C9),
+            Color.FromUInt32(0xFF8865D4),
+            Color.FromUInt32(0xFFA288DF),
+            Color.FromUInt32(0xFFBEADE9),
+            Color.FromUInt32(0xFFDDD4F4),
+            Color.FromUInt32(0xFFF1EEFA),
+        },
+        {
+            //Indigo
+            Color.FromUInt32(0xFF171E65),
+            Color.FromUInt32(0xFF20297A),
+            Color.FromUInt32(0xFF29368E),
+            Color.FromUInt32(0xFF3444A3),
+            Color.FromUInt32(0xFF4053B7),
+            Color.FromUInt32(0xFF5F71C5),
+            Color.FromUInt32(0xFF8191D4),
+            Color.FromUInt32(0xFFA7B4E2),
+            Color.FromUInt32(0xFFD1D8F1),
+            Color.FromUInt32(0xFFEDEFF8),
+        },
+        {
+            //Blue
+            Color.FromUInt32(0xFF053170),
+            Color.FromUInt32(0xFF0A4694),
+            Color.FromUInt32(0xFF135CB8),
+            Color.FromUInt32(0xFF1D75DB),
+            Color.FromUInt32(0xFF2990FF),
+            Color.FromUInt32(0xFF54A9FF),
+            Color.FromUInt32(0xFF7FC1FF),
+            Color.FromUInt32(0xFFA9D7FF),
+            Color.FromUInt32(0xFFD4ECFF),
+            Color.FromUInt32(0xFFEFF8FF),
+        },
+        {
+            //LightBlue
+            Color.FromUInt32(0xFF003761),
+            Color.FromUInt32(0xFF004D85),
+            Color.FromUInt32(0xFF0366A9),
+            Color.FromUInt32(0xFF0A81CC),
+            Color.FromUInt32(0xFF139FF0),
+            Color.FromUInt32(0xFF40B4F3),
+            Color.FromUInt32(0xFF6EC8F6),
+            Color.FromUInt32(0xFF9DDCF9),
+            Color.FromUInt32(0xFFCEEEFC),
+            Color.FromUInt32(0xFFEBF8FE),
+        },
+        {
+            //Cyan
+            Color.FromUInt32(0xFF04343D),
+            Color.FromUInt32(0xFF074F5C),
+            Color.FromUInt32(0xFF0A6C7B),
+            Color.FromUInt32(0xFF0E8999),
+            Color.FromUInt32(0xFF13A8B8),
+            Color.FromUInt32(0xFF38BBC6),
+            Color.FromUInt32(0xFF62CDD4),
+            Color.FromUInt32(0xFF91DFE3),
+            Color.FromUInt32(0xFFC6EFF1),
+            Color.FromUInt32(0xFFE7F7F8),
+        },
+        {
+            //Teal
+            Color.FromUInt32(0xFF023C39),
+            Color.FromUInt32(0xFF045A55),
+            Color.FromUInt32(0xFF07776F),
+            Color.FromUInt32(0xFF0A9588),
+            Color.FromUInt32(0xFF0EB3A1),
+            Color.FromUInt32(0xFF33C2B0),
+            Color.FromUInt32(0xFF5ED1C1),
+            Color.FromUInt32(0xFF8EE1D3),
+            Color.FromUInt32(0xFFC4F0E8),
+            Color.FromUInt32(0xFFE6F7F4),
+        },
+        {
+            //Green
+            Color.FromUInt32(0xFF123C19),
+            Color.FromUInt32(0xFF1C5A25),
+            Color.FromUInt32(0xFF277731),
+            Color.FromUInt32(0xFF32953D),
+            Color.FromUInt32(0xFF3EB349),
+            Color.FromUInt32(0xFF5DC264),
+            Color.FromUInt32(0xFF7FD184),
+            Color.FromUInt32(0xFFA6E1A8),
+            Color.FromUInt32(0xFFD0F0D1),
+            Color.FromUInt32(0xFFECF7EC),
+        },
+        {
+            //LightGreen
+            Color.FromUInt32(0xFF263D13),
+            Color.FromUInt32(0xFF3B5C1D),
+            Color.FromUInt32(0xFF517B28),
+            Color.FromUInt32(0xFF679934),
+            Color.FromUInt32(0xFF7FB840),
+            Color.FromUInt32(0xFF97C65F),
+            Color.FromUInt32(0xFFB0D481),
+            Color.FromUInt32(0xFFC9E3A7),
+            Color.FromUInt32(0xFFE4F1D1),
+            Color.FromUInt32(0xFFF3F8ED),
+        },
+        {
+            //Lime
+            Color.FromUInt32(0xFF314603),
+            Color.FromUInt32(0xFF4B6905),
+            Color.FromUInt32(0xFF678D09),
+            Color.FromUInt32(0xFF84B00C),
+            Color.FromUInt32(0xFFA2D311),
+            Color.FromUInt32(0xFFAEDC3A),
+            Color.FromUInt32(0xFFBDE566),
+            Color.FromUInt32(0xFFCFED96),
+            Color.FromUInt32(0xFFE5F6C9),
+            Color.FromUInt32(0xFFF3FBE9),
+        },
+        {
+            //Yellow
+            Color.FromUInt32(0xFF544903),
+            Color.FromUInt32(0xFF7E6C06),
+            Color.FromUInt32(0xFFA88E0A),
+            Color.FromUInt32(0xFFD2AF0F),
+            Color.FromUInt32(0xFFFCCE14),
+            Color.FromUInt32(0xFFFDDE43),
+            Color.FromUInt32(0xFFFDEB71),
+            Color.FromUInt32(0xFFFEF5A0),
+            Color.FromUInt32(0xFFFEFBD0),
+            Color.FromUInt32(0xFFFFFEEC),
+        },
+        {
+            //Amber
+            Color.FromUInt32(0xFF512E09),
+            Color.FromUInt32(0xFF794B0F),
+            Color.FromUInt32(0xFFA16B16),
+            Color.FromUInt32(0xFFCA8F1E),
+            Color.FromUInt32(0xFFF2B726),
+            Color.FromUInt32(0xFFF5CA50),
+            Color.FromUInt32(0xFFF7DB7A),
+            Color.FromUInt32(0xFFFAEAA6),
+            Color.FromUInt32(0xFFFCF6D2),
+            Color.FromUInt32(0xFFFEFBED),
+        },
+        {
+            //Orange
+            Color.FromUInt32(0xFF551F03),
+            Color.FromUInt32(0xFF803506),
+            Color.FromUInt32(0xFFAA500A),
+            Color.FromUInt32(0xFFD56F0F),
+            Color.FromUInt32(0xFFFF9214),
+            Color.FromUInt32(0xFFFFAE43),
+            Color.FromUInt32(0xFFFFC772),
+            Color.FromUInt32(0xFFFFDDA1),
+            Color.FromUInt32(0xFFFFEFD0),
+            Color.FromUInt32(0xFFFFF9ED),
+        },
+        {
+            //Grey
+            Color.FromUInt32(0xFF1C1F23),
+            Color.FromUInt32(0xFF2E3238),
+            Color.FromUInt32(0xFF41464C),
+            Color.FromUInt32(0xFF555B61),
+            Color.FromUInt32(0xFF6B7075),
+            Color.FromUInt32(0xFF888D92),
+            Color.FromUInt32(0xFFA7ABB0),
+            Color.FromUInt32(0xFFC6CACD),
+            Color.FromUInt32(0xFFE6E8EA),
+            Color.FromUInt32(0xFFF9F9F9),
+        },
+    };
+    public Color GetColor(int colorIndex, int shadeIndex)
+    {
+        return Colors[
+            MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+            MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)
+        ];
+    }
+
+    public int ColorCount => Colors.GetLength(0);
+
+    public int ShadeCount => Colors.GetLength(1);
+}
--- a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs
+++ b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs
@@ -0,0 +1,231 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Semi.Avalonia.ColorPicker;
+
+public class SemiColorLightPalette: IColorPalette
+{
+    private static readonly Color[,] Colors = new Color[,]
+    {
+        {
+            //Red
+            Color.FromUInt32(0xFFFEF2ED),
+            Color.FromUInt32(0xFFFEDDD2),
+            Color.FromUInt32(0xFFFDB7A5),
+            Color.FromUInt32(0xFFFB9078),
+            Color.FromUInt32(0xFFFA664C),
+            Color.FromUInt32(0xFFF93920),
+            Color.FromUInt32(0xFFD52515),
+            Color.FromUInt32(0xFFB2140C),
+            Color.FromUInt32(0xFF8E0805),
+            Color.FromUInt32(0xFF6A0103),
+        },
+        {
+            //Pink
+            Color.FromUInt32(0xFFFDECEF),
+            Color.FromUInt32(0xFFFBCFD8),
+            Color.FromUInt32(0xFFF6A0B5),
+            Color.FromUInt32(0xFFF27396),
+            Color.FromUInt32(0xFFED487B),
+            Color.FromUInt32(0xFFE91E63),
+            Color.FromUInt32(0xFFC51356),
+            Color.FromUInt32(0xFFA20B48),
+            Color.FromUInt32(0xFF7E053A),
+            Color.FromUInt32(0xFF5A012B),
+        },
+        {
+            //Purple
+            Color.FromUInt32(0xFFF7E9F7),
+            Color.FromUInt32(0xFFEFCAF0),
+            Color.FromUInt32(0xFFDD9BE0),
+            Color.FromUInt32(0xFFC96FD1),
+            Color.FromUInt32(0xFFB449C2),
+            Color.FromUInt32(0xFF9E28B3),
+            Color.FromUInt32(0xFF871E9E),
+            Color.FromUInt32(0xFF71168A),
+            Color.FromUInt32(0xFF5C0F75),
+            Color.FromUInt32(0xFF490A61),
+        },
+        {
+            //Violet
+            Color.FromUInt32(0xFFF3EDF9),
+            Color.FromUInt32(0xFFE2D1F4),
+            Color.FromUInt32(0xFFC4A7E9),
+            Color.FromUInt32(0xFFA67FDD),
+            Color.FromUInt32(0xFF885BD2),
+            Color.FromUInt32(0xFF6A3AC7),
+            Color.FromUInt32(0xFF572FB3),
+            Color.FromUInt32(0xFF46259E),
+            Color.FromUInt32(0xFF361C8A),
+            Color.FromUInt32(0xFF281475),
+        },
+        {
+            //Indigo
+            Color.FromUInt32(0xFFECEFF8),
+            Color.FromUInt32(0xFFD1D8F0),
+            Color.FromUInt32(0xFFA7B3E1),
+            Color.FromUInt32(0xFF8090D3),
+            Color.FromUInt32(0xFF5E6FC4),
+            Color.FromUInt32(0xFF3F51B5),
+            Color.FromUInt32(0xFF3342A1),
+            Color.FromUInt32(0xFF28348C),
+            Color.FromUInt32(0xFF1F2878),
+            Color.FromUInt32(0xFF171D63),
+        },
+        {
+            //Blue
+            Color.FromUInt32(0xFFEAF5FF),
+            Color.FromUInt32(0xFFCBE7FE),
+            Color.FromUInt32(0xFF98CDFD),
+            Color.FromUInt32(0xFF65B2FC),
+            Color.FromUInt32(0xFF3295FB),
+            Color.FromUInt32(0xFF0077FA),
+            Color.FromUInt32(0xFF0062D6),
+            Color.FromUInt32(0xFF004FB3),
+            Color.FromUInt32(0xFF003D8F),
+            Color.FromUInt32(0xFF002C6B),
+        },
+        {
+            //LightBlue
+            Color.FromUInt32(0xFFE9F7FD),
+            Color.FromUInt32(0xFFC9ECFC),
+            Color.FromUInt32(0xFF95D8F8),
+            Color.FromUInt32(0xFF62C3F5),
+            Color.FromUInt32(0xFF30ACF1),
+            Color.FromUInt32(0xFF0095EE),
+            Color.FromUInt32(0xFF007BCA),
+            Color.FromUInt32(0xFF0063A7),
+            Color.FromUInt32(0xFF004B83),
+            Color.FromUInt32(0xFF00355F),
+        },
+        {
+            //Cyan
+            Color.FromUInt32(0xFFE5F7F8),
+            Color.FromUInt32(0xFFC2EFF0),
+            Color.FromUInt32(0xFF8ADDE2),
+            Color.FromUInt32(0xFF58CBD3),
+            Color.FromUInt32(0xFF2CB8C5),
+            Color.FromUInt32(0xFF05A4B6),
+            Color.FromUInt32(0xFF038698),
+            Color.FromUInt32(0xFF016979),
+            Color.FromUInt32(0xFF004D5B),
+            Color.FromUInt32(0xFF00323D),
+        },
+        {
+            //Teal
+            Color.FromUInt32(0xFFE4F7F4),
+            Color.FromUInt32(0xFFC0F0E8),
+            Color.FromUInt32(0xFF87E0D3),
+            Color.FromUInt32(0xFF54D1C1),
+            Color.FromUInt32(0xFF27C2B0),
+            Color.FromUInt32(0xFF00B3A1),
+            Color.FromUInt32(0xFF009589),
+            Color.FromUInt32(0xFF00776F),
+            Color.FromUInt32(0xFF005955),
+            Color.FromUInt32(0xFF003C3A),
+        },
+        {
+            //Green
+            Color.FromUInt32(0xFFECF7EC),
+            Color.FromUInt32(0xFFD0F0D1),
+            Color.FromUInt32(0xFFA4E0A7),
+            Color.FromUInt32(0xFF7DD182),
+            Color.FromUInt32(0xFF5AC262),
+            Color.FromUInt32(0xFF3BB346),
+            Color.FromUInt32(0xFF30953B),
+            Color.FromUInt32(0xFF25772F),
+            Color.FromUInt32(0xFF1B5924),
+            Color.FromUInt32(0xFF113C18),
+        },
+        {
+            //LightGreen
+            Color.FromUInt32(0xFFF3F8EC),
+            Color.FromUInt32(0xFFE3F0D0),
+            Color.FromUInt32(0xFFC8E2A5),
+            Color.FromUInt32(0xFFADD37E),
+            Color.FromUInt32(0xFF93C55B),
+            Color.FromUInt32(0xFF7BB63C),
+            Color.FromUInt32(0xFF649830),
+            Color.FromUInt32(0xFF4E7926),
+            Color.FromUInt32(0xFF395B1B),
+            Color.FromUInt32(0xFF253D12),
+        },
+        {
+            //Lime
+            Color.FromUInt32(0xFFF2FAE6),
+            Color.FromUInt32(0xFFE3F6C5),
+            Color.FromUInt32(0xFFCBED8E),
+            Color.FromUInt32(0xFFB7E35B),
+            Color.FromUInt32(0xFFA7DA2C),
+            Color.FromUInt32(0xFF9BD100),
+            Color.FromUInt32(0xFF7EAE00),
+            Color.FromUInt32(0xFF638B00),
+            Color.FromUInt32(0xFF486800),
+            Color.FromUInt32(0xFF2F4600),
+        },
+        {
+            //Yellow
+            Color.FromUInt32(0xFFFFFDEA),
+            Color.FromUInt32(0xFFFEFBCB),
+            Color.FromUInt32(0xFFFDF398),
+            Color.FromUInt32(0xFFFCE865),
+            Color.FromUInt32(0xFFFBDA32),
+            Color.FromUInt32(0xFFFAC800),
+            Color.FromUInt32(0xFFD0AA00),
+            Color.FromUInt32(0xFFA78B00),
+            Color.FromUInt32(0xFF7D6A00),
+            Color.FromUInt32(0xFF534800),
+        },
+        {
+            //Amber
+            Color.FromUInt32(0xFFFEFBEB),
+            Color.FromUInt32(0xFFFCF5CE),
+            Color.FromUInt32(0xFFF9E89E),
+            Color.FromUInt32(0xFFF6D86F),
+            Color.FromUInt32(0xFFF3C641),
+            Color.FromUInt32(0xFFF0B114),
+            Color.FromUInt32(0xFFC88A0F),
+            Color.FromUInt32(0xFFA0660A),
+            Color.FromUInt32(0xFF784606),
+            Color.FromUInt32(0xFF502B03),
+        },
+        {
+            //Orange
+            Color.FromUInt32(0xFFFFF8EA),
+            Color.FromUInt32(0xFFFEEECC),
+            Color.FromUInt32(0xFFFED998),
+            Color.FromUInt32(0xFFFDC165),
+            Color.FromUInt32(0xFFFDA633),
+            Color.FromUInt32(0xFFFC8800),
+            Color.FromUInt32(0xFFD26700),
+            Color.FromUInt32(0xFFA84A00),
+            Color.FromUInt32(0xFF7E3100),
+            Color.FromUInt32(0xFF541D00),
+        },
+        {
+            //Grey
+            Color.FromUInt32(0xFFF9F9F9),
+            Color.FromUInt32(0xFFE6E8EA),
+            Color.FromUInt32(0xFFC6CACD),
+            Color.FromUInt32(0xFFA7ABB0),
+            Color.FromUInt32(0xFF888D92),
+            Color.FromUInt32(0xFF6B7075),
+            Color.FromUInt32(0xFF555B61),
+            Color.FromUInt32(0xFF41464C),
+            Color.FromUInt32(0xFF2E3238),
+            Color.FromUInt32(0xFF1C1F23),
+        },
+    };
+    public Color GetColor(int colorIndex, int shadeIndex)
+    {
+        return Colors[
+            MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+            MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)
+        ];
+    }
+
+    public int ColorCount => Colors.GetLength(0);
+
+    public int ShadeCount => Colors.GetLength(1);
+}
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -20,6 +20,7 @@
        <Setter Property="Button.HorizontalContentAlignment" Value="Center" />
        <Setter Property="Button.VerticalContentAlignment" Value="Center" />
        <Setter Property="Button.MinHeight" Value="12" />
+        <Setter Property="Button.Cursor" Value="Hand" />
        <Setter Property="Button.Template">
            <ControlTemplate TargetType="Button">
                <ContentPresenter
--- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
@@ -102,9 +102,15 @@
                                IsLightDismissEnabled="True"
                                PlacementTarget="{TemplateBinding}"
                                VerticalOffset="-4">
-                                <Border Margin="8" BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}">
+                                <Border
+                                    Margin="8"
+                                    Background="Transparent"
+                                    BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}"
+                                    CornerRadius="{DynamicResource CalendarCornerRadius}">
                                    <Calendar
                                        Name="PART_Calendar"
+                                        BorderThickness="0"
+                                        CornerRadius="{Binding $parent[Border].CornerRadius}"
                                        DisplayDate="{TemplateBinding DisplayDate}"
                                        DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
                                        DisplayDateStart="{TemplateBinding DisplayDateStart}"
--- a/src/Semi.Avalonia/Controls/CheckBox.axaml
+++ b/src/Semi.Avalonia/Controls/CheckBox.axaml
@@ -64,11 +64,11 @@
            </ControlTemplate>
        </Setter>

-        <!--  Unchecked PointerOver State  -->
+        <!--  Unchecked Pointerover State  -->
        <Style Selector="^:pointerover">
            <Style Selector="^ /template/ Border#NormalRectangle">
-                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPointOverBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource CheckBoxPointOverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckBoxPointeroverBackground}" />
            </Style>
        </Style>

@@ -102,11 +102,11 @@
                <Setter Property="Opacity" Value="1" />
            </Style>

-            <!--  Checked PointerOver State  -->
+            <!--  Checked Pointerover State  -->
            <Style Selector="^:pointerover">
                <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointOverBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointOverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
                </Style>
            </Style>

@@ -145,11 +145,11 @@
                <Setter Property="Opacity" Value="1" />
            </Style>

-            <!--  Checked PointerOver State  -->
+            <!--  Checked Pointerover State  -->
            <Style Selector="^:pointerover">
                <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointOverBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointOverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
                </Style>
            </Style>

@@ -180,6 +180,7 @@

    <ControlTheme x:Key="CardCheckBox" TargetType="CheckBox">
        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
        <Setter Property="Padding" Value="{DynamicResource CheckBoxCardPadding}" />
        <Setter Property="BorderThickness" Value="{DynamicResource CheckBoxCardBorderThickness}" />
        <Setter Property="CornerRadius" Value="{DynamicResource CheckBoxCardCornerRadius}" />
@@ -193,7 +194,11 @@
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <Grid x:Name="RootGrid" ColumnDefinitions="Auto,*">
+                    <Grid
+                        x:Name="RootGrid"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        ColumnDefinitions="Auto,*">
                        <Grid Grid.Column="0" VerticalAlignment="Top">
                            <Border
                                x:Name="NormalRectangle"
@@ -215,7 +220,6 @@
                            x:Name="ContentPresenter"
                            Grid.Column="1"
                            Margin="8,0,0,0"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                            VerticalAlignment="Center"
                            Content="{TemplateBinding Content}"
                            ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -228,10 +232,10 @@
            </ControlTemplate>
        </Setter>

-        <!--  Unchecked PointerOver State  -->
+        <!--  Unchecked Pointerover State  -->
        <Style Selector="^:pointerover">
            <Style Selector="^ /template/ Border#NormalRectangle">
-                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPointOverBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxPointeroverBorderBrush}" />
            </Style>
            <Style Selector="^ /template/ Border#RootBorder">
                <Setter Property="Background" Value="{DynamicResource CheckBoxCardPointeroverBackground}" />
@@ -274,11 +278,11 @@
                <Setter Property="Opacity" Value="1" />
            </Style>

-            <!--  Checked PointerOver State  -->
+            <!--  Checked Pointerover State  -->
            <Style Selector="^:pointerover">
                <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointOverBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointOverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
                </Style>
                <Style Selector="^ /template/ Border#RootBorder">
                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPointeroverBorderBrush}" />
@@ -329,11 +333,11 @@
                <Setter Property="Opacity" Value="1" />
            </Style>

-            <!--  Checked PointerOver State  -->
+            <!--  Checked Pointerover State  -->
            <Style Selector="^:pointerover">
                <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointOverBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointOverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckedPointeroverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedPointeroverBackground}" />
                </Style>
                <Style Selector="^ /template/ Border#RootBorder">
                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPointeroverBorderBrush}" />
@@ -376,88 +380,82 @@
        <Setter Property="Padding" Value="{DynamicResource CheckBoxCardPadding}" />
        <Setter Property="BorderThickness" Value="{DynamicResource CheckBoxCardBorderThickness}" />
        <Setter Property="CornerRadius" Value="{DynamicResource CheckBoxCardCornerRadius}" />
+        <Setter Property="CheckBox.VerticalContentAlignment" Value="Center" />
        <Setter Property="Background" Value="Transparent" />
        <Setter Property="CheckBox.Template">
            <ControlTemplate TargetType="CheckBox">
-                <Border
-                    Name="RootBorder"
+                <ContentPresenter
+                    x:Name="PART_ContentPresenter"
+                    Margin="{TemplateBinding Margin}"
                    Padding="{TemplateBinding Padding}"
+                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                    Background="{TemplateBinding Background}"
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <ContentPresenter
-                        x:Name="ContentPresenter"
-                        Grid.Column="1"
-                        Margin="8,0,0,0"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        IsVisible="{TemplateBinding Content,
-                                                    Converter={x:Static ObjectConverters.IsNotNull}}"
-                        RecognizesAccessKey="True"
-                        TextWrapping="Wrap" />
-                </Border>
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    RecognizesAccessKey="True"
+                    UseLayoutRounding="False" />
            </ControlTemplate>
        </Setter>

-        <!--  Unchecked PointerOver State  -->
+        <!--  Unchecked Pointerover State  -->
        <Style Selector="^:pointerover">
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="Background" Value="{DynamicResource CheckBoxCardPointeroverBackground}" />
            </Style>
        </Style>

        <!--  Unchecked Pressed State  -->
        <Style Selector="^:pressed">
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="Background" Value="{DynamicResource CheckBoxCardPressedBackground}" />
            </Style>
        </Style>

        <!--  Unchecked Disabled state  -->
        <Style Selector="^:disabled">
-            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
            </Style>
        </Style>

        <Style Selector="^:checked">
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedBorderBrush}" />
                <Setter Property="Background" Value="{DynamicResource CheckBoxCardCheckedBackground}" />
            </Style>
-            <Style Selector="^:pointerover /template/ Border#RootBorder">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPointeroverBorderBrush}" />
            </Style>
-            <Style Selector="^:pressed /template/ Border#RootBorder">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPressedBorderBrush}" />
            </Style>
            <!--  Checked Disabled State  -->
            <Style Selector="^:disabled">
-                <Style Selector="^ /template/ Border#RootBorder">
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedDisabledBorderBrush}" />
                </Style>
-                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxDisabledForeground}" />
                </Style>
            </Style>
        </Style>

        <Style Selector="^:indeterminate">
-            <!--  Checked Disabled State  -->
-            <Style Selector="^ /template/ Border#RootBorder">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedBorderBrush}" />
            </Style>
-            <Style Selector="^:pointerover /template/ Border#RootBorder">
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPointeroverBorderBrush}" />
            </Style>
-            <Style Selector="^:pressed /template/ Border#RootBorder">
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
                <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedPressedBorderBrush}" />
            </Style>
            <Style Selector="^:disabled">
-                <Style Selector="^ /template/ Border#RootBorder">
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCardCheckedDisabledBorderBrush}" />
                </Style>
            </Style>
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -138,13 +138,13 @@
            <Setter Property="ComboBox.MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
        </Style>

-        <!--  PointerOver State  -->
+        <!--  Pointerover State  -->
        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointerOverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPointerOverBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPointeroverBorderBrush}" />
        </Style>
        <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
-            <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPointerOverForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPointeroverForeground}" />
        </Style>

        <!--  Pressed State  -->
@@ -227,7 +227,7 @@
        </Setter>

        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource ComboBoxItemPointerOverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ComboBoxItemPointeroverBackground}" />
        </Style>

        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
@@ -246,7 +246,7 @@
                <Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedDisabledBackground}" />
            </Style>
            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedPointerOverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedPointeroverBackground}" />
            </Style>
        </Style>
    </ControlTheme>
--- a/src/Semi.Avalonia/Controls/Controls.axaml
+++ b/src/Semi.Avalonia/Controls/Controls.axaml
@@ -18,7 +18,7 @@
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ContextMenu.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/DatePicker.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/DateTimePickerShared.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/DropdownButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/DropDownButton.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/EmbeddableControlRoot.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Expander.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Controls/FlyoutPresenter.axaml" />
--- a/src/Semi.Avalonia/Controls/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Controls/DropDownButton.axaml
@@ -16,6 +16,7 @@
        <Setter Property="DropDownButton.HorizontalContentAlignment" Value="Center" />
        <Setter Property="DropDownButton.VerticalContentAlignment" Value="Center" />
        <Setter Property="DropDownButton.MinHeight" Value="12" />
+        <Setter Property="DropDownButton.Cursor" Value="Hand" />
        <Setter Property="Template">
            <ControlTemplate TargetType="DropDownButton">
                <Border
@@ -43,7 +44,7 @@
                            Margin="0,0,8,0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
-                            Data="{DynamicResource DropdownButtonIconGlyph}"
+                            Data="{DynamicResource DropDownButtonIconGlyph}"
                            Foreground="{TemplateBinding Foreground}"
                            IsHitTestVisible="False"
                            UseLayoutRounding="False" />
@@ -96,7 +97,7 @@
        </Style>
    </ControlTheme>

-    <ControlTheme x:Key="SolidDropdownButton" TargetType="DropDownButton">
+    <ControlTheme x:Key="SolidDropDownButton" TargetType="DropDownButton">
        <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
        <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
        <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
@@ -109,6 +110,7 @@
        <Setter Property="DropDownButton.HorizontalContentAlignment" Value="Center" />
        <Setter Property="DropDownButton.VerticalContentAlignment" Value="Center" />
        <Setter Property="DropDownButton.MinHeight" Value="12" />
+        <Setter Property="DropDownButton.Cursor" Value="Hand" />
        <Setter Property="Template">
            <ControlTemplate TargetType="DropDownButton">
                <Border
@@ -136,7 +138,7 @@
                            Margin="0,0,8,0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
-                            Data="{DynamicResource DropdownButtonIconGlyph}"
+                            Data="{DynamicResource DropDownButtonIconGlyph}"
                            Foreground="{TemplateBinding Foreground}"
                            IsHitTestVisible="False"
                            UseLayoutRounding="False" />
@@ -223,7 +225,7 @@
    </ControlTheme>

    <ControlTheme
-        x:Key="BorderlessDropdownButton"
+        x:Key="BorderlessDropDownButton"
        BasedOn="{StaticResource {x:Type DropDownButton}}"
        TargetType="DropDownButton">
        <Setter Property="DropDownButton.Background" Value="Transparent" />
--- a/src/Semi.Avalonia/Controls/ListBox.axaml
+++ b/src/Semi.Avalonia/Controls/ListBox.axaml
@@ -70,9 +70,9 @@
            </Style>
        </Style>

-        <!--  PointerOver State  -->
+        <!--  Pointerover State  -->
        <Style Selector="^:pointerover">
-            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemPointerOverBackground}" />
+            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
        </Style>

        <!--  Pressed State  -->
--- a/src/Semi.Avalonia/Controls/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
@@ -5,6 +5,7 @@
    <!--  Add Resources Here  -->
    <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
        <Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
+        <Setter Property="NumericUpDown.MinHeight" Value="{DynamicResource NumericUpDownWrapperDefaultHeight}" />
        <Setter Property="NumericUpDown.CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
        <Setter Property="NumericUpDown.Template">
            <ControlTemplate TargetType="NumericUpDown">
@@ -21,6 +22,8 @@
                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
                    <TextBox
                        Name="PART_TextBox"
+                        Height="{TemplateBinding Height}"
+                        MinHeight="{TemplateBinding MinHeight}"
                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                        AcceptsReturn="False"
@@ -34,6 +37,13 @@
                </ButtonSpinner>
            </ControlTemplate>
        </Setter>
+
+        <Style Selector="^.Large">
+            <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownWrapperLargeHeight}" />
+        </Style>
+        <Style Selector="^.Small">
+            <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownWrapperSmallHeight}" />
+        </Style>
    </ControlTheme>

 </ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/RadioButton.axaml
+++ b/src/Semi.Avalonia/Controls/RadioButton.axaml
@@ -35,7 +35,7 @@
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}">
                    <Grid ColumnDefinitions="Auto,*">
-                        <Grid Margin="{DynamicResource RadioButtonIconMargin}" VerticalAlignment="Top">
+                        <Grid Margin="{DynamicResource RadioButtonIconMargin}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                            <Ellipse
                                Name="OuterEllipse"
                                Width="{DynamicResource RadioButtonIconRadius}"
@@ -72,37 +72,7 @@
            </ControlTemplate>
        </Setter>

-        <!--  PointerOver State  -->
-        <Style Selector="^:checked">
-            <Style Selector="^ /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDefaultBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDefaultBackground}" />
-            </Style>
-            <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
-            </Style>
-            <Style Selector="^:disabled /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDisabledBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
-            </Style>
-            <Style Selector="^:disabled /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
-            </Style>
-            <Style Selector="^:pointerover /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointOverBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointOverBackground}" />
-            </Style>
-            <Style Selector="^:pointerover /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
-            </Style>
-            <Style Selector="^:pressed /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPressedBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPressedBackground}" />
-            </Style>
-            <Style Selector="^:pressed /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
-            </Style>
-        </Style>
+        <!--  Unchecked State  -->
        <Style Selector="^:unchecked">
            <Style Selector="^ /template/ Ellipse#OuterEllipse">
                <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconDefaultBorderBrush}" />
@@ -111,32 +81,95 @@
            <Style Selector="^ /template/ Ellipse#CheckGlyph">
                <Setter Property="Ellipse.Opacity" Value="0" />
            </Style>
-            <Style Selector="^:disabled /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconDisabledBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
+
+            <!--  Unchecked Pointerover State  -->
+            <Style Selector="^:pointerover">
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPointeroverBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPointeroverBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="0" />
+                </Style>
            </Style>
-            <Style Selector="^:disabled /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+
+            <!--  Unchecked Pressed State  -->
+            <Style Selector="^:pressed">
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPressedBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPressedBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="0" />
+                </Style>
            </Style>
-            <Style Selector="^:pointerover /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPointOverBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPointOverBackground}" />
+
+            <!--  Unchecked Disabled state  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconDisabledBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="0" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
+                </Style>
            </Style>
-            <Style Selector="^:pointerover /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+        </Style>
+
+        <!--  Checked State  -->
+        <Style Selector="^:checked">
+            <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDefaultBorderBrush}" />
+                <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDefaultBackground}" />
            </Style>
-            <Style Selector="^:pressed /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPressedBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPressedBackground}" />
+            <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                <Setter Property="Ellipse.Opacity" Value="1" />
            </Style>
-            <Style Selector="^:pressed /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+
+            <!--  Checked Pointerover State  -->
+            <Style Selector="^:pointerover">
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointeroverBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="1" />
+                </Style>
+            </Style>
+
+            <!--  Checked Pressed State  -->
+            <Style Selector="^:pressed">
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPressedBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPressedBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="1" />
+                </Style>
+            </Style>
+
+            <!--  Checked Disabled State  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDisabledBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="1" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
+                </Style>
            </Style>
        </Style>
    </ControlTheme>

    <ControlTheme x:Key="ButtonRadioButton" TargetType="RadioButton">
        <Setter Property="RadioButton.CornerRadius" Value="{DynamicResource RadioButtonButtonCornerRadius}" />
+        <Setter Property="RadioButton.VerticalContentAlignment" Value="Center" />
        <Setter Property="RadioButton.Margin" Value="2" />
        <Setter Property="RadioButton.Cursor" Value="Hand" />
        <Setter Property="RadioButton.FontWeight" Value="{DynamicResource RadioButtonButtonFontWeight}" />
@@ -163,15 +196,21 @@
                    UseLayoutRounding="False" />
            </ControlTemplate>
        </Setter>
-        <Style Selector="^:checked">
-            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
-            <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
-        </Style>
        <Style Selector="^:unchecked">
            <Setter Property="RadioButton.Background" Value="Transparent" />
            <Style Selector="^:pointerover">
                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonUncheckedPointeroverBackground}" />
            </Style>
+            <Style Selector="^:disabled">
+                <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonUncheckedDisabledForeground}" />
+            </Style>
+        </Style>
+        <Style Selector="^:checked">
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
+            <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
+            <Style Selector="^:disabled">
+                <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedDisabledForeground}" />
+            </Style>
        </Style>
        <Style Selector="^.Small">
            <Setter Property="RadioButton.FontSize" Value="{DynamicResource RadioButtonButtonSmallFontSize}" />
@@ -189,7 +228,7 @@
        <Setter Property="RadioButton.CornerRadius" Value="{DynamicResource RadioButtonCardCornerRadius}" />
        <Setter Property="RadioButton.Cursor" Value="Hand" />
        <Setter Property="RadioButton.HorizontalAlignment" Value="Left" />
-        <Setter Property="RadioButton.VerticalAlignment" Value="Top" />
+        <Setter Property="RadioButton.VerticalAlignment" Value="Center" />
        <Setter Property="RadioButton.HorizontalContentAlignment" Value="Left" />
        <Setter Property="RadioButton.VerticalContentAlignment" Value="Center" />
        <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardDefaultBackground}" />
@@ -204,7 +243,10 @@
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <Grid ColumnDefinitions="Auto,*">
+                    <Grid
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        ColumnDefinitions="Auto,*">
                        <Grid Margin="{DynamicResource RadioButtonIconMargin}" VerticalAlignment="Top">
                            <Ellipse
                                Name="OuterEllipse"
@@ -229,7 +271,6 @@
                        <ContentPresenter
                            Name="PART_ContentPresenter"
                            Grid.Column="1"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                            Content="{TemplateBinding Content}"
                            ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -242,7 +283,54 @@
            </ControlTemplate>
        </Setter>

-        <!--  PointerOver State  -->
+        <!--  Unchecked State  -->
+        <Style Selector="^:unchecked">
+            <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconDefaultBorderBrush}" />
+                <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDefaultBackground}" />
+            </Style>
+            <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                <Setter Property="Ellipse.Opacity" Value="0" />
+            </Style>
+
+            <!--  Unchecked Pointerover State  -->
+            <Style Selector="^:pointerover">
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPointeroverBorderBrush}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="0" />
+                </Style>
+            </Style>
+
+            <!--  Unchecked Pressed State  -->
+            <Style Selector="^:pressed">
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPressedBorderBrush}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="0" />
+                </Style>
+            </Style>
+
+            <!--  Unchecked Disabled state  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ Ellipse#OuterEllipse">
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconDisabledBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
+                </Style>
+                <Style Selector="^ /template/ Ellipse#CheckGlyph">
+                    <Setter Property="Ellipse.Opacity" Value="0" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
+                </Style>
+            </Style>
+        </Style>
+
+        <!--  Checked State  -->
        <Style Selector="^:checked">
            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
@@ -253,27 +341,24 @@
            <Style Selector="^ /template/ Ellipse#CheckGlyph">
                <Setter Property="Ellipse.Opacity" Value="1" />
            </Style>
-            <Style Selector="^:disabled /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDisabledBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
-            </Style>
-            <Style Selector="^:disabled /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
-            </Style>
+
+            <!--  Checked Pointerover State  -->
            <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointOverBorderBrush}" />
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
                <Style Selector="^ /template/ Ellipse#OuterEllipse">
-                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointOverBorderBrush}" />
-                    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointOverBackground}" />
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointeroverBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
                </Style>
                <Style Selector="^ /template/ Ellipse#OuterEllipse">
-                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointOverBorderBrush}" />
-                    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointOverBackground}" />
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointeroverBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
                </Style>
                <Style Selector="^ /template/ Ellipse#CheckGlyph">
                    <Setter Property="Ellipse.Opacity" Value="1" />
                </Style>
            </Style>
+
+            <!--  Checked Pressed State  -->
            <Style Selector="^:pressed">
                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
                <Style Selector="^ /template/ Ellipse#OuterEllipse">
@@ -284,38 +369,22 @@
                    <Setter Property="Ellipse.Opacity" Value="1" />
                </Style>
            </Style>
-        </Style>
-        <Style Selector="^:unchecked">
-            <Style Selector="^ /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconDefaultBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDefaultBackground}" />
-            </Style>
-            <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
-            </Style>
-            <Style Selector="^:disabled /template/ Ellipse#OuterEllipse">
-                <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconDisabledBorderBrush}" />
-                <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
-            </Style>
-            <Style Selector="^:disabled /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
-            </Style>
-            <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointOverBackground}" />
+
+            <!--  Checked Disabled State  -->
+            <Style Selector="^:disabled">
                <Style Selector="^ /template/ Ellipse#OuterEllipse">
-                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPointOverBorderBrush}" />
+                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDisabledBorderBrush}" />
+                    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
                </Style>
                <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="0" />
+                    <Setter Property="Ellipse.Opacity" Value="1" />
                </Style>
-            </Style>
-            <Style Selector="^:pressed">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
-                <Style Selector="^ /template/ Ellipse#OuterEllipse">
-                    <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPressedBorderBrush}" />
+                <Style Selector="^ /template/ Border#RootBorder">
+                    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
                </Style>
-                <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="0" />
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
                </Style>
            </Style>
        </Style>
@@ -324,10 +393,10 @@
    <ControlTheme x:Key="PureCardRadioButton" TargetType="RadioButton">
        <Setter Property="RadioButton.CornerRadius" Value="{DynamicResource RadioButtonCardCornerRadius}" />
        <Setter Property="RadioButton.Cursor" Value="Hand" />
+        <Setter Property="RadioButton.VerticalContentAlignment" Value="Center" />
        <Setter Property="RadioButton.BorderThickness" Value="1" />
        <Setter Property="RadioButton.FontSize" Value="{DynamicResource RadioButtonFontSize}" />
        <Setter Property="RadioButton.Padding" Value="{DynamicResource RadioButtonCardPadding}" />
-        <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonUncheckedForeground}" />
        <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardDefaultBackground}" />
        <Setter Property="RadioButton.Template">
            <ControlTemplate TargetType="RadioButton">
@@ -344,29 +413,40 @@
                    ContentTemplate="{TemplateBinding ContentTemplate}"
                    CornerRadius="{TemplateBinding CornerRadius}"
                    RecognizesAccessKey="True"
-                    TextElement.FontSize="{TemplateBinding FontSize}"
-                    TextElement.FontWeight="{TemplateBinding FontWeight}"
                    UseLayoutRounding="False" />
            </ControlTemplate>
        </Setter>
-        <Style Selector="^:checked">
-            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
-            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
-            <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointOverBorderBrush}" />
-            </Style>
-            <Style Selector="^:pressed">
-                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
-            </Style>
-        </Style>
        <Style Selector="^:unchecked">
            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardDefaultBorderBrush}" />
            <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointOverBackground}" />
+                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
            </Style>
            <Style Selector="^:pressed">
                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
            </Style>
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
+                </Style>
+            </Style>
        </Style>
+        <Style Selector="^:checked">
+            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
+            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
+            </Style>
+            <Style Selector="^:disabled">
+                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
+                <Setter Property="Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
+                </Style>
+            </Style>
+        </Style>
+
    </ControlTheme>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/RepeatButton.axaml
+++ b/src/Semi.Avalonia/Controls/RepeatButton.axaml
@@ -15,6 +15,7 @@
        <Setter Property="RepeatButton.HorizontalContentAlignment" Value="Center" />
        <Setter Property="RepeatButton.VerticalContentAlignment" Value="Center" />
        <Setter Property="RepeatButton.MinHeight" Value="12" />
+        <Setter Property="RepeatButton.Cursor" Value="Hand" />
        <Setter Property="RepeatButton.Template">
            <ControlTemplate TargetType="RepeatButton">
                <ContentPresenter
--- a/src/Semi.Avalonia/Controls/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
@@ -197,7 +197,7 @@
            <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonDefaultForeground}" />
        </Style>
        <Style Selector="^ /template/ RepeatButton:pointerover &gt; Path">
-            <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonPointerOverForeground}" />
+            <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonPointeroverForeground}" />
        </Style>

    </ControlTheme>
@@ -324,7 +324,7 @@
        </Style>

        <Style Selector="^ /template/ RepeatButton:pointerover &gt; Path">
-            <Setter Property="Fill" Value="{DynamicResource ColorScrollBarButtonPointerOverForeground}" />
+            <Setter Property="Fill" Value="{DynamicResource ColorScrollBarButtonPointeroverForeground}" />
        </Style>
    </ControlTheme>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -61,7 +61,7 @@
                    </ControlTemplate>
                </Setter>
                <Style Selector="^:pointerover">
-                    <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonPointerOverForeground}" />
+                    <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonPointeroverForeground}" />
                </Style>
            </ControlTheme>
            <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
@@ -94,7 +94,7 @@
        <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
        <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
        <Setter Property="TextBox.FontSize" Value="14" />
-        <Setter Property="TextBox.Cursor" Value="IBeam" />
+        <Setter Property="TextBox.Cursor" Value="Ibeam" />
        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxWrapperDefaultHeight}" />
        <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
--- a/src/Semi.Avalonia/Controls/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleButton.axaml
@@ -4,17 +4,17 @@
    x:CompileBindings="True">
    <Design.PreviewWith>
        <StackPanel Margin="20">
-            <ToggleButton>Toggle</ToggleButton>
+            <ToggleButton Classes="Primary">Toggle</ToggleButton>
            <ToggleButton Classes="Secondary">Toggle</ToggleButton>
            <ToggleButton Classes="Tertiary">Toggle</ToggleButton>
            <ToggleButton Classes="Warning">Toggle</ToggleButton>
-            <ToggleButton Classes="Error">Toggle</ToggleButton>
+            <ToggleButton Classes="Danger">Toggle</ToggleButton>

-            <ToggleButton IsThreeState="True">Toggle 3</ToggleButton>
+            <ToggleButton Classes="Primary" IsThreeState="True">Toggle 3</ToggleButton>
            <ToggleButton Classes="Secondary" IsThreeState="True">Toggle 3</ToggleButton>
            <ToggleButton Classes="Tertiary" IsThreeState="True">Toggle 3</ToggleButton>
            <ToggleButton Classes="Warning" IsThreeState="True">Toggle 3</ToggleButton>
-            <ToggleButton Classes="Error" IsThreeState="True">Toggle 3</ToggleButton>
+            <ToggleButton Classes="Danger" IsThreeState="True">Toggle 3</ToggleButton>
        </StackPanel>
    </Design.PreviewWith>
    <ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
@@ -30,6 +30,7 @@
        <Setter Property="ToggleButton.HorizontalContentAlignment" Value="Center" />
        <Setter Property="ToggleButton.VerticalContentAlignment" Value="Center" />
        <Setter Property="ToggleButton.MinHeight" Value="12" />
+        <Setter Property="ToggleButton.Cursor" Value="Hand" />
        <Setter Property="ToggleButton.Template">
            <ControlTemplate TargetType="ToggleButton">
                <ContentPresenter
@@ -54,25 +55,21 @@
            <Setter Property="RenderTransform" Value="scale(0.98)" />
        </Style>

-        <Style Selector="^.Large">
-            <Setter Property="ToggleButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
-        </Style>
-        <Style Selector="^.Small">
-            <Setter Property="ToggleButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
-        </Style>
-
-
        <Style Selector="^:pointerover">
            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultPointeroverBackground}" />
        </Style>
+
        <Style Selector="^:pressed">
            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultPressedBackground}" />
        </Style>
+
        <Style Selector="^:disabled">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultDisabledForeground}" />
-            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultDisabledBackground}" />
+            <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
        </Style>

+        <Style Selector="^.Primary">
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
+        </Style>
        <Style Selector="^.Secondary">
            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultSecondaryForeground}" />
        </Style>
@@ -82,13 +79,16 @@
        <Style Selector="^.Warning">
            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultWarningForeground}" />
        </Style>
-        <Style Selector="^.Error">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultErrorForeground}" />
+        <Style Selector="^.Danger">
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultDangerForeground}" />
        </Style>

        <Style Selector="^:checked">
            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonCheckedForeground}" />
            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
+            <Style Selector="^.Primary">
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
+            </Style>
            <Style Selector="^.Secondary">
                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedBackground}" />
            </Style>
@@ -98,11 +98,14 @@
            <Style Selector="^.Warning">
                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedBackground}" />
            </Style>
-            <Style Selector="^.Error">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonErrorCheckedBackground}" />
+            <Style Selector="^.Danger">
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedBackground}" />
            </Style>
            <Style Selector="^:pointerover">
                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
+                <Style Selector="^.Primary">
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
+                </Style>
                <Style Selector="^.Secondary">
                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPointeroverBackground}" />
                </Style>
@@ -112,12 +115,15 @@
                <Style Selector="^.Warning">
                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedPointeroverBackground}" />
                </Style>
-                <Style Selector="^.Error">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonErrorCheckedPointeroverBackground}" />
+                <Style Selector="^.Danger">
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedPointeroverBackground}" />
                </Style>
            </Style>
            <Style Selector="^:pressed">
                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
+                <Style Selector="^.Primary">
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
+                </Style>
                <Style Selector="^.Secondary">
                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPressedBackground}" />
                </Style>
@@ -127,15 +133,23 @@
                <Style Selector="^.Warning">
                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedPressedBackground}" />
                </Style>
-                <Style Selector="^.Error">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonErrorCheckedPressedBackground}" />
+                <Style Selector="^.Danger">
+                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedPressedBackground}" />
                </Style>
            </Style>
+            <Style Selector="^:disabled">
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
+            </Style>
        </Style>
+
        <Style Selector="^:indeterminate">
            <Setter Property="ToggleButton.BorderThickness" Value="1" />
            <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
+            <Style Selector="^.Primary">
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
+            </Style>
            <Style Selector="^.Secondary">
                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBackground}" />
                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBorderBrush}" />
@@ -148,41 +162,73 @@
                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningIndeterminateBackground}" />
                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminateBorderBrush}" />
            </Style>
-            <Style Selector="^.Error">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonErrorIndeterminateBackground}" />
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonErrorIndeterminateBorderBrush}" />
+            <Style Selector="^.Danger">
+                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerIndeterminateBackground}" />
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminateBorderBrush}" />
            </Style>
            <Style Selector="^:pointerover">
                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
+                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
+                <Style Selector="^.Primary">
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
+                </Style>
                <Style Selector="^.Secondary">
                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverForeground}" />
                </Style>
                <Style Selector="^.Tertiary">
                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverForeground}" />
                </Style>
                <Style Selector="^.Warning">
                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverForeground}" />
                </Style>
-                <Style Selector="^.Error">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonErrorIndeterminatePointeroverBorderBrush}" />
+                <Style Selector="^.Danger">
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverForeground}" />
                </Style>
            </Style>
            <Style Selector="^:pressed">
                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                <Style Selector="^.Primary">
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedForeground}" />
+                </Style>
                <Style Selector="^.Secondary">
                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedForeground}" />
                </Style>
                <Style Selector="^.Tertiary">
                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedForeground}" />
                </Style>
                <Style Selector="^.Warning">
                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedForeground}" />
                </Style>
-                <Style Selector="^.Error">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonErrorIndeterminatePressedBorderBrush}" />
+                <Style Selector="^.Danger">
+                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedBorderBrush}" />
+                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedForeground}" />
                </Style>
            </Style>
+            <Style Selector="^:disabled">
+                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonIndeterminateDisabledBorderBrush}" />
+            </Style>
        </Style>

+        <Style Selector="^:disabled">
+            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultDisabledForeground}" />
+            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultDisabledBackground}" />
+        </Style>
+
+        <Style Selector="^.Large">
+            <Setter Property="ToggleButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
+        </Style>
+        <Style Selector="^.Small">
+            <Setter Property="ToggleButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
+        </Style>
    </ControlTheme>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -126,7 +126,7 @@
                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDefaultBackground}" />
            </Style>
            <Style Selector="^:pointerover /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPointerOverBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPointeroverBackground}" />
            </Style>
            <Style Selector="^:pressed /template/ Border#SwitchBackgroundBorder">
                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPressedBackground}" />
@@ -149,7 +149,7 @@
                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedDefaultBackground}" />
            </Style>
            <Style Selector="^:pointerover /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedPointerOverBackground}" />
+                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedPointeroverBackground}" />
            </Style>
            <Style Selector="^:pressed /template/ Border#SwitchBackgroundBorder">
                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedPressedBackground}" />
--- a/src/Semi.Avalonia/Controls/TreeView.axaml
+++ b/src/Semi.Avalonia/Controls/TreeView.axaml
@@ -93,7 +93,6 @@
    </ControlTheme>

    <ControlTheme x:Key="{x:Type TreeViewItem}" TargetType="TreeViewItem">
-        <Setter Property="TreeViewItem.Padding" Value="0" />
        <Setter Property="TreeViewItem.Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
        <Setter Property="TreeViewItem.Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
        <Setter Property="TreeViewItem.CornerRadius" Value="3" />
@@ -144,9 +143,9 @@
            </ControlTemplate>
        </Setter>

-        <!--  PointerOver state  -->
+        <!--  Pointerover state  -->
        <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
-            <Setter Property="Background" Value="{DynamicResource TreeViewItemPointerOverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" />
        </Style>

        <!--  Pressed state  -->
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -10,15 +10,15 @@

    <SolidColorBrush x:Key="CheckBoxDefaultBackground" Color="Transparent" />
    <SolidColorBrush x:Key="CheckBoxDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CheckBoxPointOverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CheckBoxPointOverBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CheckBoxPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CheckBoxPointeroverBorderBrush" Color="#54A9FF" />
    <SolidColorBrush x:Key="CheckBoxPressedBackground" Color="#A9D7FF" />
    <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="#A9D7FF" />

    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBackground" Color="#54A9FF" />
    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointOverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBorderBrush" Color="#7FC1FF" />
    <SolidColorBrush x:Key="CheckBoxCheckedPressedBackground" Color="#A9D7FF" />
    <SolidColorBrush x:Key="CheckBoxCheckedPressedBorderBrush" Color="#A9D7FF" />

--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -1,16 +1,16 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <SolidColorBrush x:Key="ComboBoxSelectorBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointerOverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" 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="ComboBoxSelectorBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointerOverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#A9D7FF" />

    <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>

    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ComboBoxIconPointerOverForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#F9F9F9" />
    <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#F9F9F9" />
    <SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Opacity="0.35" Color="#F9F9F9" />

@@ -27,10 +27,10 @@
    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />

    <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemPointerOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#053170" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedPointerOverBackground" Color="#0A4694" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="#0A4694" />

    <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
--- a/src/Semi.Avalonia/Themes/Dark/Dark.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Dark.axaml
@@ -15,7 +15,7 @@
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ComboBox.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DatePicker.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DropdownButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/DropDownButton.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Expander.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/GridSplitter.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Label.axaml" />
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -20,7 +20,7 @@
    <PathGeometry x:Key="DateTimePickerDismissGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</PathGeometry>

    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#F9F9F9" />
-    <sys:Double x:Key="DateTimePickerListBoxItemHeight">28</sys:Double>
+    <sys:Double x:Key="DateTimePickerListBoxItemHeight">30</sys:Double>


    <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
@@ -31,7 +31,7 @@
    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#F9F9F9" />

    <SolidColorBrush x:Key="DateTimePickerButtonPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" 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" />

--- a/src/Semi.Avalonia/Themes/Dark/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DropDownButton.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="DropdownButtonIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
+    <PathGeometry x:Key="DropDownButtonIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
@@ -8,7 +8,7 @@
    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />

    <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Opacity="0.2" Color="#FF54A9FF" />
    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#FF54A9FF" />
--- a/src/Semi.Avalonia/Themes/Dark/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/NumericUpDown.axaml
@@ -1,4 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Add Resources Here  -->
    <CornerRadius x:Key="NumericUpDownCornerRadius">3</CornerRadius>
+    <x:Double x:Key="NumericUpDownWrapperDefaultHeight">32</x:Double>
+    <x:Double x:Key="NumericUpDownWrapperSmallHeight">24</x:Double>
+    <x:Double x:Key="NumericUpDownWrapperLargeHeight">40</x:Double>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
@@ -1,231 +1,393 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="SemiRed0" Color="#6C090B" />
-    <SolidColorBrush x:Key="SemiRed1" Color="#901110" />
-    <SolidColorBrush x:Key="SemiRed2" Color="#B42019" />
-    <SolidColorBrush x:Key="SemiRed3" Color="#D73324" />
-    <SolidColorBrush x:Key="SemiRed4" Color="#FB4932" />
-    <SolidColorBrush x:Key="SemiRed5" Color="#FC725A" />
-    <SolidColorBrush x:Key="SemiRed6" Color="#FD9983" />
-    <SolidColorBrush x:Key="SemiRed7" Color="#FDBEAC" />
-    <SolidColorBrush x:Key="SemiRed8" Color="#FEE0D5" />
-    <SolidColorBrush x:Key="SemiRed9" Color="#FFF3EF" />
-    <SolidColorBrush x:Key="SemiPink0" Color="#5C0730" />
-    <SolidColorBrush x:Key="SemiPink1" Color="#800E41" />
-    <SolidColorBrush x:Key="SemiPink2" Color="#A41751" />
-    <SolidColorBrush x:Key="SemiPink3" Color="#C72261" />
-    <SolidColorBrush x:Key="SemiPink4" Color="#EB2F71" />
-    <SolidColorBrush x:Key="SemiPink5" Color="#EF5686" />
-    <SolidColorBrush x:Key="SemiPink6" Color="#F37E9F" />
-    <SolidColorBrush x:Key="SemiPink7" Color="#F7A8BC" />
-    <SolidColorBrush x:Key="SemiPink8" Color="#FBD3DC" />
-    <SolidColorBrush x:Key="SemiPink9" Color="#FDEEF1" />
-    <SolidColorBrush x:Key="SemiPurple0" Color="#4A1061" />
-    <SolidColorBrush x:Key="SemiPurple1" Color="#5E1776" />
-    <SolidColorBrush x:Key="SemiPurple2" Color="#731F8A" />
-    <SolidColorBrush x:Key="SemiPurple3" Color="#89289F" />
-    <SolidColorBrush x:Key="SemiPurple4" Color="#A033B3" />
-    <SolidColorBrush x:Key="SemiPurple5" Color="#B553C2" />
-    <SolidColorBrush x:Key="SemiPurple6" Color="#CA78D1" />
-    <SolidColorBrush x:Key="SemiPurple7" Color="#DDA0E1" />
-    <SolidColorBrush x:Key="SemiPurple8" Color="#EFCEF0" />
-    <SolidColorBrush x:Key="SemiPurple9" Color="#F7EBF7" />
-    <SolidColorBrush x:Key="SemiViolet0" Color="#401B77" />
-    <SolidColorBrush x:Key="SemiViolet1" Color="#4C248C" />
-    <SolidColorBrush x:Key="SemiViolet2" Color="#582EA0" />
-    <SolidColorBrush x:Key="SemiViolet3" Color="#6439B5" />
-    <SolidColorBrush x:Key="SemiViolet4" Color="#7246C9" />
-    <SolidColorBrush x:Key="SemiViolet5" Color="#8865D4" />
-    <SolidColorBrush x:Key="SemiViolet6" Color="#A288DF" />
-    <SolidColorBrush x:Key="SemiViolet7" Color="#BEADE9" />
-    <SolidColorBrush x:Key="SemiViolet8" Color="#DDD4F4" />
-    <SolidColorBrush x:Key="SemiViolet9" Color="#F1EEFA" />
-    <SolidColorBrush x:Key="SemiIndigo0" Color="#171E65" />
-    <SolidColorBrush x:Key="SemiIndigo1" Color="#20297A" />
-    <SolidColorBrush x:Key="SemiIndigo2" Color="#29368E" />
-    <SolidColorBrush x:Key="SemiIndigo3" Color="#3444A3" />
-    <SolidColorBrush x:Key="SemiIndigo4" Color="#4053B7" />
-    <SolidColorBrush x:Key="SemiIndigo5" Color="#5F71C5" />
-    <SolidColorBrush x:Key="SemiIndigo6" Color="#8191D4" />
-    <SolidColorBrush x:Key="SemiIndigo7" Color="#A7B4E2" />
-    <SolidColorBrush x:Key="SemiIndigo8" Color="#D1D8F1" />
-    <SolidColorBrush x:Key="SemiIndigo9" Color="#EDEFF8" />
-    <SolidColorBrush x:Key="SemiBlue0" Color="#053170" />
-    <SolidColorBrush x:Key="SemiBlue1" Color="#0A4694" />
-    <SolidColorBrush x:Key="SemiBlue2" Color="#135CB8" />
-    <SolidColorBrush x:Key="SemiBlue3" Color="#1D75DB" />
-    <SolidColorBrush x:Key="SemiBlue4" Color="#2990FF" />
-    <SolidColorBrush x:Key="SemiBlue5" Color="#54A9FF" />
-    <SolidColorBrush x:Key="SemiBlue6" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="SemiBlue7" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="SemiBlue8" Color="#D4ECFF" />
-    <SolidColorBrush x:Key="SemiBlue9" Color="#EFF8FF" />
-    <SolidColorBrush x:Key="SemiLightBlue0" Color="#003761" />
-    <SolidColorBrush x:Key="SemiLightBlue1" Color="#004D85" />
-    <SolidColorBrush x:Key="SemiLightBlue2" Color="#0366A9" />
-    <SolidColorBrush x:Key="SemiLightBlue3" Color="#0A81CC" />
-    <SolidColorBrush x:Key="SemiLightBlue4" Color="#139FF0" />
-    <SolidColorBrush x:Key="SemiLightBlue5" Color="#40B4F3" />
-    <SolidColorBrush x:Key="SemiLightBlue6" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="SemiLightBlue7" Color="#9DDCF9" />
-    <SolidColorBrush x:Key="SemiLightBlue8" Color="#CEEEFC" />
-    <SolidColorBrush x:Key="SemiLightBlue9" Color="#EBF8FE" />
-    <SolidColorBrush x:Key="SemiCyan0" Color="#04343D" />
-    <SolidColorBrush x:Key="SemiCyan1" Color="#074F5C" />
-    <SolidColorBrush x:Key="SemiCyan2" Color="#0A6C7B" />
-    <SolidColorBrush x:Key="SemiCyan3" Color="#0E8999" />
-    <SolidColorBrush x:Key="SemiCyan4" Color="#13A8B8" />
-    <SolidColorBrush x:Key="SemiCyan5" Color="#38BBC6" />
-    <SolidColorBrush x:Key="SemiCyan6" Color="#62CDD4" />
-    <SolidColorBrush x:Key="SemiCyan7" Color="#91DFE3" />
-    <SolidColorBrush x:Key="SemiCyan8" Color="#C6EFF1" />
-    <SolidColorBrush x:Key="SemiCyan9" Color="#E7F7F8" />
-    <SolidColorBrush x:Key="SemiTeal0" Color="#023C39" />
-    <SolidColorBrush x:Key="SemiTeal1" Color="#045A55" />
-    <SolidColorBrush x:Key="SemiTeal2" Color="#07776F" />
-    <SolidColorBrush x:Key="SemiTeal3" Color="#0A9588" />
-    <SolidColorBrush x:Key="SemiTeal4" Color="#0EB3A1" />
-    <SolidColorBrush x:Key="SemiTeal5" Color="#33C2B0" />
-    <SolidColorBrush x:Key="SemiTeal6" Color="#5ED1C1" />
-    <SolidColorBrush x:Key="SemiTeal7" Color="#8EE1D3" />
-    <SolidColorBrush x:Key="SemiTeal8" Color="#C4F0E8" />
-    <SolidColorBrush x:Key="SemiTeal9" Color="#E6F7F4" />
-    <SolidColorBrush x:Key="SemiGreen0" Color="#123C19" />
-    <SolidColorBrush x:Key="SemiGreen1" Color="#1C5A25" />
-    <SolidColorBrush x:Key="SemiGreen2" Color="#277731" />
-    <SolidColorBrush x:Key="SemiGreen3" Color="#32953D" />
-    <SolidColorBrush x:Key="SemiGreen4" Color="#3EB349" />
-    <SolidColorBrush x:Key="SemiGreen5" Color="#5DC264" />
-    <SolidColorBrush x:Key="SemiGreen6" Color="#7FD184" />
-    <SolidColorBrush x:Key="SemiGreen7" Color="#A6E1A8" />
-    <SolidColorBrush x:Key="SemiGreen8" Color="#D0F0D1" />
-    <SolidColorBrush x:Key="SemiGreen9" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="SemiLightGreen0" Color="#263D13" />
-    <SolidColorBrush x:Key="SemiLightGreen1" Color="#3B5C1D" />
-    <SolidColorBrush x:Key="SemiLightGreen2" Color="#517B28" />
-    <SolidColorBrush x:Key="SemiLightGreen3" Color="#679934" />
-    <SolidColorBrush x:Key="SemiLightGreen4" Color="#7FB840" />
-    <SolidColorBrush x:Key="SemiLightGreen5" Color="#97C65F" />
-    <SolidColorBrush x:Key="SemiLightGreen6" Color="#B0D481" />
-    <SolidColorBrush x:Key="SemiLightGreen7" Color="#C9E3A7" />
-    <SolidColorBrush x:Key="SemiLightGreen8" Color="#E4F1D1" />
-    <SolidColorBrush x:Key="SemiLightGreen9" Color="#F3F8ED" />
-    <SolidColorBrush x:Key="SemiLime0" Color="#314603" />
-    <SolidColorBrush x:Key="SemiLime1" Color="#4B6905" />
-    <SolidColorBrush x:Key="SemiLime2" Color="#678D09" />
-    <SolidColorBrush x:Key="SemiLime3" Color="#84B00C" />
-    <SolidColorBrush x:Key="SemiLime4" Color="#A2D311" />
-    <SolidColorBrush x:Key="SemiLime5" Color="#AEDC3A" />
-    <SolidColorBrush x:Key="SemiLime6" Color="#BDE566" />
-    <SolidColorBrush x:Key="SemiLime7" Color="#CFED96" />
-    <SolidColorBrush x:Key="SemiLime8" Color="#E5F6C9" />
-    <SolidColorBrush x:Key="SemiLime9" Color="#F3FBE9" />
-    <SolidColorBrush x:Key="SemiYellow0" Color="#544903" />
-    <SolidColorBrush x:Key="SemiYellow1" Color="#7E6C06" />
-    <SolidColorBrush x:Key="SemiYellow2" Color="#A88E0A" />
-    <SolidColorBrush x:Key="SemiYellow3" Color="#D2AF0F" />
-    <SolidColorBrush x:Key="SemiYellow4" Color="#FCCE14" />
-    <SolidColorBrush x:Key="SemiYellow5" Color="#FDDE43" />
-    <SolidColorBrush x:Key="SemiYellow6" Color="#FDEB71" />
-    <SolidColorBrush x:Key="SemiYellow7" Color="#FEF5A0" />
-    <SolidColorBrush x:Key="SemiYellow8" Color="#FEFBD0" />
-    <SolidColorBrush x:Key="SemiYellow9" Color="#FFFEEC" />
-    <SolidColorBrush x:Key="SemiAmber0" Color="#512E09" />
-    <SolidColorBrush x:Key="SemiAmber1" Color="#794B0F" />
-    <SolidColorBrush x:Key="SemiAmber2" Color="#A16B16" />
-    <SolidColorBrush x:Key="SemiAmber3" Color="#CA8F1E" />
-    <SolidColorBrush x:Key="SemiAmber4" Color="#F2B726" />
-    <SolidColorBrush x:Key="SemiAmber5" Color="#F5CA50" />
-    <SolidColorBrush x:Key="SemiAmber6" Color="#F7DB7A" />
-    <SolidColorBrush x:Key="SemiAmber7" Color="#FAEAA6" />
-    <SolidColorBrush x:Key="SemiAmber8" Color="#FCF6D2" />
-    <SolidColorBrush x:Key="SemiAmber9" Color="#FEFBED" />
-    <SolidColorBrush x:Key="SemiOrange0" Color="#551F03" />
-    <SolidColorBrush x:Key="SemiOrange1" Color="#803506" />
-    <SolidColorBrush x:Key="SemiOrange2" Color="#AA500A" />
-    <SolidColorBrush x:Key="SemiOrange3" Color="#D56F0F" />
-    <SolidColorBrush x:Key="SemiOrange4" Color="#FF9214" />
-    <SolidColorBrush x:Key="SemiOrange5" Color="#FFAE43" />
-    <SolidColorBrush x:Key="SemiOrange6" Color="#FFC772" />
-    <SolidColorBrush x:Key="SemiOrange7" Color="#FFDDA1" />
-    <SolidColorBrush x:Key="SemiOrange8" Color="#FFEFD0" />
-    <SolidColorBrush x:Key="SemiOrange9" Color="#FFF9ED" />
-    <SolidColorBrush x:Key="SemiGrey0" Color="#1C1F23" />
-    <SolidColorBrush x:Key="SemiGrey1" Color="#2E3238" />
-    <SolidColorBrush x:Key="SemiGrey2" Color="#41464C" />
-    <SolidColorBrush x:Key="SemiGrey3" Color="#555B61" />
-    <SolidColorBrush x:Key="SemiGrey4" Color="#6B7075" />
-    <SolidColorBrush x:Key="SemiGrey5" Color="#888D92" />
-    <SolidColorBrush x:Key="SemiGrey6" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="SemiGrey7" Color="#C6CACD" />
-    <SolidColorBrush x:Key="SemiGrey8" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="SemiGrey9" Color="#F9F9F9" />
+    <!--  Color Resources  -->
+    <Color x:Key="SemiRed0Color">#6C090B</Color>
+    <Color x:Key="SemiRed1Color">#901110</Color>
+    <Color x:Key="SemiRed2Color">#B42019</Color>
+    <Color x:Key="SemiRed3Color">#D73324</Color>
+    <Color x:Key="SemiRed4Color">#FB4932</Color>
+    <Color x:Key="SemiRed5Color">#FC725A</Color>
+    <Color x:Key="SemiRed6Color">#FD9983</Color>
+    <Color x:Key="SemiRed7Color">#FDBEAC</Color>
+    <Color x:Key="SemiRed8Color">#FEE0D5</Color>
+    <Color x:Key="SemiRed9Color">#FFF3EF</Color>
+    <Color x:Key="SemiPink0Color">#5C0730</Color>
+    <Color x:Key="SemiPink1Color">#800E41</Color>
+    <Color x:Key="SemiPink2Color">#A41751</Color>
+    <Color x:Key="SemiPink3Color">#C72261</Color>
+    <Color x:Key="SemiPink4Color">#EB2F71</Color>
+    <Color x:Key="SemiPink5Color">#EF5686</Color>
+    <Color x:Key="SemiPink6Color">#F37E9F</Color>
+    <Color x:Key="SemiPink7Color">#F7A8BC</Color>
+    <Color x:Key="SemiPink8Color">#FBD3DC</Color>
+    <Color x:Key="SemiPink9Color">#FDEEF1</Color>
+    <Color x:Key="SemiPurple0Color">#4A1061</Color>
+    <Color x:Key="SemiPurple1Color">#5E1776</Color>
+    <Color x:Key="SemiPurple2Color">#731F8A</Color>
+    <Color x:Key="SemiPurple3Color">#89289F</Color>
+    <Color x:Key="SemiPurple4Color">#A033B3</Color>
+    <Color x:Key="SemiPurple5Color">#B553C2</Color>
+    <Color x:Key="SemiPurple6Color">#CA78D1</Color>
+    <Color x:Key="SemiPurple7Color">#DDA0E1</Color>
+    <Color x:Key="SemiPurple8Color">#EFCEF0</Color>
+    <Color x:Key="SemiPurple9Color">#F7EBF7</Color>
+    <Color x:Key="SemiViolet0Color">#401B77</Color>
+    <Color x:Key="SemiViolet1Color">#4C248C</Color>
+    <Color x:Key="SemiViolet2Color">#582EA0</Color>
+    <Color x:Key="SemiViolet3Color">#6439B5</Color>
+    <Color x:Key="SemiViolet4Color">#7246C9</Color>
+    <Color x:Key="SemiViolet5Color">#8865D4</Color>
+    <Color x:Key="SemiViolet6Color">#A288DF</Color>
+    <Color x:Key="SemiViolet7Color">#BEADE9</Color>
+    <Color x:Key="SemiViolet8Color">#DDD4F4</Color>
+    <Color x:Key="SemiViolet9Color">#F1EEFA</Color>
+    <Color x:Key="SemiIndigo0Color">#171E65</Color>
+    <Color x:Key="SemiIndigo1Color">#20297A</Color>
+    <Color x:Key="SemiIndigo2Color">#29368E</Color>
+    <Color x:Key="SemiIndigo3Color">#3444A3</Color>
+    <Color x:Key="SemiIndigo4Color">#4053B7</Color>
+    <Color x:Key="SemiIndigo5Color">#5F71C5</Color>
+    <Color x:Key="SemiIndigo6Color">#8191D4</Color>
+    <Color x:Key="SemiIndigo7Color">#A7B4E2</Color>
+    <Color x:Key="SemiIndigo8Color">#D1D8F1</Color>
+    <Color x:Key="SemiIndigo9Color">#EDEFF8</Color>
+    <Color x:Key="SemiBlue0Color">#053170</Color>
+    <Color x:Key="SemiBlue1Color">#0A4694</Color>
+    <Color x:Key="SemiBlue2Color">#135CB8</Color>
+    <Color x:Key="SemiBlue3Color">#1D75DB</Color>
+    <Color x:Key="SemiBlue4Color">#2990FF</Color>
+    <Color x:Key="SemiBlue5Color">#54A9FF</Color>
+    <Color x:Key="SemiBlue6Color">#7FC1FF</Color>
+    <Color x:Key="SemiBlue7Color">#A9D7FF</Color>
+    <Color x:Key="SemiBlue8Color">#D4ECFF</Color>
+    <Color x:Key="SemiBlue9Color">#EFF8FF</Color>
+    <Color x:Key="SemiLightBlue0Color">#003761</Color>
+    <Color x:Key="SemiLightBlue1Color">#004D85</Color>
+    <Color x:Key="SemiLightBlue2Color">#0366A9</Color>
+    <Color x:Key="SemiLightBlue3Color">#0A81CC</Color>
+    <Color x:Key="SemiLightBlue4Color">#139FF0</Color>
+    <Color x:Key="SemiLightBlue5Color">#40B4F3</Color>
+    <Color x:Key="SemiLightBlue6Color">#6EC8F6</Color>
+    <Color x:Key="SemiLightBlue7Color">#9DDCF9</Color>
+    <Color x:Key="SemiLightBlue8Color">#CEEEFC</Color>
+    <Color x:Key="SemiLightBlue9Color">#EBF8FE</Color>
+    <Color x:Key="SemiCyan0Color">#04343D</Color>
+    <Color x:Key="SemiCyan1Color">#074F5C</Color>
+    <Color x:Key="SemiCyan2Color">#0A6C7B</Color>
+    <Color x:Key="SemiCyan3Color">#0E8999</Color>
+    <Color x:Key="SemiCyan4Color">#13A8B8</Color>
+    <Color x:Key="SemiCyan5Color">#38BBC6</Color>
+    <Color x:Key="SemiCyan6Color">#62CDD4</Color>
+    <Color x:Key="SemiCyan7Color">#91DFE3</Color>
+    <Color x:Key="SemiCyan8Color">#C6EFF1</Color>
+    <Color x:Key="SemiCyan9Color">#E7F7F8</Color>
+    <Color x:Key="SemiTeal0Color">#023C39</Color>
+    <Color x:Key="SemiTeal1Color">#045A55</Color>
+    <Color x:Key="SemiTeal2Color">#07776F</Color>
+    <Color x:Key="SemiTeal3Color">#0A9588</Color>
+    <Color x:Key="SemiTeal4Color">#0EB3A1</Color>
+    <Color x:Key="SemiTeal5Color">#33C2B0</Color>
+    <Color x:Key="SemiTeal6Color">#5ED1C1</Color>
+    <Color x:Key="SemiTeal7Color">#8EE1D3</Color>
+    <Color x:Key="SemiTeal8Color">#C4F0E8</Color>
+    <Color x:Key="SemiTeal9Color">#E6F7F4</Color>
+    <Color x:Key="SemiGreen0Color">#123C19</Color>
+    <Color x:Key="SemiGreen1Color">#1C5A25</Color>
+    <Color x:Key="SemiGreen2Color">#277731</Color>
+    <Color x:Key="SemiGreen3Color">#32953D</Color>
+    <Color x:Key="SemiGreen4Color">#3EB349</Color>
+    <Color x:Key="SemiGreen5Color">#5DC264</Color>
+    <Color x:Key="SemiGreen6Color">#7FD184</Color>
+    <Color x:Key="SemiGreen7Color">#A6E1A8</Color>
+    <Color x:Key="SemiGreen8Color">#D0F0D1</Color>
+    <Color x:Key="SemiGreen9Color">#ECF7EC</Color>
+    <Color x:Key="SemiLightGreen0Color">#263D13</Color>
+    <Color x:Key="SemiLightGreen1Color">#3B5C1D</Color>
+    <Color x:Key="SemiLightGreen2Color">#517B28</Color>
+    <Color x:Key="SemiLightGreen3Color">#679934</Color>
+    <Color x:Key="SemiLightGreen4Color">#7FB840</Color>
+    <Color x:Key="SemiLightGreen5Color">#97C65F</Color>
+    <Color x:Key="SemiLightGreen6Color">#B0D481</Color>
+    <Color x:Key="SemiLightGreen7Color">#C9E3A7</Color>
+    <Color x:Key="SemiLightGreen8Color">#E4F1D1</Color>
+    <Color x:Key="SemiLightGreen9Color">#F3F8ED</Color>
+    <Color x:Key="SemiLime0Color">#314603</Color>
+    <Color x:Key="SemiLime1Color">#4B6905</Color>
+    <Color x:Key="SemiLime2Color">#678D09</Color>
+    <Color x:Key="SemiLime3Color">#84B00C</Color>
+    <Color x:Key="SemiLime4Color">#A2D311</Color>
+    <Color x:Key="SemiLime5Color">#AEDC3A</Color>
+    <Color x:Key="SemiLime6Color">#BDE566</Color>
+    <Color x:Key="SemiLime7Color">#CFED96</Color>
+    <Color x:Key="SemiLime8Color">#E5F6C9</Color>
+    <Color x:Key="SemiLime9Color">#F3FBE9</Color>
+    <Color x:Key="SemiYellow0Color">#544903</Color>
+    <Color x:Key="SemiYellow1Color">#7E6C06</Color>
+    <Color x:Key="SemiYellow2Color">#A88E0A</Color>
+    <Color x:Key="SemiYellow3Color">#D2AF0F</Color>
+    <Color x:Key="SemiYellow4Color">#FCCE14</Color>
+    <Color x:Key="SemiYellow5Color">#FDDE43</Color>
+    <Color x:Key="SemiYellow6Color">#FDEB71</Color>
+    <Color x:Key="SemiYellow7Color">#FEF5A0</Color>
+    <Color x:Key="SemiYellow8Color">#FEFBD0</Color>
+    <Color x:Key="SemiYellow9Color">#FFFEEC</Color>
+    <Color x:Key="SemiAmber0Color">#512E09</Color>
+    <Color x:Key="SemiAmber1Color">#794B0F</Color>
+    <Color x:Key="SemiAmber2Color">#A16B16</Color>
+    <Color x:Key="SemiAmber3Color">#CA8F1E</Color>
+    <Color x:Key="SemiAmber4Color">#F2B726</Color>
+    <Color x:Key="SemiAmber5Color">#F5CA50</Color>
+    <Color x:Key="SemiAmber6Color">#F7DB7A</Color>
+    <Color x:Key="SemiAmber7Color">#FAEAA6</Color>
+    <Color x:Key="SemiAmber8Color">#FCF6D2</Color>
+    <Color x:Key="SemiAmber9Color">#FEFBED</Color>
+    <Color x:Key="SemiOrange0Color">#551F03</Color>
+    <Color x:Key="SemiOrange1Color">#803506</Color>
+    <Color x:Key="SemiOrange2Color">#AA500A</Color>
+    <Color x:Key="SemiOrange3Color">#D56F0F</Color>
+    <Color x:Key="SemiOrange4Color">#FF9214</Color>
+    <Color x:Key="SemiOrange5Color">#FFAE43</Color>
+    <Color x:Key="SemiOrange6Color">#FFC772</Color>
+    <Color x:Key="SemiOrange7Color">#FFDDA1</Color>
+    <Color x:Key="SemiOrange8Color">#FFEFD0</Color>
+    <Color x:Key="SemiOrange9Color">#FFF9ED</Color>
+    <Color x:Key="SemiGrey0Color">#1C1F23</Color>
+    <Color x:Key="SemiGrey1Color">#2E3238</Color>
+    <Color x:Key="SemiGrey2Color">#41464C</Color>
+    <Color x:Key="SemiGrey3Color">#555B61</Color>
+    <Color x:Key="SemiGrey4Color">#6B7075</Color>
+    <Color x:Key="SemiGrey5Color">#888D92</Color>
+    <Color x:Key="SemiGrey6Color">#A7ABB0</Color>
+    <Color x:Key="SemiGrey7Color">#C6CACD</Color>
+    <Color x:Key="SemiGrey8Color">#E6E8EA</Color>
+    <Color x:Key="SemiGrey9Color">#F9F9F9</Color>
+
+    <SolidColorBrush x:Key="SemiRed0" Color="{StaticResource SemiRed0Color}" />
+    <SolidColorBrush x:Key="SemiRed1" Color="{StaticResource SemiRed1Color}" />
+    <SolidColorBrush x:Key="SemiRed2" Color="{StaticResource SemiRed2Color}" />
+    <SolidColorBrush x:Key="SemiRed3" Color="{StaticResource SemiRed3Color}" />
+    <SolidColorBrush x:Key="SemiRed4" Color="{StaticResource SemiRed4Color}" />
+    <SolidColorBrush x:Key="SemiRed5" Color="{StaticResource SemiRed5Color}" />
+    <SolidColorBrush x:Key="SemiRed6" Color="{StaticResource SemiRed6Color}" />
+    <SolidColorBrush x:Key="SemiRed7" Color="{StaticResource SemiRed7Color}" />
+    <SolidColorBrush x:Key="SemiRed8" Color="{StaticResource SemiRed8Color}" />
+    <SolidColorBrush x:Key="SemiRed9" Color="{StaticResource SemiRed9Color}" />
+    <SolidColorBrush x:Key="SemiPink0" Color="{StaticResource SemiPink0Color}" />
+    <SolidColorBrush x:Key="SemiPink1" Color="{StaticResource SemiPink1Color}" />
+    <SolidColorBrush x:Key="SemiPink2" Color="{StaticResource SemiPink2Color}" />
+    <SolidColorBrush x:Key="SemiPink3" Color="{StaticResource SemiPink3Color}" />
+    <SolidColorBrush x:Key="SemiPink4" Color="{StaticResource SemiPink4Color}" />
+    <SolidColorBrush x:Key="SemiPink5" Color="{StaticResource SemiPink5Color}" />
+    <SolidColorBrush x:Key="SemiPink6" Color="{StaticResource SemiPink6Color}" />
+    <SolidColorBrush x:Key="SemiPink7" Color="{StaticResource SemiPink7Color}" />
+    <SolidColorBrush x:Key="SemiPink8" Color="{StaticResource SemiPink8Color}" />
+    <SolidColorBrush x:Key="SemiPink9" Color="{StaticResource SemiPink9Color}" />
+    <SolidColorBrush x:Key="SemiPurple0" Color="{StaticResource SemiPurple0Color}" />
+    <SolidColorBrush x:Key="SemiPurple1" Color="{StaticResource SemiPurple1Color}" />
+    <SolidColorBrush x:Key="SemiPurple2" Color="{StaticResource SemiPurple2Color}" />
+    <SolidColorBrush x:Key="SemiPurple3" Color="{StaticResource SemiPurple3Color}" />
+    <SolidColorBrush x:Key="SemiPurple4" Color="{StaticResource SemiPurple4Color}" />
+    <SolidColorBrush x:Key="SemiPurple5" Color="{StaticResource SemiPurple5Color}" />
+    <SolidColorBrush x:Key="SemiPurple6" Color="{StaticResource SemiPurple6Color}" />
+    <SolidColorBrush x:Key="SemiPurple7" Color="{StaticResource SemiPurple7Color}" />
+    <SolidColorBrush x:Key="SemiPurple8" Color="{StaticResource SemiPurple8Color}" />
+    <SolidColorBrush x:Key="SemiPurple9" Color="{StaticResource SemiPurple9Color}" />
+    <SolidColorBrush x:Key="SemiViolet0" Color="{StaticResource SemiViolet0Color}" />
+    <SolidColorBrush x:Key="SemiViolet1" Color="{StaticResource SemiViolet1Color}" />
+    <SolidColorBrush x:Key="SemiViolet2" Color="{StaticResource SemiViolet2Color}" />
+    <SolidColorBrush x:Key="SemiViolet3" Color="{StaticResource SemiViolet3Color}" />
+    <SolidColorBrush x:Key="SemiViolet4" Color="{StaticResource SemiViolet4Color}" />
+    <SolidColorBrush x:Key="SemiViolet5" Color="{StaticResource SemiViolet5Color}" />
+    <SolidColorBrush x:Key="SemiViolet6" Color="{StaticResource SemiViolet6Color}" />
+    <SolidColorBrush x:Key="SemiViolet7" Color="{StaticResource SemiViolet7Color}" />
+    <SolidColorBrush x:Key="SemiViolet8" Color="{StaticResource SemiViolet8Color}" />
+    <SolidColorBrush x:Key="SemiViolet9" Color="{StaticResource SemiViolet9Color}" />
+    <SolidColorBrush x:Key="SemiIndigo0" Color="{StaticResource SemiIndigo0Color}" />
+    <SolidColorBrush x:Key="SemiIndigo1" Color="{StaticResource SemiIndigo1Color}" />
+    <SolidColorBrush x:Key="SemiIndigo2" Color="{StaticResource SemiIndigo2Color}" />
+    <SolidColorBrush x:Key="SemiIndigo3" Color="{StaticResource SemiIndigo3Color}" />
+    <SolidColorBrush x:Key="SemiIndigo4" Color="{StaticResource SemiIndigo4Color}" />
+    <SolidColorBrush x:Key="SemiIndigo5" Color="{StaticResource SemiIndigo5Color}" />
+    <SolidColorBrush x:Key="SemiIndigo6" Color="{StaticResource SemiIndigo6Color}" />
+    <SolidColorBrush x:Key="SemiIndigo7" Color="{StaticResource SemiIndigo7Color}" />
+    <SolidColorBrush x:Key="SemiIndigo8" Color="{StaticResource SemiIndigo8Color}" />
+    <SolidColorBrush x:Key="SemiIndigo9" Color="{StaticResource SemiIndigo9Color}" />
+    <SolidColorBrush x:Key="SemiBlue0" Color="{StaticResource SemiBlue0Color}" />
+    <SolidColorBrush x:Key="SemiBlue1" Color="{StaticResource SemiBlue1Color}" />
+    <SolidColorBrush x:Key="SemiBlue2" Color="{StaticResource SemiBlue2Color}" />
+    <SolidColorBrush x:Key="SemiBlue3" Color="{StaticResource SemiBlue3Color}" />
+    <SolidColorBrush x:Key="SemiBlue4" Color="{StaticResource SemiBlue4Color}" />
+    <SolidColorBrush x:Key="SemiBlue5" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiBlue6" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiBlue7" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiBlue8" Color="{StaticResource SemiBlue8Color}" />
+    <SolidColorBrush x:Key="SemiBlue9" Color="{StaticResource SemiBlue9Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue0" Color="{StaticResource SemiLightBlue0Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue1" Color="{StaticResource SemiLightBlue1Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue2" Color="{StaticResource SemiLightBlue2Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue3" Color="{StaticResource SemiLightBlue3Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue4" Color="{StaticResource SemiLightBlue4Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue5" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue6" Color="{StaticResource SemiLightBlue6Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue7" Color="{StaticResource SemiLightBlue7Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue8" Color="{StaticResource SemiLightBlue8Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue9" Color="{StaticResource SemiLightBlue9Color}" />
+    <SolidColorBrush x:Key="SemiCyan0" Color="{StaticResource SemiCyan0Color}" />
+    <SolidColorBrush x:Key="SemiCyan1" Color="{StaticResource SemiCyan1Color}" />
+    <SolidColorBrush x:Key="SemiCyan2" Color="{StaticResource SemiCyan2Color}" />
+    <SolidColorBrush x:Key="SemiCyan3" Color="{StaticResource SemiCyan3Color}" />
+    <SolidColorBrush x:Key="SemiCyan4" Color="{StaticResource SemiCyan4Color}" />
+    <SolidColorBrush x:Key="SemiCyan5" Color="{StaticResource SemiCyan5Color}" />
+    <SolidColorBrush x:Key="SemiCyan6" Color="{StaticResource SemiCyan6Color}" />
+    <SolidColorBrush x:Key="SemiCyan7" Color="{StaticResource SemiCyan7Color}" />
+    <SolidColorBrush x:Key="SemiCyan8" Color="{StaticResource SemiCyan8Color}" />
+    <SolidColorBrush x:Key="SemiCyan9" Color="{StaticResource SemiCyan9Color}" />
+    <SolidColorBrush x:Key="SemiTeal0" Color="{StaticResource SemiTeal0Color}" />
+    <SolidColorBrush x:Key="SemiTeal1" Color="{StaticResource SemiTeal1Color}" />
+    <SolidColorBrush x:Key="SemiTeal2" Color="{StaticResource SemiTeal2Color}" />
+    <SolidColorBrush x:Key="SemiTeal3" Color="{StaticResource SemiTeal3Color}" />
+    <SolidColorBrush x:Key="SemiTeal4" Color="{StaticResource SemiTeal4Color}" />
+    <SolidColorBrush x:Key="SemiTeal5" Color="{StaticResource SemiTeal5Color}" />
+    <SolidColorBrush x:Key="SemiTeal6" Color="{StaticResource SemiTeal6Color}" />
+    <SolidColorBrush x:Key="SemiTeal7" Color="{StaticResource SemiTeal7Color}" />
+    <SolidColorBrush x:Key="SemiTeal8" Color="{StaticResource SemiTeal8Color}" />
+    <SolidColorBrush x:Key="SemiTeal9" Color="{StaticResource SemiTeal9Color}" />
+    <SolidColorBrush x:Key="SemiGreen0" Color="{StaticResource SemiGreen0Color}" />
+    <SolidColorBrush x:Key="SemiGreen1" Color="{StaticResource SemiGreen1Color}" />
+    <SolidColorBrush x:Key="SemiGreen2" Color="{StaticResource SemiGreen2Color}" />
+    <SolidColorBrush x:Key="SemiGreen3" Color="{StaticResource SemiGreen3Color}" />
+    <SolidColorBrush x:Key="SemiGreen4" Color="{StaticResource SemiGreen4Color}" />
+    <SolidColorBrush x:Key="SemiGreen5" Color="{StaticResource SemiGreen5Color}" />
+    <SolidColorBrush x:Key="SemiGreen6" Color="{StaticResource SemiGreen6Color}" />
+    <SolidColorBrush x:Key="SemiGreen7" Color="{StaticResource SemiGreen7Color}" />
+    <SolidColorBrush x:Key="SemiGreen8" Color="{StaticResource SemiGreen8Color}" />
+    <SolidColorBrush x:Key="SemiGreen9" Color="{StaticResource SemiGreen9Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen0" Color="{StaticResource SemiLightGreen0Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen1" Color="{StaticResource SemiLightGreen1Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen2" Color="{StaticResource SemiLightGreen2Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen3" Color="{StaticResource SemiLightGreen3Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen4" Color="{StaticResource SemiLightGreen4Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen5" Color="{StaticResource SemiLightGreen5Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen6" Color="{StaticResource SemiLightGreen6Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen7" Color="{StaticResource SemiLightGreen7Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen8" Color="{StaticResource SemiLightGreen8Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen9" Color="{StaticResource SemiLightGreen9Color}" />
+    <SolidColorBrush x:Key="SemiLime0" Color="{StaticResource SemiLime0Color}" />
+    <SolidColorBrush x:Key="SemiLime1" Color="{StaticResource SemiLime1Color}" />
+    <SolidColorBrush x:Key="SemiLime2" Color="{StaticResource SemiLime2Color}" />
+    <SolidColorBrush x:Key="SemiLime3" Color="{StaticResource SemiLime3Color}" />
+    <SolidColorBrush x:Key="SemiLime4" Color="{StaticResource SemiLime4Color}" />
+    <SolidColorBrush x:Key="SemiLime5" Color="{StaticResource SemiLime5Color}" />
+    <SolidColorBrush x:Key="SemiLime6" Color="{StaticResource SemiLime6Color}" />
+    <SolidColorBrush x:Key="SemiLime7" Color="{StaticResource SemiLime7Color}" />
+    <SolidColorBrush x:Key="SemiLime8" Color="{StaticResource SemiLime8Color}" />
+    <SolidColorBrush x:Key="SemiLime9" Color="{StaticResource SemiLime9Color}" />
+    <SolidColorBrush x:Key="SemiYellow0" Color="{StaticResource SemiYellow0Color}" />
+    <SolidColorBrush x:Key="SemiYellow1" Color="{StaticResource SemiYellow1Color}" />
+    <SolidColorBrush x:Key="SemiYellow2" Color="{StaticResource SemiYellow2Color}" />
+    <SolidColorBrush x:Key="SemiYellow3" Color="{StaticResource SemiYellow3Color}" />
+    <SolidColorBrush x:Key="SemiYellow4" Color="{StaticResource SemiYellow4Color}" />
+    <SolidColorBrush x:Key="SemiYellow5" Color="{StaticResource SemiYellow5Color}" />
+    <SolidColorBrush x:Key="SemiYellow6" Color="{StaticResource SemiYellow6Color}" />
+    <SolidColorBrush x:Key="SemiYellow7" Color="{StaticResource SemiYellow7Color}" />
+    <SolidColorBrush x:Key="SemiYellow8" Color="{StaticResource SemiYellow8Color}" />
+    <SolidColorBrush x:Key="SemiYellow9" Color="{StaticResource SemiYellow9Color}" />
+    <SolidColorBrush x:Key="SemiAmber0" Color="{StaticResource SemiAmber0Color}" />
+    <SolidColorBrush x:Key="SemiAmber1" Color="{StaticResource SemiAmber1Color}" />
+    <SolidColorBrush x:Key="SemiAmber2" Color="{StaticResource SemiAmber2Color}" />
+    <SolidColorBrush x:Key="SemiAmber3" Color="{StaticResource SemiAmber3Color}" />
+    <SolidColorBrush x:Key="SemiAmber4" Color="{StaticResource SemiAmber4Color}" />
+    <SolidColorBrush x:Key="SemiAmber5" Color="{StaticResource SemiAmber5Color}" />
+    <SolidColorBrush x:Key="SemiAmber6" Color="{StaticResource SemiAmber6Color}" />
+    <SolidColorBrush x:Key="SemiAmber7" Color="{StaticResource SemiAmber7Color}" />
+    <SolidColorBrush x:Key="SemiAmber8" Color="{StaticResource SemiAmber8Color}" />
+    <SolidColorBrush x:Key="SemiAmber9" Color="{StaticResource SemiAmber9Color}" />
+    <SolidColorBrush x:Key="SemiOrange0" Color="{StaticResource SemiOrange0Color}" />
+    <SolidColorBrush x:Key="SemiOrange1" Color="{StaticResource SemiOrange1Color}" />
+    <SolidColorBrush x:Key="SemiOrange2" Color="{StaticResource SemiOrange2Color}" />
+    <SolidColorBrush x:Key="SemiOrange3" Color="{StaticResource SemiOrange3Color}" />
+    <SolidColorBrush x:Key="SemiOrange4" Color="{StaticResource SemiOrange4Color}" />
+    <SolidColorBrush x:Key="SemiOrange5" Color="{StaticResource SemiOrange5Color}" />
+    <SolidColorBrush x:Key="SemiOrange6" Color="{StaticResource SemiOrange6Color}" />
+    <SolidColorBrush x:Key="SemiOrange7" Color="{StaticResource SemiOrange7Color}" />
+    <SolidColorBrush x:Key="SemiOrange8" Color="{StaticResource SemiOrange8Color}" />
+    <SolidColorBrush x:Key="SemiOrange9" Color="{StaticResource SemiOrange9Color}" />
+    <SolidColorBrush x:Key="SemiGrey0" Color="{StaticResource SemiGrey0Color}" />
+    <SolidColorBrush x:Key="SemiGrey1" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiGrey2" Color="{StaticResource SemiGrey2Color}" />
+    <SolidColorBrush x:Key="SemiGrey3" Color="{StaticResource SemiGrey3Color}" />
+    <SolidColorBrush x:Key="SemiGrey4" Color="{StaticResource SemiGrey4Color}" />
+    <SolidColorBrush x:Key="SemiGrey5" Color="{StaticResource SemiGrey5Color}" />
+    <SolidColorBrush x:Key="SemiGrey6" Color="{StaticResource SemiGrey6Color}" />
+    <SolidColorBrush x:Key="SemiGrey7" Color="{StaticResource SemiGrey7Color}" />
+    <SolidColorBrush x:Key="SemiGrey8" Color="{StaticResource SemiGrey8Color}" />
+    <SolidColorBrush x:Key="SemiGrey9" Color="{StaticResource SemiGrey9Color}" />

    <!--  Primary  -->
-    <SolidColorBrush x:Key="SemiColorPrimary" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="#FF7FC1FF" />
-    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="#FFA9D7FF" />
-    <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="#FF135CB8" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLight" Opacity="0.2" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLightPointerover" Opacity="0.3" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLightActive" Opacity="0.4" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="SemiColorPrimary" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="{StaticResource SemiBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLight" Opacity="0.2" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLightActive" Opacity="0.4" Color="{StaticResource SemiBlue5Color}" />
    <!--  Secondary  -->
-    <SolidColorBrush x:Key="SemiColorSecondary" Color="#FF40B4F3" />
-    <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="#FF6EC8F6" />
-    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="#FF9DDCF9" />
-    <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="#FF0366A9" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLight" Opacity="0.2" Color="#FF40B4F3" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Opacity="0.3" Color="#FF40B4F3" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Opacity="0.4" Color="#FF40B4F3" />
+    <SolidColorBrush x:Key="SemiColorSecondary" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="{StaticResource SemiLightBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLight" Opacity="0.2" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Opacity="0.4" Color="{StaticResource SemiLightBlue5Color}" />
    <!--  Tertiary  -->
-    <SolidColorBrush x:Key="SemiColorTertiary" Color="#FF888D92" />
-    <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="#FFA7ABB0" />
-    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="#FFC6CACD" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLight" Opacity="0.2" Color="#FF888D92" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Opacity="0.3" Color="#FF888D92" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLightActive" Opacity="0.4" Color="#FF888D92" />
+    <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="{StaticResource SemiGrey6Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLight" Opacity="0.2" Color="{StaticResource SemiGrey5Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Opacity="0.3" Color="{StaticResource SemiGrey5Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLightActive" Opacity="0.4" Color="{StaticResource SemiGrey5Color}" />
    <!--  Information  -->
-    <SolidColorBrush x:Key="SemiColorInformation" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="#FF7FC1FF" />
-    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="#FFA9D7FF" />
-    <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="#FF135CB8" />
-    <SolidColorBrush x:Key="SemiColorInformationLight" Opacity="0.2" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="SemiColorInformationLightPointerover" Opacity="0.3" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="SemiColorInformationLightActive" Opacity="0.4" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="SemiColorInformation" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="{StaticResource SemiBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLight" Opacity="0.2" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLightPointerover" Opacity="0.3" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLightActive" Opacity="0.4" Color="{StaticResource SemiBlue5Color}" />
    <!--  Success  -->
-    <SolidColorBrush x:Key="SemiColorSuccess" Color="#FF5DC264" />
-    <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="#FF7FD184" />
-    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="#FFA6E1A8" />
-    <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="#FF277731" />
-    <SolidColorBrush x:Key="SemiColorSuccessLight" Opacity="0.2" Color="#FF5DC264" />
-    <SolidColorBrush x:Key="SemiColorSuccessLightPointerover" Opacity="0.3" Color="#FF5DC264" />
-    <SolidColorBrush x:Key="SemiColorSuccessLightActive" Opacity="0.4" Color="#FF5DC264" />
+    <SolidColorBrush x:Key="SemiColorSuccess" Color="{StaticResource SemiGreen5Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="{StaticResource SemiGreen6Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="{StaticResource SemiGreen2Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLight" Opacity="0.2" Color="{StaticResource SemiGreen5Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLightPointerover" Opacity="0.3" Color="{StaticResource SemiGreen5Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLightActive" Opacity="0.4" Color="{StaticResource SemiGreen5Color}" />
    <!--  Warning  -->
-    <SolidColorBrush x:Key="SemiColorWarning" Color="#FFFFAE43" />
-    <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="#FFFFC772" />
-    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="#FFFFDDA1" />
-    <SolidColorBrush x:Key="SemiColorWarningLight" Opacity="0.2" Color="#FFFFAE43" />
-    <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Opacity="0.3" Color="#FFFFAE43" />
-    <SolidColorBrush x:Key="SemiColorWarningLightActive" Opacity="0.4" Color="#FFFFAE43" />
+    <SolidColorBrush x:Key="SemiColorWarning" Color="{StaticResource SemiOrange5Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="{StaticResource SemiOrange6Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLight" Opacity="0.2" Color="{StaticResource SemiOrange5Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Opacity="0.3" Color="{StaticResource SemiOrange5Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLightActive" Opacity="0.4" Color="{StaticResource SemiOrange5Color}" />
    <!--  Danger  -->
-    <SolidColorBrush x:Key="SemiColorDanger" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="#FFFD9983" />
-    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="#FFFDBEAC" />
-    <SolidColorBrush x:Key="SemiColorDangerLight" Opacity="0.2" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Opacity="0.3" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="SemiColorDangerLightActive" Opacity="0.4" Color="#FFFC725A" />
+    <SolidColorBrush x:Key="SemiColorDanger" Color="{StaticResource SemiRed5Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="{StaticResource SemiRed6Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLight" Opacity="0.2" Color="{StaticResource SemiRed5Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Opacity="0.3" Color="{StaticResource SemiRed5Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLightActive" Opacity="0.4" Color="{StaticResource SemiRed5Color}" />

    <!--  Text and Icons  -->
-    <SolidColorBrush x:Key="SemiColorText0" Color="#FFF9F9F9" />
-    <SolidColorBrush x:Key="SemiColorText1" Opacity="0.8" Color="#FFF9F9F9" />
-    <SolidColorBrush x:Key="SemiColorText2" Opacity="0.6" Color="#FFF9F9F9" />
-    <SolidColorBrush x:Key="SemiColorText3" Opacity="0.35" Color="#FFF9F9F9" />
+    <SolidColorBrush x:Key="SemiColorText0" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText1" Opacity="0.8" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText2" Opacity="0.6" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText3" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />

    <!--  Link  -->
-    <SolidColorBrush x:Key="SemiColorLink" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="SemiColorLinkPointerover" Color="#FF7FC1FF" />
-    <SolidColorBrush x:Key="SemiColorLinkActive" Color="#FFA9D7FF" />
-    <SolidColorBrush x:Key="SemiColorLinkVisited" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="SemiColorLink" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkActive" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkVisited" Color="{StaticResource SemiBlue5Color}" />

    <!--  Background  -->
    <SolidColorBrush x:Key="SemiColorBackground0" Color="#FF16161A" />
@@ -243,8 +405,9 @@
    <SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="White" />

    <!--  Disabled  -->
-    <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="#FFF9F9F9" />
-    <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.04" Color="#FFE6E8EA" />
+    <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.04" Color="{StaticResource SemiGrey8Color}" />
+
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
@@ -7,24 +7,25 @@
    <sys:Double x:Key="RadioButtonFontSize">14</sys:Double>
    <Thickness x:Key="RadioButtonIconMargin">0 2 8 0</Thickness>

+    <SolidColorBrush x:Key="RadioButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />

    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Opacity="0.12" Color="White" />

    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="#7FC1FF" />
    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#A9D7FF" />
    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#F9F9F9" />


    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="#7FC1FF" />
    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#A9D7FF" />
    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#135cb8" />
    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="#7FC1FF" />
    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#A9D7FF" />
    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#135cb8" />

@@ -46,21 +47,23 @@
    <sys:Double x:Key="RadioButtonButtonDefaultFontSize">12</sys:Double>
    <sys:Double x:Key="RadioButtonButtonLargeFontSize">14</sys:Double>

-    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="#43444A" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />

    <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>

    <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
    <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#053170" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Opacity="0.2" Color="#FF54A9FF" />
    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPointOverBorderBrush" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="#7FC1FF" />
    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#A9D7FF" />
    <SolidColorBrush x:Key="RadioButtonCardCheckDisabledBorderBrush" Color="#135cb8" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPointOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="RadioButtonCardUncheckDisabledBackground" Opacity="0.12" Color="White" />

--- a/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ScrollViewer.axaml
@@ -6,7 +6,7 @@
    <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
    <SolidColorBrush x:Key="ScrollBarButtonDefaultBackground" Color="Transparent" />
    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.62" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ScrollBarButtonPointerOverForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Color="#F9F9F9" />
    <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#F9F9F9" />
    <SolidColorBrush x:Key="ScrollBarBackground" Opacity="0.12" Color="White" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TextBox.axaml
@@ -9,14 +9,14 @@
    <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.2" Color="White" />
    <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="TextBoxPointerOverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="Transparent" />
    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#54A9FF" />
    <SolidColorBrush x:Key="TextBoxForeground" Color="#F9F9F9" />
    <SolidColorBrush x:Key="TextBoxWatermarkForeground" Color="#F9F9F9" />
    <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.6" Color="#F9F9F9" />

    <SolidColorBrush x:Key="TextBoxButtonDefaultForeground" Opacity="0.2" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverForeground" Opacity="0.4" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TextBoxButtonPointeroverForeground" Opacity="0.4" Color="#E6E8EA" />

    <SolidColorBrush x:Key="TextBoxDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
--- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml
@@ -15,7 +15,9 @@
    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.20" Color="White" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Opacity="0.35" Color="#F9F9F9" />

    <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />

@@ -23,26 +25,25 @@
    <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#40B4F3" />
    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Color="#888D92" />
    <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultErrorForeground" Color="#FC725A" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Color="#2E3238" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDangerForeground" Color="#FC725A" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#54A9FF" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#40B4F3" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#888D92" />
    <SolidColorBrush x:Key="ToggleButtonWarningCheckedBackground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedBackground" Color="#FC725A" />
+    <SolidColorBrush x:Key="ToggleButtonDangerCheckedBackground" Color="#FC725A" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="#7FC1FF" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" Color="#6EC8F6" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" Color="#A7ABB0" />
    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#FFC772" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPointeroverBackground" Color="#FD9983" />
+    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPointeroverBackground" Color="#FD9983" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#A9D7FF" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#9DDCF9" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#C6CACD" />
    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="#FFDDA1" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPressedBackground" Color="#FDBEAC" />
+    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPressedBackground" Color="#FDBEAC" />

    <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="Black" />

@@ -50,23 +51,37 @@
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBackground" Color="#003761" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBackground" Color="#1C1F23" />
    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBackground" Color="#551F03" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBackground" Color="#6C090B" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminateBackground" Color="#6C090B" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="#54A9FF" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" Color="#40B4F3" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" Color="#888D92" />
    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBorderBrush" Color="#FC725A" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminateBorderBrush" Color="#FC725A" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="#7FC1FF" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" Color="#6EC8F6" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" Color="#A7ABB0" />
    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" Color="#FFC772" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePointeroverBorderBrush" Color="#FD9983" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverBorderBrush" Color="#FD9983" />

+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverForeground" Color="#6EC8F6" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverForeground" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverForeground" Color="#FFC772" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverForeground" Color="#FD9983" />
+    
    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="#A9D7FF" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" Color="#9DDCF9" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" Color="#C6CACD" />
    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" Color="#FFDDA1" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePressedBorderBrush" Color="#FDBEAC" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedBorderBrush" Color="#FDBEAC" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedForeground" Color="#9DDCF9" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedForeground" Color="#C6CACD" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedForeground" Color="#FFDDA1" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedForeground" Color="#FDBEAC" />
+
+    <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Opacity="0.35" Color="#F9F9F9" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -3,14 +3,14 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointerOverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Opacity="0.20" Color="White" />
    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />

    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.09" Color="#F9F9F9" />

    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5FB346" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointerOverBackground" Color="#7FD184" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="#7FD184" />
    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="#A6E1A8" />
    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#277731" />

--- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
@@ -14,12 +14,12 @@
    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />

    <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemPointerOverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.12" Color="White" />
    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.16" Color="White" />
    <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
    <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />

    <Thickness x:Key="TreeViewItemIconMargin">8 0</Thickness>
-    <Thickness x:Key="TreeViewItemPadding">0 4 0 4</Thickness>
+    <Thickness x:Key="TreeViewItemPadding">0 4 8 4</Thickness>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
@@ -10,15 +10,15 @@

    <SolidColorBrush x:Key="CheckBoxDefaultBackground" Color="Transparent" />
    <SolidColorBrush x:Key="CheckBoxDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="CheckBoxPointOverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="CheckBoxPointOverBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="CheckBoxPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CheckBoxPointeroverBorderBrush" Color="#0077FA" />
    <SolidColorBrush x:Key="CheckBoxPressedBackground" Color="#004FB3" />
    <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="#004FB3" />

    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBackground" Color="#0077FA" />
    <SolidColorBrush x:Key="CheckBoxCheckedDefaultBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointOverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="CheckBoxCheckedPointOverBorderBrush" Color="#0062D6" />
+    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="CheckBoxCheckedPointeroverBorderBrush" Color="#0062D6" />
    <SolidColorBrush x:Key="CheckBoxCheckedPressedBackground" Color="#004FB3" />
    <SolidColorBrush x:Key="CheckBoxCheckedPressedBorderBrush" Color="#004FB3" />

--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -1,16 +1,16 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <SolidColorBrush x:Key="ComboBoxSelectorBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointerOverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBackground" 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="ComboBoxSelectorBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPointerOverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#004FB3" />

    <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>

    <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ComboBoxIconPointerOverForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#1C1F23" />
    <SolidColorBrush x:Key="ComboBoxIconPressedForeground" Color="#1C1F23" />
    <SolidColorBrush x:Key="ComboBoxIconDisabledForeground" Opacity="0.35" Color="#1C1F23" />

@@ -27,10 +27,10 @@
    <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#1C1F23" />

    <SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxItemPointerOverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
    <SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="ComboBoxItemSelectedPointerOverBackground" Color="#CBE7FE" />
+    <SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />

    <SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="Transparent" />
    <SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -20,7 +20,7 @@
    <PathGeometry x:Key="DateTimePickerDismissGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</PathGeometry>

    <SolidColorBrush x:Key="DateTimePickerSeparatorBackground" Opacity="0.08" Color="#1C1F23" />
-    <sys:Double x:Key="DateTimePickerListBoxItemHeight">28</sys:Double>
+    <sys:Double x:Key="DateTimePickerListBoxItemHeight">30</sys:Double>


    <SolidColorBrush x:Key="DateTimePickerButtonBorderBrush" Color="Transparent" />
--- a/src/Semi.Avalonia/Themes/Light/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DropDownButton.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Add Resources Here  -->
-    <PathGeometry x:Key="DropdownButtonIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
+    <PathGeometry x:Key="DropDownButtonIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</PathGeometry>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/Light.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Light.axaml
@@ -14,7 +14,7 @@
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ComboBox.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/DatePicker.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/DropdownButton.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/DropDownButton.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Expander.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/GridSplitter.axaml" />
        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Label.axaml" />
--- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
@@ -8,7 +8,7 @@
    <SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />

    <SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
    <SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Color="#EAF5FF" />
    <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />
--- a/src/Semi.Avalonia/Themes/Light/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Themes/Light/NumericUpDown.axaml
@@ -1,4 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Add Resources Here  -->
    <CornerRadius x:Key="NumericUpDownCornerRadius">3</CornerRadius>
+    <x:Double x:Key="NumericUpDownWrapperDefaultHeight">32</x:Double>
+    <x:Double x:Key="NumericUpDownWrapperSmallHeight">24</x:Double>
+    <x:Double x:Key="NumericUpDownWrapperLargeHeight">40</x:Double>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml
@@ -1,231 +1,392 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="SemiAmber0" Color="#FEFBEB" />
-    <SolidColorBrush x:Key="SemiAmber1" Color="#FCF5CE" />
-    <SolidColorBrush x:Key="SemiAmber2" Color="#F9E89E" />
-    <SolidColorBrush x:Key="SemiAmber3" Color="#F6D86F" />
-    <SolidColorBrush x:Key="SemiAmber4" Color="#F3C641" />
-    <SolidColorBrush x:Key="SemiAmber5" Color="#F0B114" />
-    <SolidColorBrush x:Key="SemiAmber6" Color="#C88A0F" />
-    <SolidColorBrush x:Key="SemiAmber7" Color="#A0660A" />
-    <SolidColorBrush x:Key="SemiAmber8" Color="#784606" />
-    <SolidColorBrush x:Key="SemiAmber9" Color="#502B03" />
-    <SolidColorBrush x:Key="SemiBlue0" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="SemiBlue1" Color="#CBE7FE" />
-    <SolidColorBrush x:Key="SemiBlue2" Color="#98CDFD" />
-    <SolidColorBrush x:Key="SemiBlue3" Color="#65B2FC" />
-    <SolidColorBrush x:Key="SemiBlue4" Color="#3295FB" />
-    <SolidColorBrush x:Key="SemiBlue5" Color="#0077FA" />
-    <SolidColorBrush x:Key="SemiBlue6" Color="#0062D6" />
-    <SolidColorBrush x:Key="SemiBlue7" Color="#004FB3" />
-    <SolidColorBrush x:Key="SemiBlue8" Color="#003D8F" />
-    <SolidColorBrush x:Key="SemiBlue9" Color="#002C6B" />
-    <SolidColorBrush x:Key="SemiCyan0" Color="#E5F7F8" />
-    <SolidColorBrush x:Key="SemiCyan1" Color="#C2EFF0" />
-    <SolidColorBrush x:Key="SemiCyan2" Color="#8ADDE2" />
-    <SolidColorBrush x:Key="SemiCyan3" Color="#58CBD3" />
-    <SolidColorBrush x:Key="SemiCyan4" Color="#2CB8C5" />
-    <SolidColorBrush x:Key="SemiCyan5" Color="#05A4B6" />
-    <SolidColorBrush x:Key="SemiCyan6" Color="#038698" />
-    <SolidColorBrush x:Key="SemiCyan7" Color="#016979" />
-    <SolidColorBrush x:Key="SemiCyan8" Color="#004D5B" />
-    <SolidColorBrush x:Key="SemiCyan9" Color="#00323D" />
-    <SolidColorBrush x:Key="SemiGreen0" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="SemiGreen1" Color="#D0F0D1" />
-    <SolidColorBrush x:Key="SemiGreen2" Color="#A4E0A7" />
-    <SolidColorBrush x:Key="SemiGreen3" Color="#7DD182" />
-    <SolidColorBrush x:Key="SemiGreen4" Color="#5AC262" />
-    <SolidColorBrush x:Key="SemiGreen5" Color="#3BB346" />
-    <SolidColorBrush x:Key="SemiGreen6" Color="#30953B" />
-    <SolidColorBrush x:Key="SemiGreen7" Color="#25772F" />
-    <SolidColorBrush x:Key="SemiGreen8" Color="#1B5924" />
-    <SolidColorBrush x:Key="SemiGreen9" Color="#113C18" />
-    <SolidColorBrush x:Key="SemiGrey0" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="SemiGrey1" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="SemiGrey2" Color="#C6CACD" />
-    <SolidColorBrush x:Key="SemiGrey3" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="SemiGrey4" Color="#888D92" />
-    <SolidColorBrush x:Key="SemiGrey5" Color="#6B7075" />
-    <SolidColorBrush x:Key="SemiGrey6" Color="#555B61" />
-    <SolidColorBrush x:Key="SemiGrey7" Color="#41464C" />
-    <SolidColorBrush x:Key="SemiGrey8" Color="#2E3238" />
-    <SolidColorBrush x:Key="SemiGrey9" Color="#1C1F23" />
-    <SolidColorBrush x:Key="SemiIndigo0" Color="#ECEFF8" />
-    <SolidColorBrush x:Key="SemiIndigo1" Color="#D1D8F0" />
-    <SolidColorBrush x:Key="SemiIndigo2" Color="#A7B3E1" />
-    <SolidColorBrush x:Key="SemiIndigo3" Color="#8090D3" />
-    <SolidColorBrush x:Key="SemiIndigo4" Color="#5E6FC4" />
-    <SolidColorBrush x:Key="SemiIndigo5" Color="#3F51B5" />
-    <SolidColorBrush x:Key="SemiIndigo6" Color="#3342A1" />
-    <SolidColorBrush x:Key="SemiIndigo7" Color="#28348C" />
-    <SolidColorBrush x:Key="SemiIndigo8" Color="#1F2878" />
-    <SolidColorBrush x:Key="SemiIndigo9" Color="#171D63" />
-    <SolidColorBrush x:Key="SemiLightBlue0" Color="#E9F7FD" />
-    <SolidColorBrush x:Key="SemiLightBlue1" Color="#C9ECFC" />
-    <SolidColorBrush x:Key="SemiLightBlue2" Color="#95D8F8" />
-    <SolidColorBrush x:Key="SemiLightBlue3" Color="#62C3F5" />
-    <SolidColorBrush x:Key="SemiLightBlue4" Color="#30ACF1" />
-    <SolidColorBrush x:Key="SemiLightBlue5" Color="#0095EE" />
-    <SolidColorBrush x:Key="SemiLightBlue6" Color="#007BCA" />
-    <SolidColorBrush x:Key="SemiLightBlue7" Color="#0063A7" />
-    <SolidColorBrush x:Key="SemiLightBlue8" Color="#004B83" />
-    <SolidColorBrush x:Key="SemiLightBlue9" Color="#00355F" />
-    <SolidColorBrush x:Key="SemiLightGreen0" Color="#F3F8EC" />
-    <SolidColorBrush x:Key="SemiLightGreen1" Color="#E3F0D0" />
-    <SolidColorBrush x:Key="SemiLightGreen2" Color="#C8E2A5" />
-    <SolidColorBrush x:Key="SemiLightGreen3" Color="#ADD37E" />
-    <SolidColorBrush x:Key="SemiLightGreen4" Color="#93C55B" />
-    <SolidColorBrush x:Key="SemiLightGreen5" Color="#7BB63C" />
-    <SolidColorBrush x:Key="SemiLightGreen6" Color="#649830" />
-    <SolidColorBrush x:Key="SemiLightGreen7" Color="#4E7926" />
-    <SolidColorBrush x:Key="SemiLightGreen8" Color="#395B1B" />
-    <SolidColorBrush x:Key="SemiLightGreen9" Color="#253D12" />
-    <SolidColorBrush x:Key="SemiLime0" Color="#F2FAE6" />
-    <SolidColorBrush x:Key="SemiLime1" Color="#E3F6C5" />
-    <SolidColorBrush x:Key="SemiLime2" Color="#CBED8E" />
-    <SolidColorBrush x:Key="SemiLime3" Color="#B7E35B" />
-    <SolidColorBrush x:Key="SemiLime4" Color="#A7DA2C" />
-    <SolidColorBrush x:Key="SemiLime5" Color="#9BD100" />
-    <SolidColorBrush x:Key="SemiLime6" Color="#7EAE00" />
-    <SolidColorBrush x:Key="SemiLime7" Color="#638B00" />
-    <SolidColorBrush x:Key="SemiLime8" Color="#486800" />
-    <SolidColorBrush x:Key="SemiLime9" Color="#2F4600" />
-    <SolidColorBrush x:Key="SemiOrange0" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="SemiOrange1" Color="#FEEECC" />
-    <SolidColorBrush x:Key="SemiOrange2" Color="#FED998" />
-    <SolidColorBrush x:Key="SemiOrange3" Color="#FDC165" />
-    <SolidColorBrush x:Key="SemiOrange4" Color="#FDA633" />
-    <SolidColorBrush x:Key="SemiOrange5" Color="#FC8800" />
-    <SolidColorBrush x:Key="SemiOrange6" Color="#D26700" />
-    <SolidColorBrush x:Key="SemiOrange7" Color="#A84A00" />
-    <SolidColorBrush x:Key="SemiOrange8" Color="#7E3100" />
-    <SolidColorBrush x:Key="SemiOrange9" Color="#541D00" />
-    <SolidColorBrush x:Key="SemiPink0" Color="#FDECEF" />
-    <SolidColorBrush x:Key="SemiPink1" Color="#FBCFD8" />
-    <SolidColorBrush x:Key="SemiPink2" Color="#F6A0B5" />
-    <SolidColorBrush x:Key="SemiPink3" Color="#F27396" />
-    <SolidColorBrush x:Key="SemiPink4" Color="#ED487B" />
-    <SolidColorBrush x:Key="SemiPink5" Color="#E91E63" />
-    <SolidColorBrush x:Key="SemiPink6" Color="#C51356" />
-    <SolidColorBrush x:Key="SemiPink7" Color="#A20B48" />
-    <SolidColorBrush x:Key="SemiPink8" Color="#7E053A" />
-    <SolidColorBrush x:Key="SemiPink9" Color="#5A012B" />
-    <SolidColorBrush x:Key="SemiPurple0" Color="#F7E9F7" />
-    <SolidColorBrush x:Key="SemiPurple1" Color="#EFCAF0" />
-    <SolidColorBrush x:Key="SemiPurple2" Color="#DD9BE0" />
-    <SolidColorBrush x:Key="SemiPurple3" Color="#C96FD1" />
-    <SolidColorBrush x:Key="SemiPurple4" Color="#B449C2" />
-    <SolidColorBrush x:Key="SemiPurple5" Color="#9E28B3" />
-    <SolidColorBrush x:Key="SemiPurple6" Color="#871E9E" />
-    <SolidColorBrush x:Key="SemiPurple7" Color="#71168A" />
-    <SolidColorBrush x:Key="SemiPurple8" Color="#5C0F75" />
-    <SolidColorBrush x:Key="SemiPurple9" Color="#490A61" />
-    <SolidColorBrush x:Key="SemiRed0" Color="#FEF2ED" />
-    <SolidColorBrush x:Key="SemiRed1" Color="#FEDDD2" />
-    <SolidColorBrush x:Key="SemiRed2" Color="#FDB7A5" />
-    <SolidColorBrush x:Key="SemiRed3" Color="#FB9078" />
-    <SolidColorBrush x:Key="SemiRed4" Color="#FA664C" />
-    <SolidColorBrush x:Key="SemiRed5" Color="#F93920" />
-    <SolidColorBrush x:Key="SemiRed6" Color="#D52515" />
-    <SolidColorBrush x:Key="SemiRed7" Color="#B2140C" />
-    <SolidColorBrush x:Key="SemiRed8" Color="#8E0805" />
-    <SolidColorBrush x:Key="SemiRed9" Color="#6A0103" />
-    <SolidColorBrush x:Key="SemiTeal0" Color="#E4F7F4" />
-    <SolidColorBrush x:Key="SemiTeal1" Color="#C0F0E8" />
-    <SolidColorBrush x:Key="SemiTeal2" Color="#87E0D3" />
-    <SolidColorBrush x:Key="SemiTeal3" Color="#54D1C1" />
-    <SolidColorBrush x:Key="SemiTeal4" Color="#27C2B0" />
-    <SolidColorBrush x:Key="SemiTeal5" Color="#00B3A1" />
-    <SolidColorBrush x:Key="SemiTeal6" Color="#009589" />
-    <SolidColorBrush x:Key="SemiTeal7" Color="#00776F" />
-    <SolidColorBrush x:Key="SemiTeal8" Color="#005955" />
-    <SolidColorBrush x:Key="SemiTeal9" Color="#003C3A" />
-    <SolidColorBrush x:Key="SemiViolet0" Color="#F3EDF9" />
-    <SolidColorBrush x:Key="SemiViolet1" Color="#E2D1F4" />
-    <SolidColorBrush x:Key="SemiViolet2" Color="#C4A7E9" />
-    <SolidColorBrush x:Key="SemiViolet3" Color="#A67FDD" />
-    <SolidColorBrush x:Key="SemiViolet4" Color="#885BD2" />
-    <SolidColorBrush x:Key="SemiViolet5" Color="#6A3AC7" />
-    <SolidColorBrush x:Key="SemiViolet6" Color="#572FB3" />
-    <SolidColorBrush x:Key="SemiViolet7" Color="#46259E" />
-    <SolidColorBrush x:Key="SemiViolet8" Color="#361C8A" />
-    <SolidColorBrush x:Key="SemiViolet9" Color="#281475" />
-    <SolidColorBrush x:Key="SemiYellow0" Color="#FFFDEA" />
-    <SolidColorBrush x:Key="SemiYellow1" Color="#FEFBCB" />
-    <SolidColorBrush x:Key="SemiYellow2" Color="#FDF398" />
-    <SolidColorBrush x:Key="SemiYellow3" Color="#FCE865" />
-    <SolidColorBrush x:Key="SemiYellow4" Color="#FBDA32" />
-    <SolidColorBrush x:Key="SemiYellow5" Color="#FAC800" />
-    <SolidColorBrush x:Key="SemiYellow6" Color="#D0AA00" />
-    <SolidColorBrush x:Key="SemiYellow7" Color="#A78B00" />
-    <SolidColorBrush x:Key="SemiYellow8" Color="#7D6A00" />
-    <SolidColorBrush x:Key="SemiYellow9" Color="#534800" />
+    <Color x:Key="SemiRed0Color">#FEF2ED</Color>
+    <Color x:Key="SemiRed1Color">#FEDDD2</Color>
+    <Color x:Key="SemiRed2Color">#FDB7A5</Color>
+    <Color x:Key="SemiRed3Color">#FB9078</Color>
+    <Color x:Key="SemiRed4Color">#FA664C</Color>
+    <Color x:Key="SemiRed5Color">#F93920</Color>
+    <Color x:Key="SemiRed6Color">#D52515</Color>
+    <Color x:Key="SemiRed7Color">#B2140C</Color>
+    <Color x:Key="SemiRed8Color">#8E0805</Color>
+    <Color x:Key="SemiRed9Color">#6A0103</Color>
+    <Color x:Key="SemiPink0Color">#FDECEF</Color>
+    <Color x:Key="SemiPink1Color">#FBCFD8</Color>
+    <Color x:Key="SemiPink2Color">#F6A0B5</Color>
+    <Color x:Key="SemiPink3Color">#F27396</Color>
+    <Color x:Key="SemiPink4Color">#ED487B</Color>
+    <Color x:Key="SemiPink5Color">#E91E63</Color>
+    <Color x:Key="SemiPink6Color">#C51356</Color>
+    <Color x:Key="SemiPink7Color">#A20B48</Color>
+    <Color x:Key="SemiPink8Color">#7E053A</Color>
+    <Color x:Key="SemiPink9Color">#5A012B</Color>
+    <Color x:Key="SemiPurple0Color">#F7E9F7</Color>
+    <Color x:Key="SemiPurple1Color">#EFCAF0</Color>
+    <Color x:Key="SemiPurple2Color">#DD9BE0</Color>
+    <Color x:Key="SemiPurple3Color">#C96FD1</Color>
+    <Color x:Key="SemiPurple4Color">#B449C2</Color>
+    <Color x:Key="SemiPurple5Color">#9E28B3</Color>
+    <Color x:Key="SemiPurple6Color">#871E9E</Color>
+    <Color x:Key="SemiPurple7Color">#71168A</Color>
+    <Color x:Key="SemiPurple8Color">#5C0F75</Color>
+    <Color x:Key="SemiPurple9Color">#490A61</Color>
+    <Color x:Key="SemiViolet0Color">#F3EDF9</Color>
+    <Color x:Key="SemiViolet1Color">#E2D1F4</Color>
+    <Color x:Key="SemiViolet2Color">#C4A7E9</Color>
+    <Color x:Key="SemiViolet3Color">#A67FDD</Color>
+    <Color x:Key="SemiViolet4Color">#885BD2</Color>
+    <Color x:Key="SemiViolet5Color">#6A3AC7</Color>
+    <Color x:Key="SemiViolet6Color">#572FB3</Color>
+    <Color x:Key="SemiViolet7Color">#46259E</Color>
+    <Color x:Key="SemiViolet8Color">#361C8A</Color>
+    <Color x:Key="SemiViolet9Color">#281475</Color>
+    <Color x:Key="SemiIndigo0Color">#ECEFF8</Color>
+    <Color x:Key="SemiIndigo1Color">#D1D8F0</Color>
+    <Color x:Key="SemiIndigo2Color">#A7B3E1</Color>
+    <Color x:Key="SemiIndigo3Color">#8090D3</Color>
+    <Color x:Key="SemiIndigo4Color">#5E6FC4</Color>
+    <Color x:Key="SemiIndigo5Color">#3F51B5</Color>
+    <Color x:Key="SemiIndigo6Color">#3342A1</Color>
+    <Color x:Key="SemiIndigo7Color">#28348C</Color>
+    <Color x:Key="SemiIndigo8Color">#1F2878</Color>
+    <Color x:Key="SemiIndigo9Color">#171D63</Color>
+    <Color x:Key="SemiBlue0Color">#EAF5FF</Color>
+    <Color x:Key="SemiBlue1Color">#CBE7FE</Color>
+    <Color x:Key="SemiBlue2Color">#98CDFD</Color>
+    <Color x:Key="SemiBlue3Color">#65B2FC</Color>
+    <Color x:Key="SemiBlue4Color">#3295FB</Color>
+    <Color x:Key="SemiBlue5Color">#0077FA</Color>
+    <Color x:Key="SemiBlue6Color">#0062D6</Color>
+    <Color x:Key="SemiBlue7Color">#004FB3</Color>
+    <Color x:Key="SemiBlue8Color">#003D8F</Color>
+    <Color x:Key="SemiBlue9Color">#002C6B</Color>
+    <Color x:Key="SemiLightBlue0Color">#E9F7FD</Color>
+    <Color x:Key="SemiLightBlue1Color">#C9ECFC</Color>
+    <Color x:Key="SemiLightBlue2Color">#95D8F8</Color>
+    <Color x:Key="SemiLightBlue3Color">#62C3F5</Color>
+    <Color x:Key="SemiLightBlue4Color">#30ACF1</Color>
+    <Color x:Key="SemiLightBlue5Color">#0095EE</Color>
+    <Color x:Key="SemiLightBlue6Color">#007BCA</Color>
+    <Color x:Key="SemiLightBlue7Color">#0063A7</Color>
+    <Color x:Key="SemiLightBlue8Color">#004B83</Color>
+    <Color x:Key="SemiLightBlue9Color">#00355F</Color>
+    <Color x:Key="SemiCyan0Color">#E5F7F8</Color>
+    <Color x:Key="SemiCyan1Color">#C2EFF0</Color>
+    <Color x:Key="SemiCyan2Color">#8ADDE2</Color>
+    <Color x:Key="SemiCyan3Color">#58CBD3</Color>
+    <Color x:Key="SemiCyan4Color">#2CB8C5</Color>
+    <Color x:Key="SemiCyan5Color">#05A4B6</Color>
+    <Color x:Key="SemiCyan6Color">#038698</Color>
+    <Color x:Key="SemiCyan7Color">#016979</Color>
+    <Color x:Key="SemiCyan8Color">#004D5B</Color>
+    <Color x:Key="SemiCyan9Color">#00323D</Color>
+    <Color x:Key="SemiTeal0Color">#E4F7F4</Color>
+    <Color x:Key="SemiTeal1Color">#C0F0E8</Color>
+    <Color x:Key="SemiTeal2Color">#87E0D3</Color>
+    <Color x:Key="SemiTeal3Color">#54D1C1</Color>
+    <Color x:Key="SemiTeal4Color">#27C2B0</Color>
+    <Color x:Key="SemiTeal5Color">#00B3A1</Color>
+    <Color x:Key="SemiTeal6Color">#009589</Color>
+    <Color x:Key="SemiTeal7Color">#00776F</Color>
+    <Color x:Key="SemiTeal8Color">#005955</Color>
+    <Color x:Key="SemiTeal9Color">#003C3A</Color>
+    <Color x:Key="SemiGreen0Color">#ECF7EC</Color>
+    <Color x:Key="SemiGreen1Color">#D0F0D1</Color>
+    <Color x:Key="SemiGreen2Color">#A4E0A7</Color>
+    <Color x:Key="SemiGreen3Color">#7DD182</Color>
+    <Color x:Key="SemiGreen4Color">#5AC262</Color>
+    <Color x:Key="SemiGreen5Color">#3BB346</Color>
+    <Color x:Key="SemiGreen6Color">#30953B</Color>
+    <Color x:Key="SemiGreen7Color">#25772F</Color>
+    <Color x:Key="SemiGreen8Color">#1B5924</Color>
+    <Color x:Key="SemiGreen9Color">#113C18</Color>
+    <Color x:Key="SemiLightGreen0Color">#F3F8EC</Color>
+    <Color x:Key="SemiLightGreen1Color">#E3F0D0</Color>
+    <Color x:Key="SemiLightGreen2Color">#C8E2A5</Color>
+    <Color x:Key="SemiLightGreen3Color">#ADD37E</Color>
+    <Color x:Key="SemiLightGreen4Color">#93C55B</Color>
+    <Color x:Key="SemiLightGreen5Color">#7BB63C</Color>
+    <Color x:Key="SemiLightGreen6Color">#649830</Color>
+    <Color x:Key="SemiLightGreen7Color">#4E7926</Color>
+    <Color x:Key="SemiLightGreen8Color">#395B1B</Color>
+    <Color x:Key="SemiLightGreen9Color">#253D12</Color>
+    <Color x:Key="SemiLime0Color">#F2FAE6</Color>
+    <Color x:Key="SemiLime1Color">#E3F6C5</Color>
+    <Color x:Key="SemiLime2Color">#CBED8E</Color>
+    <Color x:Key="SemiLime3Color">#B7E35B</Color>
+    <Color x:Key="SemiLime4Color">#A7DA2C</Color>
+    <Color x:Key="SemiLime5Color">#9BD100</Color>
+    <Color x:Key="SemiLime6Color">#7EAE00</Color>
+    <Color x:Key="SemiLime7Color">#638B00</Color>
+    <Color x:Key="SemiLime8Color">#486800</Color>
+    <Color x:Key="SemiLime9Color">#2F4600</Color>
+    <Color x:Key="SemiYellow0Color">#FFFDEA</Color>
+    <Color x:Key="SemiYellow1Color">#FEFBCB</Color>
+    <Color x:Key="SemiYellow2Color">#FDF398</Color>
+    <Color x:Key="SemiYellow3Color">#FCE865</Color>
+    <Color x:Key="SemiYellow4Color">#FBDA32</Color>
+    <Color x:Key="SemiYellow5Color">#FAC800</Color>
+    <Color x:Key="SemiYellow6Color">#D0AA00</Color>
+    <Color x:Key="SemiYellow7Color">#A78B00</Color>
+    <Color x:Key="SemiYellow8Color">#7D6A00</Color>
+    <Color x:Key="SemiYellow9Color">#534800</Color>
+    <Color x:Key="SemiAmber0Color">#FEFBEB</Color>
+    <Color x:Key="SemiAmber1Color">#FCF5CE</Color>
+    <Color x:Key="SemiAmber2Color">#F9E89E</Color>
+    <Color x:Key="SemiAmber3Color">#F6D86F</Color>
+    <Color x:Key="SemiAmber4Color">#F3C641</Color>
+    <Color x:Key="SemiAmber5Color">#F0B114</Color>
+    <Color x:Key="SemiAmber6Color">#C88A0F</Color>
+    <Color x:Key="SemiAmber7Color">#A0660A</Color>
+    <Color x:Key="SemiAmber8Color">#784606</Color>
+    <Color x:Key="SemiAmber9Color">#502B03</Color>
+    <Color x:Key="SemiOrange0Color">#FFF8EA</Color>
+    <Color x:Key="SemiOrange1Color">#FEEECC</Color>
+    <Color x:Key="SemiOrange2Color">#FED998</Color>
+    <Color x:Key="SemiOrange3Color">#FDC165</Color>
+    <Color x:Key="SemiOrange4Color">#FDA633</Color>
+    <Color x:Key="SemiOrange5Color">#FC8800</Color>
+    <Color x:Key="SemiOrange6Color">#D26700</Color>
+    <Color x:Key="SemiOrange7Color">#A84A00</Color>
+    <Color x:Key="SemiOrange8Color">#7E3100</Color>
+    <Color x:Key="SemiOrange9Color">#541D00</Color>
+    <Color x:Key="SemiGrey0Color">#F9F9F9</Color>
+    <Color x:Key="SemiGrey1Color">#E6E8EA</Color>
+    <Color x:Key="SemiGrey2Color">#C6CACD</Color>
+    <Color x:Key="SemiGrey3Color">#A7ABB0</Color>
+    <Color x:Key="SemiGrey4Color">#888D92</Color>
+    <Color x:Key="SemiGrey5Color">#6B7075</Color>
+    <Color x:Key="SemiGrey6Color">#555B61</Color>
+    <Color x:Key="SemiGrey7Color">#41464C</Color>
+    <Color x:Key="SemiGrey8Color">#2E3238</Color>
+    <Color x:Key="SemiGrey9Color">#1C1F23</Color>
+
+    <SolidColorBrush x:Key="SemiRed0" Color="{StaticResource SemiRed0Color}" />
+    <SolidColorBrush x:Key="SemiRed1" Color="{StaticResource SemiRed1Color}" />
+    <SolidColorBrush x:Key="SemiRed2" Color="{StaticResource SemiRed2Color}" />
+    <SolidColorBrush x:Key="SemiRed3" Color="{StaticResource SemiRed3Color}" />
+    <SolidColorBrush x:Key="SemiRed4" Color="{StaticResource SemiRed4Color}" />
+    <SolidColorBrush x:Key="SemiRed5" Color="{StaticResource SemiRed5Color}" />
+    <SolidColorBrush x:Key="SemiRed6" Color="{StaticResource SemiRed6Color}" />
+    <SolidColorBrush x:Key="SemiRed7" Color="{StaticResource SemiRed7Color}" />
+    <SolidColorBrush x:Key="SemiRed8" Color="{StaticResource SemiRed8Color}" />
+    <SolidColorBrush x:Key="SemiRed9" Color="{StaticResource SemiRed9Color}" />
+    <SolidColorBrush x:Key="SemiPink0" Color="{StaticResource SemiPink0Color}" />
+    <SolidColorBrush x:Key="SemiPink1" Color="{StaticResource SemiPink1Color}" />
+    <SolidColorBrush x:Key="SemiPink2" Color="{StaticResource SemiPink2Color}" />
+    <SolidColorBrush x:Key="SemiPink3" Color="{StaticResource SemiPink3Color}" />
+    <SolidColorBrush x:Key="SemiPink4" Color="{StaticResource SemiPink4Color}" />
+    <SolidColorBrush x:Key="SemiPink5" Color="{StaticResource SemiPink5Color}" />
+    <SolidColorBrush x:Key="SemiPink6" Color="{StaticResource SemiPink6Color}" />
+    <SolidColorBrush x:Key="SemiPink7" Color="{StaticResource SemiPink7Color}" />
+    <SolidColorBrush x:Key="SemiPink8" Color="{StaticResource SemiPink8Color}" />
+    <SolidColorBrush x:Key="SemiPink9" Color="{StaticResource SemiPink9Color}" />
+    <SolidColorBrush x:Key="SemiPurple0" Color="{StaticResource SemiPurple0Color}" />
+    <SolidColorBrush x:Key="SemiPurple1" Color="{StaticResource SemiPurple1Color}" />
+    <SolidColorBrush x:Key="SemiPurple2" Color="{StaticResource SemiPurple2Color}" />
+    <SolidColorBrush x:Key="SemiPurple3" Color="{StaticResource SemiPurple3Color}" />
+    <SolidColorBrush x:Key="SemiPurple4" Color="{StaticResource SemiPurple4Color}" />
+    <SolidColorBrush x:Key="SemiPurple5" Color="{StaticResource SemiPurple5Color}" />
+    <SolidColorBrush x:Key="SemiPurple6" Color="{StaticResource SemiPurple6Color}" />
+    <SolidColorBrush x:Key="SemiPurple7" Color="{StaticResource SemiPurple7Color}" />
+    <SolidColorBrush x:Key="SemiPurple8" Color="{StaticResource SemiPurple8Color}" />
+    <SolidColorBrush x:Key="SemiPurple9" Color="{StaticResource SemiPurple9Color}" />
+    <SolidColorBrush x:Key="SemiViolet0" Color="{StaticResource SemiViolet0Color}" />
+    <SolidColorBrush x:Key="SemiViolet1" Color="{StaticResource SemiViolet1Color}" />
+    <SolidColorBrush x:Key="SemiViolet2" Color="{StaticResource SemiViolet2Color}" />
+    <SolidColorBrush x:Key="SemiViolet3" Color="{StaticResource SemiViolet3Color}" />
+    <SolidColorBrush x:Key="SemiViolet4" Color="{StaticResource SemiViolet4Color}" />
+    <SolidColorBrush x:Key="SemiViolet5" Color="{StaticResource SemiViolet5Color}" />
+    <SolidColorBrush x:Key="SemiViolet6" Color="{StaticResource SemiViolet6Color}" />
+    <SolidColorBrush x:Key="SemiViolet7" Color="{StaticResource SemiViolet7Color}" />
+    <SolidColorBrush x:Key="SemiViolet8" Color="{StaticResource SemiViolet8Color}" />
+    <SolidColorBrush x:Key="SemiViolet9" Color="{StaticResource SemiViolet9Color}" />
+    <SolidColorBrush x:Key="SemiIndigo0" Color="{StaticResource SemiIndigo0Color}" />
+    <SolidColorBrush x:Key="SemiIndigo1" Color="{StaticResource SemiIndigo1Color}" />
+    <SolidColorBrush x:Key="SemiIndigo2" Color="{StaticResource SemiIndigo2Color}" />
+    <SolidColorBrush x:Key="SemiIndigo3" Color="{StaticResource SemiIndigo3Color}" />
+    <SolidColorBrush x:Key="SemiIndigo4" Color="{StaticResource SemiIndigo4Color}" />
+    <SolidColorBrush x:Key="SemiIndigo5" Color="{StaticResource SemiIndigo5Color}" />
+    <SolidColorBrush x:Key="SemiIndigo6" Color="{StaticResource SemiIndigo6Color}" />
+    <SolidColorBrush x:Key="SemiIndigo7" Color="{StaticResource SemiIndigo7Color}" />
+    <SolidColorBrush x:Key="SemiIndigo8" Color="{StaticResource SemiIndigo8Color}" />
+    <SolidColorBrush x:Key="SemiIndigo9" Color="{StaticResource SemiIndigo9Color}" />
+    <SolidColorBrush x:Key="SemiBlue0" Color="{StaticResource SemiBlue0Color}" />
+    <SolidColorBrush x:Key="SemiBlue1" Color="{StaticResource SemiBlue1Color}" />
+    <SolidColorBrush x:Key="SemiBlue2" Color="{StaticResource SemiBlue2Color}" />
+    <SolidColorBrush x:Key="SemiBlue3" Color="{StaticResource SemiBlue3Color}" />
+    <SolidColorBrush x:Key="SemiBlue4" Color="{StaticResource SemiBlue4Color}" />
+    <SolidColorBrush x:Key="SemiBlue5" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiBlue6" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiBlue7" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiBlue8" Color="{StaticResource SemiBlue8Color}" />
+    <SolidColorBrush x:Key="SemiBlue9" Color="{StaticResource SemiBlue9Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue0" Color="{StaticResource SemiLightBlue0Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue1" Color="{StaticResource SemiLightBlue1Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue2" Color="{StaticResource SemiLightBlue2Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue3" Color="{StaticResource SemiLightBlue3Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue4" Color="{StaticResource SemiLightBlue4Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue5" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue6" Color="{StaticResource SemiLightBlue6Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue7" Color="{StaticResource SemiLightBlue7Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue8" Color="{StaticResource SemiLightBlue8Color}" />
+    <SolidColorBrush x:Key="SemiLightBlue9" Color="{StaticResource SemiLightBlue9Color}" />
+    <SolidColorBrush x:Key="SemiCyan0" Color="{StaticResource SemiCyan0Color}" />
+    <SolidColorBrush x:Key="SemiCyan1" Color="{StaticResource SemiCyan1Color}" />
+    <SolidColorBrush x:Key="SemiCyan2" Color="{StaticResource SemiCyan2Color}" />
+    <SolidColorBrush x:Key="SemiCyan3" Color="{StaticResource SemiCyan3Color}" />
+    <SolidColorBrush x:Key="SemiCyan4" Color="{StaticResource SemiCyan4Color}" />
+    <SolidColorBrush x:Key="SemiCyan5" Color="{StaticResource SemiCyan5Color}" />
+    <SolidColorBrush x:Key="SemiCyan6" Color="{StaticResource SemiCyan6Color}" />
+    <SolidColorBrush x:Key="SemiCyan7" Color="{StaticResource SemiCyan7Color}" />
+    <SolidColorBrush x:Key="SemiCyan8" Color="{StaticResource SemiCyan8Color}" />
+    <SolidColorBrush x:Key="SemiCyan9" Color="{StaticResource SemiCyan9Color}" />
+    <SolidColorBrush x:Key="SemiTeal0" Color="{StaticResource SemiTeal0Color}" />
+    <SolidColorBrush x:Key="SemiTeal1" Color="{StaticResource SemiTeal1Color}" />
+    <SolidColorBrush x:Key="SemiTeal2" Color="{StaticResource SemiTeal2Color}" />
+    <SolidColorBrush x:Key="SemiTeal3" Color="{StaticResource SemiTeal3Color}" />
+    <SolidColorBrush x:Key="SemiTeal4" Color="{StaticResource SemiTeal4Color}" />
+    <SolidColorBrush x:Key="SemiTeal5" Color="{StaticResource SemiTeal5Color}" />
+    <SolidColorBrush x:Key="SemiTeal6" Color="{StaticResource SemiTeal6Color}" />
+    <SolidColorBrush x:Key="SemiTeal7" Color="{StaticResource SemiTeal7Color}" />
+    <SolidColorBrush x:Key="SemiTeal8" Color="{StaticResource SemiTeal8Color}" />
+    <SolidColorBrush x:Key="SemiTeal9" Color="{StaticResource SemiTeal9Color}" />
+    <SolidColorBrush x:Key="SemiGreen0" Color="{StaticResource SemiGreen0Color}" />
+    <SolidColorBrush x:Key="SemiGreen1" Color="{StaticResource SemiGreen1Color}" />
+    <SolidColorBrush x:Key="SemiGreen2" Color="{StaticResource SemiGreen2Color}" />
+    <SolidColorBrush x:Key="SemiGreen3" Color="{StaticResource SemiGreen3Color}" />
+    <SolidColorBrush x:Key="SemiGreen4" Color="{StaticResource SemiGreen4Color}" />
+    <SolidColorBrush x:Key="SemiGreen5" Color="{StaticResource SemiGreen5Color}" />
+    <SolidColorBrush x:Key="SemiGreen6" Color="{StaticResource SemiGreen6Color}" />
+    <SolidColorBrush x:Key="SemiGreen7" Color="{StaticResource SemiGreen7Color}" />
+    <SolidColorBrush x:Key="SemiGreen8" Color="{StaticResource SemiGreen8Color}" />
+    <SolidColorBrush x:Key="SemiGreen9" Color="{StaticResource SemiGreen9Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen0" Color="{StaticResource SemiLightGreen0Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen1" Color="{StaticResource SemiLightGreen1Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen2" Color="{StaticResource SemiLightGreen2Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen3" Color="{StaticResource SemiLightGreen3Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen4" Color="{StaticResource SemiLightGreen4Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen5" Color="{StaticResource SemiLightGreen5Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen6" Color="{StaticResource SemiLightGreen6Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen7" Color="{StaticResource SemiLightGreen7Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen8" Color="{StaticResource SemiLightGreen8Color}" />
+    <SolidColorBrush x:Key="SemiLightGreen9" Color="{StaticResource SemiLightGreen9Color}" />
+    <SolidColorBrush x:Key="SemiLime0" Color="{StaticResource SemiLime0Color}" />
+    <SolidColorBrush x:Key="SemiLime1" Color="{StaticResource SemiLime1Color}" />
+    <SolidColorBrush x:Key="SemiLime2" Color="{StaticResource SemiLime2Color}" />
+    <SolidColorBrush x:Key="SemiLime3" Color="{StaticResource SemiLime3Color}" />
+    <SolidColorBrush x:Key="SemiLime4" Color="{StaticResource SemiLime4Color}" />
+    <SolidColorBrush x:Key="SemiLime5" Color="{StaticResource SemiLime5Color}" />
+    <SolidColorBrush x:Key="SemiLime6" Color="{StaticResource SemiLime6Color}" />
+    <SolidColorBrush x:Key="SemiLime7" Color="{StaticResource SemiLime7Color}" />
+    <SolidColorBrush x:Key="SemiLime8" Color="{StaticResource SemiLime8Color}" />
+    <SolidColorBrush x:Key="SemiLime9" Color="{StaticResource SemiLime9Color}" />
+    <SolidColorBrush x:Key="SemiYellow0" Color="{StaticResource SemiYellow0Color}" />
+    <SolidColorBrush x:Key="SemiYellow1" Color="{StaticResource SemiYellow1Color}" />
+    <SolidColorBrush x:Key="SemiYellow2" Color="{StaticResource SemiYellow2Color}" />
+    <SolidColorBrush x:Key="SemiYellow3" Color="{StaticResource SemiYellow3Color}" />
+    <SolidColorBrush x:Key="SemiYellow4" Color="{StaticResource SemiYellow4Color}" />
+    <SolidColorBrush x:Key="SemiYellow5" Color="{StaticResource SemiYellow5Color}" />
+    <SolidColorBrush x:Key="SemiYellow6" Color="{StaticResource SemiYellow6Color}" />
+    <SolidColorBrush x:Key="SemiYellow7" Color="{StaticResource SemiYellow7Color}" />
+    <SolidColorBrush x:Key="SemiYellow8" Color="{StaticResource SemiYellow8Color}" />
+    <SolidColorBrush x:Key="SemiYellow9" Color="{StaticResource SemiYellow9Color}" />
+    <SolidColorBrush x:Key="SemiAmber0" Color="{StaticResource SemiAmber0Color}" />
+    <SolidColorBrush x:Key="SemiAmber1" Color="{StaticResource SemiAmber1Color}" />
+    <SolidColorBrush x:Key="SemiAmber2" Color="{StaticResource SemiAmber2Color}" />
+    <SolidColorBrush x:Key="SemiAmber3" Color="{StaticResource SemiAmber3Color}" />
+    <SolidColorBrush x:Key="SemiAmber4" Color="{StaticResource SemiAmber4Color}" />
+    <SolidColorBrush x:Key="SemiAmber5" Color="{StaticResource SemiAmber5Color}" />
+    <SolidColorBrush x:Key="SemiAmber6" Color="{StaticResource SemiAmber6Color}" />
+    <SolidColorBrush x:Key="SemiAmber7" Color="{StaticResource SemiAmber7Color}" />
+    <SolidColorBrush x:Key="SemiAmber8" Color="{StaticResource SemiAmber8Color}" />
+    <SolidColorBrush x:Key="SemiAmber9" Color="{StaticResource SemiAmber9Color}" />
+    <SolidColorBrush x:Key="SemiOrange0" Color="{StaticResource SemiOrange0Color}" />
+    <SolidColorBrush x:Key="SemiOrange1" Color="{StaticResource SemiOrange1Color}" />
+    <SolidColorBrush x:Key="SemiOrange2" Color="{StaticResource SemiOrange2Color}" />
+    <SolidColorBrush x:Key="SemiOrange3" Color="{StaticResource SemiOrange3Color}" />
+    <SolidColorBrush x:Key="SemiOrange4" Color="{StaticResource SemiOrange4Color}" />
+    <SolidColorBrush x:Key="SemiOrange5" Color="{StaticResource SemiOrange5Color}" />
+    <SolidColorBrush x:Key="SemiOrange6" Color="{StaticResource SemiOrange6Color}" />
+    <SolidColorBrush x:Key="SemiOrange7" Color="{StaticResource SemiOrange7Color}" />
+    <SolidColorBrush x:Key="SemiOrange8" Color="{StaticResource SemiOrange8Color}" />
+    <SolidColorBrush x:Key="SemiOrange9" Color="{StaticResource SemiOrange9Color}" />
+    <SolidColorBrush x:Key="SemiGrey0" Color="{StaticResource SemiGrey0Color}" />
+    <SolidColorBrush x:Key="SemiGrey1" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiGrey2" Color="{StaticResource SemiGrey2Color}" />
+    <SolidColorBrush x:Key="SemiGrey3" Color="{StaticResource SemiGrey3Color}" />
+    <SolidColorBrush x:Key="SemiGrey4" Color="{StaticResource SemiGrey4Color}" />
+    <SolidColorBrush x:Key="SemiGrey5" Color="{StaticResource SemiGrey5Color}" />
+    <SolidColorBrush x:Key="SemiGrey6" Color="{StaticResource SemiGrey6Color}" />
+    <SolidColorBrush x:Key="SemiGrey7" Color="{StaticResource SemiGrey7Color}" />
+    <SolidColorBrush x:Key="SemiGrey8" Color="{StaticResource SemiGrey8Color}" />
+    <SolidColorBrush x:Key="SemiGrey9" Color="{StaticResource SemiGrey9Color}" />

    <!--  Primary  -->
-    <SolidColorBrush x:Key="SemiColorPrimary" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="#FF0062D6" />
-    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="#FF004FB3" />
-    <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="#FF98CDFD" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLight" Color="#FFEAF5FF" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLightPointerover" Color="#FFCBE7FE" />
-    <SolidColorBrush x:Key="SemiColorPrimaryLightActive" Color="#FF98CDFD" />
+    <SolidColorBrush x:Key="SemiColorPrimary" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryDisabled" Color="{StaticResource SemiBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLight" Color="{StaticResource SemiBlue0Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLightPointerover" Color="{StaticResource SemiBlue1Color}" />
+    <SolidColorBrush x:Key="SemiColorPrimaryLightActive" Color="{StaticResource SemiBlue2Color}" />
    <!--  Secondary  -->
-    <SolidColorBrush x:Key="SemiColorSecondary" Color="#FF0095EE" />
-    <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="#FF007BCA" />
-    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="#FF0063A7" />
-    <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="#FF95D8F8" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLight" Color="#FFE9F7FD" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Color="#FFC9ECFC" />
-    <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Color="#FF95D8F8" />
+    <SolidColorBrush x:Key="SemiColorSecondary" Color="{StaticResource SemiLightBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryPointerover" Color="{StaticResource SemiLightBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryDisabled" Color="{StaticResource SemiLightBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLight" Color="{StaticResource SemiLightBlue0Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightPointerover" Color="{StaticResource SemiLightBlue1Color}" />
+    <SolidColorBrush x:Key="SemiColorSecondaryLightActive" Color="{StaticResource SemiLightBlue2Color}" />
    <!--  Tertiary  -->
-    <SolidColorBrush x:Key="SemiColorTertiary" Color="#FF6B7075" />
-    <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="#FF555B61" />
-    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="#FF41464C" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLight" Color="#FFF9F9F9" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Color="#FFE6E8EA" />
-    <SolidColorBrush x:Key="SemiColorTertiaryLightActive" Color="#FFC6CACD" />
+    <SolidColorBrush x:Key="SemiColorTertiary" Color="{StaticResource SemiGrey5Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryPointerover" Color="{StaticResource SemiGrey6Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLight" Color="{StaticResource SemiGrey0Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLightPointerover" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiColorTertiaryLightActive" Color="{StaticResource SemiGrey2Color}" />
    <!--  Information  -->
-    <SolidColorBrush x:Key="SemiColorInformation" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="#FF0062D6" />
-    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="#FF004FB3" />
-    <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="#FF98CDFD" />
-    <SolidColorBrush x:Key="SemiColorInformationLight" Color="#FFEAF5FF" />
-    <SolidColorBrush x:Key="SemiColorInformationLightPointerover" Color="#FFCBE7FE" />
-    <SolidColorBrush x:Key="SemiColorInformationLightActive" Color="#FF98CDFD" />
+    <SolidColorBrush x:Key="SemiColorInformation" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationDisabled" Color="{StaticResource SemiBlue2Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLight" Color="{StaticResource SemiBlue0Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLightPointerover" Color="{StaticResource SemiBlue1Color}" />
+    <SolidColorBrush x:Key="SemiColorInformationLightActive" Color="{StaticResource SemiBlue2Color}" />
    <!--  Success  -->
-    <SolidColorBrush x:Key="SemiColorSuccess" Color="#FF3BB346" />
-    <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="#FF30953B" />
-    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="#FF25772F" />
-    <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="#FFA4E0A7" />
-    <SolidColorBrush x:Key="SemiColorSuccessLight" Color="#FFECF7EC" />
-    <SolidColorBrush x:Key="SemiColorSuccessLightPointerover" Color="#FFD0F0D1" />
-    <SolidColorBrush x:Key="SemiColorSuccessLightActive" Color="#FFA4E0A7" />
+    <SolidColorBrush x:Key="SemiColorSuccess" Color="{StaticResource SemiGreen5Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessPointerover" Color="{StaticResource SemiGreen6Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessDisabled" Color="{StaticResource SemiGreen2Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLight" Color="{StaticResource SemiGreen0Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLightPointerover" Color="{StaticResource SemiGreen1Color}" />
+    <SolidColorBrush x:Key="SemiColorSuccessLightActive" Color="{StaticResource SemiGreen2Color}" />
    <!--  Warning  -->
-    <SolidColorBrush x:Key="SemiColorWarning" Color="#FFFC8800" />
-    <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="#FFD26700" />
-    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="#FFA84A00" />
-    <SolidColorBrush x:Key="SemiColorWarningLight" Color="#FFFFF8EA" />
-    <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Color="#FFFEEECC" />
-    <SolidColorBrush x:Key="SemiColorWarningLightActive" Color="#FFFED998" />
+    <SolidColorBrush x:Key="SemiColorWarning" Color="{StaticResource SemiOrange5Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningPointerover" Color="{StaticResource SemiOrange6Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLight" Color="{StaticResource SemiOrange0Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLightPointerover" Color="{StaticResource SemiOrange1Color}" />
+    <SolidColorBrush x:Key="SemiColorWarningLightActive" Color="{StaticResource SemiOrange2Color}" />
    <!--  Danger  -->
-    <SolidColorBrush x:Key="SemiColorDanger" Color="#FFF93920" />
-    <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="#FFD52515" />
-    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="#FFB2140C" />
-    <SolidColorBrush x:Key="SemiColorDangerLight" Color="#FFFEF2ED" />
-    <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Color="#FFFEDDD2" />
-    <SolidColorBrush x:Key="SemiColorDangerLightActive" Color="#FFFDB7A5" />
+    <SolidColorBrush x:Key="SemiColorDanger" Color="{StaticResource SemiRed5Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerPointerover" Color="{StaticResource SemiRed6Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLight" Color="{StaticResource SemiRed0Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLightPointerover" Color="{StaticResource SemiRed1Color}" />
+    <SolidColorBrush x:Key="SemiColorDangerLightActive" Color="{StaticResource SemiRed2Color}" />

    <!--  Text and Icons  -->
-    <SolidColorBrush x:Key="SemiColorText0" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="SemiColorText1" Opacity="0.8" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="SemiColorText2" Opacity="0.62" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="SemiColorText3" Opacity="0.35" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="SemiColorText0" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText1" Opacity="0.8" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText2" Opacity="0.62" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorText3" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />

    <!--  Link  -->
-    <SolidColorBrush x:Key="SemiColorLink" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="SemiColorLinkPointerover" Color="#FF0062D6" />
-    <SolidColorBrush x:Key="SemiColorLinkActive" Color="#FF004FB3" />
-    <SolidColorBrush x:Key="SemiColorLinkVisited" Color="#FF0077FA" />
+    <SolidColorBrush x:Key="SemiColorLink" Color="{StaticResource SemiBlue5Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkPointerover" Color="{StaticResource SemiBlue6Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkActive" Color="{StaticResource SemiBlue7Color}" />
+    <SolidColorBrush x:Key="SemiColorLinkVisited" Color="{StaticResource SemiBlue5Color}" />

    <!--  Background  -->
    <SolidColorBrush x:Key="SemiColorBackground0" Color="White" />
@@ -235,16 +396,16 @@
    <SolidColorBrush x:Key="SemiColorBackground4" Color="White" />

    <!--  Fill  -->
-    <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="SemiColorFill1" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="SemiColorFill2" Opacity="0.13" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="SemiColorFill0" Opacity="0.05" Color="{StaticResource SemiGrey8Color}" />
+    <SolidColorBrush x:Key="SemiColorFill1" Opacity="0.09" Color="{StaticResource SemiGrey8Color}" />
+    <SolidColorBrush x:Key="SemiColorFill2" Opacity="0.13" Color="{StaticResource SemiGrey8Color}" />

    <!--  Border  -->
-    <SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="#FF1C1F23" />
+    <SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="{StaticResource SemiGrey9Color}" />

    <!--  Disabled  -->
-    <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="#FFE6E8EA" />
-    <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="#FFE6E8EA" />
-    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.02" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledBorder" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledBackground" Color="{StaticResource SemiGrey1Color}" />
+    <SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.02" Color="{StaticResource SemiGrey8Color}" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/RadioButton.axaml
@@ -7,24 +7,25 @@
    <sys:Double x:Key="RadioButtonFontSize">14</sys:Double>
    <Thickness x:Key="RadioButtonIconMargin">0 2 8 0</Thickness>

+    <SolidColorBrush x:Key="RadioButtonDisabledForeground" Opacity="0.35" Color="#1C1F23" />

    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBackground" Opacity="0.05" Color="#2E3238" />
    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBackground" Opacity="0.05" Color="#2E3238" />

    <SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBorderBrush" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="RadioButtonUncheckIconPointOverBorderBrush" Color="#0062D6" />
+    <SolidColorBrush x:Key="RadioButtonUncheckIconPointeroverBorderBrush" Color="#0062D6" />
    <SolidColorBrush x:Key="RadioButtonUncheckIconPressedBorderBrush" Color="#004FB3" />
    <SolidColorBrush x:Key="RadioButtonUncheckIconDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />


    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBackground" Color="#0062D6" />
    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBackground" Color="#004FB3" />
    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBackground" Color="#98CDFD" />
    <SolidColorBrush x:Key="RadioButtonCheckIconDefaultBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="RadioButtonCheckIconPointOverBorderBrush" Color="#0062D6" />
+    <SolidColorBrush x:Key="RadioButtonCheckIconPointeroverBorderBrush" Color="#0062D6" />
    <SolidColorBrush x:Key="RadioButtonCheckIconPressedBorderBrush" Color="#004FB3" />
    <SolidColorBrush x:Key="RadioButtonCheckIconDisabledBorderBrush" Color="#98CDFD" />

@@ -46,21 +47,23 @@
    <sys:Double x:Key="RadioButtonButtonDefaultFontSize">12</sys:Double>
    <sys:Double x:Key="RadioButtonButtonLargeFontSize">14</sys:Double>

-    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#1C1F23" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="RadioButtonButtonUncheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#0077FA" />
    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="White" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Opacity="0.35" Color="#1C1F23" />

    <Thickness x:Key="RadioButtonCardPadding">16 12</Thickness>

    <SolidColorBrush x:Key="RadioButtonCardDefaultBackground" Color="Transparent" />
    <SolidColorBrush x:Key="RadioButtonCardDefaultBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckedBackground" Color="#FFEAF5FF" />
    <SolidColorBrush x:Key="RadioButtonCardCheckDefaultBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="RadioButtonCardCheckPointOverBorderBrush" Color="#0062D6" />
+    <SolidColorBrush x:Key="RadioButtonCardCheckPointeroverBorderBrush" Color="#0062D6" />
    <SolidColorBrush x:Key="RadioButtonCardCheckPressedBorderBrush" Color="#004FB3" />
    <SolidColorBrush x:Key="RadioButtonCardCheckDisabledBorderBrush" Color="#98CDFD" />
-    <SolidColorBrush x:Key="RadioButtonCardUncheckPointOverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="RadioButtonCardUncheckPointeroverBackground" Opacity="0.05" Color="#2E3238" />
    <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="RadioButtonCardUncheckDisabledBackground" Opacity="0.05" Color="#2E3238" />

--- a/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml
@@ -1,11 +1,12 @@
 <ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
    <sys:Double x:Key="ScrollBarThickness">12</sys:Double>
    <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
    <SolidColorBrush x:Key="ScrollBarButtonDefaultBackground" Color="Transparent" />
    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ScrollBarButtonPointerOverForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Color="#1C1F23" />
    <SolidColorBrush x:Key="ScrollBarThumbForeground" Opacity="0.35" Color="#1C1F23" />
    <SolidColorBrush x:Key="ScrollBarBackground" Opacity="0.05" Color="#2E3238" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -6,14 +6,14 @@
    <SolidColorBrush x:Key="TextBoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
    <SolidColorBrush x:Key="TextBoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
    <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.05" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="TextBoxPointerOverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxPointeroverBorderBrush" Color="Transparent" />
    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#0077FA" />
    <SolidColorBrush x:Key="TextBoxForeground" Color="#1C1F23" />
    <SolidColorBrush x:Key="TextBoxWatermarkForeground" Color="#1C1F23" />
    <SolidColorBrush x:Key="TextBoxInnerForeground" Opacity="0.62" Color="#1C1F23" />

    <SolidColorBrush x:Key="TextBoxButtonDefaultForeground" Opacity="0.08" Color="#FF1C1F23" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="TextBoxButtonPointeroverForeground" Color="#0077FA" />

    <SolidColorBrush x:Key="TextBoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
    <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#FF1C1F23" />
--- a/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleButton.axaml
@@ -15,7 +15,9 @@
    <SolidColorBrush x:Key="ToggleButtonDefaultBackground" Opacity="0.05" Color="#2E3238" />
    <SolidColorBrush x:Key="ToggleButtonDefaultPointeroverBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="ToggleButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Opacity="0.35" Color="#1C1F23" />

    <SolidColorBrush x:Key="ToggleButtonDefaultBorderBrush" Color="Transparent" />

@@ -23,26 +25,25 @@
    <SolidColorBrush x:Key="ToggleButtonDefaultSecondaryForeground" Color="#0095EE" />
    <SolidColorBrush x:Key="ToggleButtonDefaultTertiaryForeground" Color="#6B7075" />
    <SolidColorBrush x:Key="ToggleButtonDefaultWarningForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultErrorForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledForeground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ToggleButtonDefaultDangerForeground" Color="#F93920" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedBackground" Color="#0077FA" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedBackground" Color="#0095EE" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedBackground" Color="#6B7075" />
    <SolidColorBrush x:Key="ToggleButtonWarningCheckedBackground" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedBackground" Color="#F93920" />
+    <SolidColorBrush x:Key="ToggleButtonDangerCheckedBackground" Color="#F93920" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPointeroverBackground" Color="#0062D6" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPointeroverBackground" Color="#007BCA" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPointeroverBackground" Color="#555B61" />
    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPointeroverBackground" Color="#D26700" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPointeroverBackground" Color="#D52515" />
+    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPointeroverBackground" Color="#D52515" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryCheckedPressedBackground" Color="#004FB3" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryCheckedPressedBackground" Color="#0063A7" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryCheckedPressedBackground" Color="#41464C" />
    <SolidColorBrush x:Key="ToggleButtonWarningCheckedPressedBackground" Color="#A84A00" />
-    <SolidColorBrush x:Key="ToggleButtonErrorCheckedPressedBackground" Color="#B2140C" />
+    <SolidColorBrush x:Key="ToggleButtonDangerCheckedPressedBackground" Color="#B2140C" />

    <SolidColorBrush x:Key="ToggleButtonCheckedForeground" Color="White" />

@@ -50,23 +51,37 @@
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBackground" Color="#E9F7FD" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBackground" Color="#F9F9F9" />
    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBackground" Color="#FEF2ED" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminateBackground" Color="#FEF2ED" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminateBorderBrush" Color="#0077FA" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminateBorderBrush" Color="#0095EE" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminateBorderBrush" Color="#6B7075" />
    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminateBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminateBorderBrush" Color="#F93920" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminateBorderBrush" Color="#F93920" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverBorderBrush" Color="#0062D6" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverBorderBrush" Color="#007BCA" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverBorderBrush" Color="#555B61" />
    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverBorderBrush" Color="#D26700" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePointeroverBorderBrush" Color="#D52515" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverBorderBrush" Color="#D52515" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePointeroverForeground" Color="#0062D6" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePointeroverForeground" Color="#007BCA" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePointeroverForeground" Color="#555B61" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePointeroverForeground" Color="#D26700" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePointeroverForeground" Color="#D52515" />

    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedBorderBrush" Color="#004FB3" />
    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedBorderBrush" Color="#0063A7" />
    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedBorderBrush" Color="#41464C" />
    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedBorderBrush" Color="#A84A00" />
-    <SolidColorBrush x:Key="ToggleButtonErrorIndeterminatePressedBorderBrush" Color="#B2140C" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedBorderBrush" Color="#B2140C" />
+
+    <SolidColorBrush x:Key="ToggleButtonPrimaryIndeterminatePressedForeground" Color="#004FB3" />
+    <SolidColorBrush x:Key="ToggleButtonSecondaryIndeterminatePressedForeground" Color="#0063A7" />
+    <SolidColorBrush x:Key="ToggleButtonTertiaryIndeterminatePressedForeground" Color="#41464C" />
+    <SolidColorBrush x:Key="ToggleButtonWarningIndeterminatePressedForeground" Color="#A84A00" />
+    <SolidColorBrush x:Key="ToggleButtonDangerIndeterminatePressedForeground" Color="#B2140C" />
+
+    <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Opacity="0.35" Color="#1C1F23" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
@@ -3,14 +3,14 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointerOverBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Opacity="0.13" Color="#2E3238" />
    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="Transparent" />

    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Opacity="0.09" Color="#1C1F23" />

    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="#5FB346" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointerOverBackground" Color="#30953B" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="#30953B" />
    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="#25772F" />
    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="#A4E0A7" />

--- a/src/Semi.Avalonia/Themes/Light/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
@@ -14,12 +14,12 @@
    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />

    <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="TreeViewItemPointerOverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.09" Color="#2E3238" />
    <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="#EAF5FF" />
    <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />

    <Thickness x:Key="TreeViewItemIconMargin">8 0</Thickness>
-    <Thickness x:Key="TreeViewItemPadding">0 4 0 4</Thickness>
+    <Thickness x:Key="TreeViewItemPadding">0 4 8 4</Thickness>
 </ResourceDictionary>
Author	SHA1	Message	Date
rabbitism	d952f901f2	doc: update docs for version preview6.1	2023-03-28 23:55:11 +08:00
Dong Bin	566cec65be	Merge pull request #161 from irihitech/160-togglebutton-foreground Togglebutton disabled Foreground	2023-03-28 23:30:02 +08:00
Zhang Dian	0af182680f	Merge pull request #162 from irihitech/150-radiobutton RadioButton and CheckBox alignment issue	2023-03-28 23:27:35 +08:00
rabbitism	efe00ebcf4	fix: fix checkbox card default vertical alignment.	2023-03-28 23:14:27 +08:00
rabbitism	2662059c6d	fix: fix template and foreground.	2023-03-28 23:04:44 +08:00
rabbitism	04dbe2d9ce	fix: fix checkbox vertical alignment issue.	2023-03-28 22:06:47 +08:00
rabbitism	4db7bbf522	fix: fix radiobutton vertical alignment.	2023-03-28 22:00:32 +08:00
Zhang Dian	97a0f21186	mix: move disabled Foreground resources.	2023-03-28 22:00:15 +08:00
Zhang Dian	698866ab43	feat: ToggleButton Foreground should the same as BorderBrush.	2023-03-28 21:27:14 +08:00
Zhang Dian	6cafdd6e1c	Merge pull request #158 from irihitech/numeric Additional Fix of Numeric Height fix	2023-03-27 23:54:50 +08:00
Dong Bin	fd49eef668	Merge pull request #157 from irihitech/144-radiobutton-styles Synchronize Styles for RadioButton and CheckBox	2023-03-27 23:45:03 +08:00
rabbitism	2cf623ddf9	fix: update colors.	2023-03-27 23:42:02 +08:00
rabbitism	7a89d503d7	fix: add more fix.	2023-03-27 23:35:33 +08:00
rabbitism	31ba4c9fbe	fix: fix card disabled style.	2023-03-27 23:32:24 +08:00
rabbitism	f30e027a19	fix: fix card disabled foreground	2023-03-27 23:26:44 +08:00
rabbitism	ffd1c7d89a	fix: fix height issue.	2023-03-27 23:03:27 +08:00
Zhang Dian	2bb175bb16	feat: checked ButtonRadioButton disable style.	2023-03-27 19:55:54 +08:00
Zhang Dian	3124c5e2cc	feat: disabled ButtonRadioButton style.	2023-03-27 19:43:11 +08:00
Zhang Dian	e79044b040	feat: ButtonRadioButton demo.	2023-03-27 19:20:17 +08:00
Zhang Dian	f63abf6901	mix: format Card pseudoclass styles.	2023-03-27 18:54:35 +08:00
Zhang Dian	fa9250540b	mix: format pseudoclass styles.	2023-03-27 18:44:27 +08:00
Zhang Dian	08c06199ae	feat: card RadioButton colors.	2023-03-27 18:25:07 +08:00
Zhang Dian	a4713ca21b	feat: original RadioButton disabled style.	2023-03-27 17:26:31 +08:00
Zhang Dian	cc2ab6ee9a	feat: relayout RadioButtonDemo.	2023-03-27 16:08:58 +08:00
Zhang Dian	0cee18f507	feat: relayout CheckBoxDemo.	2023-03-27 16:00:27 +08:00
Zhang Dian	a015bbe3e0	fix: split buttons.	2023-03-27 15:35:43 +08:00
Zhang Dian	afb0fbcea6	feat: add CheckBox and RadioButton overview.	2023-03-27 15:31:26 +08:00
Zhang Dian	5f7e84bf08	Merge pull request #154 from irihitech/0326 0326 release fixes.	2023-03-27 14:53:42 +08:00
Zhang Dian	2ad76cd737	fix: fix PointOver spell.	2023-03-27 14:49:37 +08:00
Zhang Dian	60a3fb6019	Merge pull request #156 from irihitech/color Color Palette and ColorPicker update	2023-03-27 14:33:06 +08:00
Zhang Dian	6d338fa31c	Merge pull request #155 from irihitech/153-timepicker Fix TimePicker PeriodPanel crush issue.	2023-03-27 14:03:33 +08:00
rabbitism	f026431ca9	feat: update readme.	2023-03-27 11:38:35 +08:00
rabbitism	e6531d89eb	feat: add color resource copy.	2023-03-27 11:25:47 +08:00
rabbitism	fd33972dda	feat: grouped as 2d array.	2023-03-26 22:13:31 +08:00
Zhang Dian	0e76c09b8e	feat: split colors.	2023-03-26 22:04:23 +08:00
Zhang Dian	d1739cc88f	feat: copy colors.	2023-03-26 21:46:14 +08:00
Zhang Dian	6f4c0dd5cd	feat: color order.	2023-03-26 21:37:32 +08:00
rabbitism	1a512e589d	feat: Add Dark/Light color palette.	2023-03-26 20:57:03 +08:00
rabbitism	43305be6bf	feat: update dark palette reference.	2023-03-26 20:32:55 +08:00
rabbitism	15ce60bcdb	feat: change functional brushes to use color resource.	2023-03-26 20:23:22 +08:00
rabbitism	3639239dfe	feat: add color resources, change brush definition to color reference.	2023-03-26 20:04:04 +08:00
rabbitism	9f43baa039	fix: improve nullable annotation.	2023-03-26 19:38:12 +08:00
rabbitism	c34d240874	feat: update date/time panel item height to avoid crush.	2023-03-26 18:33:54 +08:00
rabbitism	a3571192a9	fix: fix numeric height issue.	2023-03-26 18:27:04 +08:00
rabbitism	c1a9a49cd7	feat: fix PointerOver spell.	2023-03-26 18:22:38 +08:00
rabbitism	016160dee8	feat: improve TreeViewItem padding.	2023-03-26 18:15:59 +08:00
rabbitism	6885575c85	misc: add license expression in project props.	2023-03-26 14:19:17 +08:00
rabbitism	2ce3dd7445	fix: fix calendar datepicker border corner issue.	2023-03-26 14:16:27 +08:00
rabbitism	28e70736b2	fix: change IBeam to Ibeam	2023-03-26 14:07:32 +08:00
Dong Bin	e193bfc697	Merge pull request #148 from irihitech/146-togglebutton-styles DropDownButton typo	2023-03-25 23:43:46 +08:00
Zhang Dian	41e57b5034	fix: use DropDownButton instead of DropdownButton.	2023-03-25 21:34:55 +08:00
Zhang Dian	117fce4a61	feat: DropDownButton and hand Cursor.	2023-03-25 21:30:01 +08:00
Dong Bin	c852219f39	Merge pull request #147 from irihitech/146-togglebutton-styles ToggleButton Styles	2023-03-25 20:52:24 +08:00
Zhang Dian	f9ae36b7e1	feat: add Hand Cursor.	2023-03-25 19:50:36 +08:00
Zhang Dian	48ea283c65	fix: disabled Styles.	2023-03-25 17:51:10 +08:00
Zhang Dian	318f9fb510	fix: pressed ToggleButton BorderBrush Styles.	2023-03-25 17:50:43 +08:00
Zhang Dian	153109c0ca	fix: increase disabled Style priority.	2023-03-25 12:14:50 +08:00
Zhang Dian	3afa528cac	fix: add missing Primary Classes.	2023-03-25 11:44:57 +08:00
Zhang Dian	799875e38b	fix: use Danger Classes instead of Error.	2023-03-25 11:33:22 +08:00
Dong Bin	49e234bf30	Merge pull request #145 from irihitech/enhancement Protect Eyesight	2023-03-24 09:26:51 +08:00
Zhang Dian	1ddf35b25b	fix: specify Foreground.	2023-03-24 01:06:14 +08:00
Zhang Dian	c90f541228	fix: use CardBorder theme instead of yellow Background.	2023-03-24 01:05:26 +08:00