diff --git a/src/Semi.Avalonia/Controls/CheckBox.axaml b/src/Semi.Avalonia/Controls/CheckBox.axaml
index e35f0cf..a82566a 100644
--- a/src/Semi.Avalonia/Controls/CheckBox.axaml
+++ b/src/Semi.Avalonia/Controls/CheckBox.axaml
@@ -1,63 +1,57 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme TargetType="CheckBox" x:Key="{x:Type CheckBox}">
+    <ControlTheme x:Key="{x:Type CheckBox}" TargetType="CheckBox">
         <Setter Property="Padding" Value="8,0,0,0" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource FontCheckboxFontSize}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource CornerRadiusCheckboxBox}" />
+        <Setter Property="FontSize" Value="{DynamicResource CheckboxFontSize}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CheckboxBoxCornerRadius}" />
         <Setter Property="MinHeight" Value="32" />
-        <Setter Property="Foreground" Value="{DynamicResource ColorCheckboxForeground}" />
-        <Setter Property="Background" Value="{DynamicResource ColorCheckboxDefaultBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxDefaultBorderBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource CheckboxForeground}" />
+        <Setter Property="Background" Value="{DynamicResource CheckboxDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckboxDefaultBorderBrush}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="CheckBox">
-                <Grid ColumnDefinitions="Auto,*" x:Name="RootGrid">
+                <Grid x:Name="RootGrid" ColumnDefinitions="Auto,*">
                     <Border
+                        x:Name="PART_Border" Grid.ColumnSpan="2"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        Grid.ColumnSpan="2"
-                        x:Name="PART_Border" />
+                        CornerRadius="{TemplateBinding CornerRadius}" />
 
                     <Grid
-                        Grid.Column="0"
-                        Margin="0,2,0,0"
+                        Grid.Column="0" Margin="0,2,0,0"
                         VerticalAlignment="Top">
                         <Border
-                            Background="{DynamicResource ColorCheckboxDefaultBackground}"
-                            BorderBrush="{DynamicResource ColorCheckboxDefaultBorderBrush}"
-                            BorderThickness="{DynamicResource ThicknessCheckboxBoxBorderThickness}"
+                            x:Name="NormalRectangle"
+                            Width="{DynamicResource CheckboxBoxWidth}"
+                            Height="{DynamicResource CheckboxBoxHeight}"
+                            Background="{DynamicResource CheckboxDefaultBackground}"
+                            BorderBrush="{DynamicResource CheckboxDefaultBorderBrush}"
+                            BorderThickness="{DynamicResource CheckboxBoxBorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
-                            Height="{DynamicResource SizeCheckboxBoxHeight}"
-                            UseLayoutRounding="False"
-                            Width="{DynamicResource SizeCheckboxBoxWidth}"
-                            x:Name="NormalRectangle" />
+                            UseLayoutRounding="False" />
 
-                        <Viewbox Height="{DynamicResource SizeCheckboxBoxWidth}" UseLayoutRounding="False">
+                        <Viewbox Height="{DynamicResource CheckboxBoxWidth}" UseLayoutRounding="False">
                             <Panel>
-                                <Panel Height="{DynamicResource SizeCheckboxBoxWidth}" Width="{DynamicResource SizeCheckboxBoxWidth}" />
+                                <Panel Width="{DynamicResource CheckboxBoxWidth}" Height="{DynamicResource CheckboxBoxWidth}" />
                                 <Path
-                                    Fill="{DynamicResource ColorCheckboxGlyphFill}"
-                                    Opacity="0"
-                                    Stretch="Uniform"
-                                    VerticalAlignment="Center"
-                                    x:Name="CheckGlyph" />
+                                    x:Name="CheckGlyph" VerticalAlignment="Center"
+                                    Fill="{DynamicResource CheckboxGlyphFill}"
+                                    Opacity="0" Stretch="Uniform" />
                             </Panel>
                         </Viewbox>
                     </Grid>
                     <ContentPresenter
+                        x:Name="ContentPresenter" Grid.Column="1"
+                        Margin="{TemplateBinding Padding}"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="Top"
                         Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Grid.Column="1"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        Margin="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        TextWrapping="Wrap"
-                        VerticalAlignment="Top"
-                        x:Name="ContentPresenter" />
+                        RecognizesAccessKey="True" TextWrapping="Wrap" />
                 </Grid>
             </ControlTemplate>
         </Setter>
@@ -65,118 +59,114 @@
         <!--  Unchecked PointerOver State  -->
         <Style Selector="^:pointerover">
             <Style Selector="^ /template/ Border#NormalRectangle">
-                <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxPointOverBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource ColorCheckboxPointOverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckboxPointOverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckboxPointOverBackground}" />
             </Style>
         </Style>
 
         <!--  Unchecked Pressed State  -->
         <Style Selector="^:pressed">
             <Style Selector="^ /template/ Border#NormalRectangle">
-                <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxPressedBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource ColorCheckboxPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckboxPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckboxPressedBackground}" />
             </Style>
         </Style>
 
         <!--  Unchecked Disabled state  -->
         <Style Selector="^:disabled">
             <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource ColorCheckboxDisabledForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource CheckboxDisabledForeground}" />
             </Style>
             <Style Selector="^ /template/ Border#NormalRectangle">
-                <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxDefaultDisabledBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource ColorCheckboxDefaultDisabledBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckboxDefaultDisabledBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckboxDefaultDisabledBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:checked">
             <Style Selector="^ /template/ Border#NormalRectangle">
-                <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxCheckedDefaultBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource ColorCheckboxCheckedDefaultBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckboxCheckedDefaultBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckboxCheckedDefaultBackground}" />
             </Style>
 
             <Style Selector="^ /template/ Path#CheckGlyph">
-                <Setter Property="Fill" Value="{DynamicResource ColorCheckboxGlyphFill}" />
                 <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
                 <Setter Property="Width" Value="9" />
                 <Setter Property="Opacity" Value="1" />
-                <Setter Property="FlowDirection" Value="LeftToRight" />
             </Style>
 
             <!--  Checked PointerOver State  -->
             <Style Selector="^:pointerover">
                 <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxCheckedPointOverBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource ColorCheckboxCheckedPointOverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckboxCheckedPointOverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckboxCheckedPointOverBackground}" />
                 </Style>
             </Style>
 
             <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
                 <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxCheckedPressedBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource ColorCheckboxCheckedPressedBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckboxCheckedPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckboxCheckedPressedBackground}" />
                 </Style>
             </Style>
 
             <!--  Checked Disabled State  -->
             <Style Selector="^:disabled">
-                <Style Selector="^ ContentPresenter#ContentPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource ColorCheckboxDisabledForeground}" />
+                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckboxDisabledForeground}" />
                 </Style>
                 <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxCheckedDisabledBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource ColorCheckboxCheckedDisabledBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckboxCheckedDisabledBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckboxCheckedDisabledBackground}" />
                 </Style>
 
                 <Style Selector="^ /template/ Path#CheckGlyph">
-                    <Setter Property="Fill" Value="{DynamicResource ColorCheckboxGlyphDisabledFill}" />
+                    <Setter Property="Fill" Value="{DynamicResource CheckboxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>
 
         <Style Selector="^:indeterminate">
             <Style Selector="^ /template/ Border#NormalRectangle">
-                <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxCheckedDefaultBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource ColorCheckboxCheckedDefaultBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CheckboxCheckedDefaultBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CheckboxCheckedDefaultBackground}" />
             </Style>
 
             <Style Selector="^ /template/ Path#CheckGlyph">
-                <Setter Property="Fill" Value="{DynamicResource ColorCheckboxGlyphFill}" />
                 <Setter Property="Data" Value="M1536 1536v-0h-1024v128h1024z" />
                 <Setter Property="Width" Value="9" />
                 <Setter Property="Opacity" Value="1" />
-                <Setter Property="FlowDirection" Value="LeftToRight" />
             </Style>
 
             <!--  Checked PointerOver State  -->
             <Style Selector="^:pointerover">
                 <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxCheckedPointOverBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource ColorCheckboxCheckedPointOverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckboxCheckedPointOverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckboxCheckedPointOverBackground}" />
                 </Style>
             </Style>
 
             <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
                 <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxCheckedPressedBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource ColorCheckboxCheckedPressedBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckboxCheckedPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckboxCheckedPressedBackground}" />
                 </Style>
             </Style>
 
             <!--  Checked Disabled State  -->
             <Style Selector="^:disabled">
-                <Style Selector="^ ContentPresenter#ContentPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource ColorCheckboxDisabledForeground}" />
+                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource CheckboxDisabledForeground}" />
                 </Style>
                 <Style Selector="^ /template/ Border#NormalRectangle">
-                    <Setter Property="BorderBrush" Value="{DynamicResource ColorCheckboxCheckedDisabledBorderBrush}" />
-                    <Setter Property="Background" Value="{DynamicResource ColorCheckboxCheckedDisabledBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource CheckboxCheckedDisabledBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource CheckboxCheckedDisabledBackground}" />
                 </Style>
 
                 <Style Selector="^ /template/ Path#CheckGlyph">
-                    <Setter Property="Fill" Value="{DynamicResource ColorCheckboxGlyphDisabledFill}" />
+                    <Setter Property="Fill" Value="{DynamicResource CheckboxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>
diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
index b1dc4fe..b166afb 100644
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -1,54 +1,38 @@
 <ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime"
-    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">
 
-    <SolidColorBrush Color="#1C1F23" x:Key="ColorCheckboxForeground" />
-    <SolidColorBrush
-        Color="#1C1F23"
-        Opacity="0.35"
-        x:Key="ColorCheckboxDisabledForeground" />
+    <SolidColorBrush x:Key="CheckboxForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CheckboxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
-    <SolidColorBrush Color="White" x:Key="ColorCheckboxGlyphFill" />
-    <SolidColorBrush Color="White" x:Key="ColorCheckboxGlyphDisabledFill" />
+    <SolidColorBrush x:Key="CheckboxGlyphFill" Color="White" />
+    <SolidColorBrush x:Key="CheckboxGlyphDisabledFill" Color="White" />
 
-    <SolidColorBrush Color="Transparent" x:Key="ColorCheckboxDefaultBackground" />
-    <SolidColorBrush
-        Color="#1C1F23"
-        Opacity="0.35"
-        x:Key="ColorCheckboxDefaultBorderBrush" />
-    <SolidColorBrush
-        Color="#2E3238"
-        Opacity="0.05"
-        x:Key="ColorCheckboxPointOverBackground" />
-    <SolidColorBrush Color="#0077FA" x:Key="ColorCheckboxPointOverBorderBrush" />
-    <SolidColorBrush Color="#004FB3" x:Key="ColorCheckboxPressedBackground" />
-    <SolidColorBrush Color="#004FB3" x:Key="ColorCheckboxPressedBorderBrush" />
+    <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="CheckboxPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CheckboxPressedBorderBrush" Color="#004FB3" />
 
-    <SolidColorBrush Color="#0077FA" x:Key="ColorCheckboxCheckedDefaultBackground" />
-    <SolidColorBrush Color="#0077FA" x:Key="ColorCheckboxCheckedDefaultBorderBrush" />
-    <SolidColorBrush Color="#0062D6" x:Key="ColorCheckboxCheckedPointOverBackground" />
-    <SolidColorBrush Color="#0062D6" x:Key="ColorCheckboxCheckedPointOverBorderBrush" />
-    <SolidColorBrush Color="#004FB3" x:Key="ColorCheckboxCheckedPressedBackground" />
-    <SolidColorBrush Color="#004FB3" x:Key="ColorCheckboxCheckedPressedBorderBrush" />
+    <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="CheckboxCheckedPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CheckboxCheckedPressedBorderBrush" Color="#004FB3" />
 
-    <SolidColorBrush
-        Color="#2E3238"
-        Opacity="0.04"
-        x:Key="ColorCheckboxDefaultDisabledBackground" />
-    <SolidColorBrush
-        Color="#1C1F23"
-        Opacity="0.08"
-        x:Key="ColorCheckboxDefaultDisabledBorderBrush" />
-    <SolidColorBrush Color="#98CDFD" x:Key="ColorCheckboxCheckedDisabledBackground" />
-    <SolidColorBrush Color="#98CDFD" x:Key="ColorCheckboxCheckedDisabledBorderBrush" />
+    <SolidColorBrush x:Key="CheckboxDefaultDisabledBackground" Opacity="0.04" Color="#2E3238" />
+    <SolidColorBrush x:Key="CheckboxDefaultDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CheckboxCheckedDisabledBackground" Color="#98CDFD" />
+    <SolidColorBrush x:Key="CheckboxCheckedDisabledBorderBrush" Color="#98CDFD" />
 
-    <sys:Double x:Key="FontCheckboxFontSize">14</sys:Double>
-    <sys:Double x:Key="SizeCheckboxBoxWidth">16</sys:Double>
-    <sys:Double x:Key="SizeCheckboxBoxHeight">16</sys:Double>
-    <FontWeight x:Key="FontCheckboxFontWeight">400</FontWeight>
+    <sys:Double x:Key="CheckboxFontSize">14</sys:Double>
+    <sys:Double x:Key="CheckboxBoxWidth">16</sys:Double>
+    <sys:Double x:Key="CheckboxBoxHeight">16</sys:Double>
+    <FontWeight x:Key="CheckboxFontWeight">400</FontWeight>
 
-    <CornerRadius x:Key="CornerRadiusCheckboxBox">3</CornerRadius>
-    <Thickness x:Key="ThicknessCheckboxContentMargin">8 0 0 0</Thickness>
-    <Thickness x:Key="ThicknessCheckboxBoxBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CornerRadius">3</CornerRadius>
+    <Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness>
+    <Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/Button.axaml b/src/Semi.Avalonia/Themes/Light/Button.axaml
index bbb5338..a859323 100644
--- a/src/Semi.Avalonia/Themes/Light/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Button.axaml
@@ -1,4 +1,6 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
 
     <sys:Double x:Key="ButtonDefaultFontSize">14</sys:Double>
     <FontWeight x:Key="ButtonDefaultFontWeight">600</FontWeight>
@@ -24,10 +26,10 @@
     <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Opacity="0.13" Color="#2E3238" />
     <SolidColorBrush x:Key="ButtonDefaultDisabledBackground" Opacity="0.05" Color="#2E3238" />
 
-    <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Opacity="0.13" Color="#2E3238" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonDefaultPointeroverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Color="Transparent" />
 
     <!--  end Light  -->
 
@@ -80,30 +82,4 @@
     <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="Gray" />
     <!--  end Solid  -->
 
-    <!--
-    <SolidColorBrush x:Key="ButtonDefaultForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonDefaultBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonDefaultBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonDefaultPointerOverForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonDefaultPointerOverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonDefaultPointerOverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonDefaultPressedForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonDefaultPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="ButtonDefaultPressedBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledForeground" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledBackground" Color="White" />
-    <SolidColorBrush x:Key="ButtonDefaultDisabledBorderBrush" Color="#E6E8EA" />
-
-    <SolidColorBrush x:Key="ButtonSolidForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonSolidBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonSolidBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="ButtonSolidPointerOverForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonSolidPointerOverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonSolidPointerOverBorderBrush" Color="#0062D6" />
-    <SolidColorBrush x:Key="ButtonSolidPressedForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonSolidPressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="ButtonSolidPressedBorderBrush" Color="#004FB3" />
-    <SolidColorBrush x:Key="ButtonSolidDisabledForeground" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="ButtonSolidDisabledBackground" Color="White" />
-    <SolidColorBrush x:Key="ButtonSolidDisabledBorderBrush" Color="#E6E8EA" />-->
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
index 4556c69..b0ceafe 100644
--- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
@@ -1,53 +1,37 @@
 <ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush Color="#1C1F23" x:Key="ColorCheckboxForeground" />
-    <SolidColorBrush
-        Color="#1C1F23"
-        Opacity="0.35"
-        x:Key="ColorCheckboxDisabledForeground" />
+    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="CheckboxForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CheckboxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
-    <SolidColorBrush Color="White" x:Key="ColorCheckboxGlyphFill" />
-    <SolidColorBrush Color="White" x:Key="ColorCheckboxGlyphDisabledFill" />
+    <SolidColorBrush x:Key="CheckboxGlyphFill" Color="White" />
+    <SolidColorBrush x:Key="CheckboxGlyphDisabledFill" Color="White" />
 
-    <SolidColorBrush Color="Transparent" x:Key="ColorCheckboxDefaultBackground" />
-    <SolidColorBrush
-        Color="#1C1F23"
-        Opacity="0.35"
-        x:Key="ColorCheckboxDefaultBorderBrush" />
-    <SolidColorBrush
-        Color="#2E3238"
-        Opacity="0.05"
-        x:Key="ColorCheckboxPointOverBackground" />
-    <SolidColorBrush Color="#0077FA" x:Key="ColorCheckboxPointOverBorderBrush" />
-    <SolidColorBrush Color="#004FB3" x:Key="ColorCheckboxPressedBackground" />
-    <SolidColorBrush Color="#004FB3" x:Key="ColorCheckboxPressedBorderBrush" />
+    <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="CheckboxPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CheckboxPressedBorderBrush" Color="#004FB3" />
 
-    <SolidColorBrush Color="#0077FA" x:Key="ColorCheckboxCheckedDefaultBackground" />
-    <SolidColorBrush Color="#0077FA" x:Key="ColorCheckboxCheckedDefaultBorderBrush" />
-    <SolidColorBrush Color="#0062D6" x:Key="ColorCheckboxCheckedPointOverBackground" />
-    <SolidColorBrush Color="#0062D6" x:Key="ColorCheckboxCheckedPointOverBorderBrush" />
-    <SolidColorBrush Color="#004FB3" x:Key="ColorCheckboxCheckedPressedBackground" />
-    <SolidColorBrush Color="#004FB3" x:Key="ColorCheckboxCheckedPressedBorderBrush" />
+    <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="CheckboxCheckedPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CheckboxCheckedPressedBorderBrush" Color="#004FB3" />
 
-    <SolidColorBrush
-        Color="#2E3238"
-        Opacity="0.04"
-        x:Key="ColorCheckboxDefaultDisabledBackground" />
-    <SolidColorBrush
-        Color="#1C1F23"
-        Opacity="0.08"
-        x:Key="ColorCheckboxDefaultDisabledBorderBrush" />
-    <SolidColorBrush Color="#98CDFD" x:Key="ColorCheckboxCheckedDisabledBackground" />
-    <SolidColorBrush Color="#98CDFD" x:Key="ColorCheckboxCheckedDisabledBorderBrush" />
+    <SolidColorBrush x:Key="CheckboxDefaultDisabledBackground" Opacity="0.04" Color="#2E3238" />
+    <SolidColorBrush x:Key="CheckboxDefaultDisabledBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CheckboxCheckedDisabledBackground" Color="#98CDFD" />
+    <SolidColorBrush x:Key="CheckboxCheckedDisabledBorderBrush" Color="#98CDFD" />
 
-    <sys:Double x:Key="FontCheckboxFontSize">14</sys:Double>
-    <sys:Double x:Key="SizeCheckboxBoxWidth">16</sys:Double>
-    <sys:Double x:Key="SizeCheckboxBoxHeight">16</sys:Double>
-    <FontWeight x:Key="FontCheckboxFontWeight">400</FontWeight>
+    <sys:Double x:Key="CheckboxFontSize">14</sys:Double>
+    <sys:Double x:Key="CheckboxBoxWidth">16</sys:Double>
+    <sys:Double x:Key="CheckboxBoxHeight">16</sys:Double>
+    <FontWeight x:Key="CheckboxFontWeight">400</FontWeight>
 
-    <CornerRadius x:Key="CornerRadiusCheckboxBox">3</CornerRadius>
-    <Thickness x:Key="ThicknessCheckboxContentMargin">8 0 0 0</Thickness>
-    <Thickness x:Key="ThicknessCheckboxBoxBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CheckboxBoxCornerRadius">3</CornerRadius>
+    <Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness>
+    <Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness>
 </ResourceDictionary>