diff --git a/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml.cs
index a1491c3..0f945aa 100644
--- a/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml.cs
@@ -2,10 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -31,10 +29,10 @@ public partial class AboutUs : UserControl
     }
 }
 
-public partial class AboutUsViewModel: ObservableObject
+public partial class AboutUsViewModel : ObservableObject
 {
     public ICommand NavigateCommand { get; set; }
-    
+
     internal ILauncher? Launcher { get; set; }
 
     public AboutUsViewModel()
@@ -55,6 +53,5 @@ public partial class AboutUsViewModel: ObservableObject
         {
             await Launcher.LaunchUriAsync(new Uri(uri));
         }
-        
     }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml.cs
index f306155..7915aaf 100644
--- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml.cs
@@ -1,8 +1,6 @@
-using System.Collections.ObjectModel;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Semi.Avalonia.Demo.Pages;
@@ -16,14 +14,13 @@ public partial class AutoCompleteBoxDemo : UserControl
     }
 }
 
-public class AutoCompleteBoxDemoViewModel: ObservableObject
+public class AutoCompleteBoxDemoViewModel : ObservableObject
 {
     public ObservableCollection<StateData> States { get; set; }
 
     public AutoCompleteBoxDemoViewModel()
     {
         States = new ObservableCollection<StateData>(GetStates());
-        
     }
 
     private static List<StateData> GetStates()
diff --git a/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
index 560a9e7..905bebc 100644
--- a/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
@@ -18,4 +18,4 @@
             <TextBlock>Shadow on Pointerover</TextBlock>
         </Border>
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
index da207e8..ed06733 100644
--- a/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
index 2974962..72cc9df 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -112,14 +112,14 @@
                     IsEnabled="False" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" Spacing="8">
-                <DropDownButton Content="Default" Classes="Success"/>
-                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success"/>
-                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success"/>
-                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success"/>
-                <DropDownButton Content="Default" Classes="Success" IsEnabled="False"/>
-                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success" IsEnabled="False"/>
-                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success" IsEnabled="False"/>
-                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success" IsEnabled="False"/>
+                <DropDownButton Content="Default" Classes="Success" />
+                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success" />
+                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success" />
+                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success" />
+                <DropDownButton Content="Default" Classes="Success" IsEnabled="False" />
+                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success" IsEnabled="False" />
+                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success" IsEnabled="False" />
+                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success" IsEnabled="False" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" Spacing="8">
                 <DropDownButton Classes="Small" Content="Small" />
@@ -139,7 +139,7 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" Spacing="8">
                 <SplitButton Content="Default" Classes="Success" />
-                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}"  Classes="Success" />
+                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}" Classes="Success" />
                 <SplitButton Content="Outline" Theme="{DynamicResource OutlineSplitButton}" Classes="Success" />
                 <SplitButton Content="Borderless" Theme="{DynamicResource BorderlessSplitButton}" Classes="Success" />
                 <SplitButton Content="Default" Classes="Success" IsEnabled="False" />
@@ -165,7 +165,7 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" Spacing="8">
                 <ToggleSplitButton Content="Default" Classes="Success" />
-                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True"  />
+                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" />
                 <ToggleSplitButton Content="Default" Classes="Success" IsEnabled="False" />
                 <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" IsEnabled="False" />
             </StackPanel>
diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml.cs
index d9d0940..6ac8b72 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
index 4aa5cd0..83b3be2 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
@@ -32,4 +32,4 @@
                 Text="A.S.I.A" />
         </ButtonSpinner>
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml.cs
index f562d3e..74e197b 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml.cs
@@ -1,7 +1,5 @@
 using System;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -31,7 +29,6 @@ public partial class ButtonSpinnerDemo : UserControl
 
             txtBox.Text = _mountains[value];
         }
-
     }
 
     private readonly string[] _mountains = new[]
diff --git a/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs
index 405ba9b..51627fe 100644
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml
index 3a28d0b..8de8341 100644
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml
@@ -11,4 +11,4 @@
         <Calendar />
         <Calendar SelectionMode="SingleRange" />
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml.cs
index 06ac28c..1bf192f 100644
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,9 +8,4 @@ public partial class CalendarDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml.cs
index e785e7a..f154d7a 100644
--- a/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml.cs
@@ -1,7 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml.cs
index cd64fb6..2b2efbe 100644
--- a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml.cs
index 6dbfeca..7390cb6 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
index d309225..993795b 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
@@ -28,13 +28,13 @@
         <ComboBox Classes="Bordered" />
         <ComboBox Classes="Bordered" IsEnabled="False" />
         <ComboBox>
-          <ComboBox.SelectionBoxItemTemplate>
-            <DataTemplate DataType="x:String">
-              <ContentControl BorderThickness="1"
-                              BorderBrush="Gold"
-                              Content="{Binding}" />
-            </DataTemplate>
-          </ComboBox.SelectionBoxItemTemplate>
+            <ComboBox.SelectionBoxItemTemplate>
+                <DataTemplate DataType="x:String">
+                    <ContentControl BorderThickness="1"
+                                    BorderBrush="Gold"
+                                    Content="{Binding}" />
+                </DataTemplate>
+            </ComboBox.SelectionBoxItemTemplate>
         </ComboBox>
 
         <StackPanel Orientation="Horizontal">
@@ -49,4 +49,4 @@
             <ComboBox Width="100" Classes="Bordered" IsEnabled="False" />
         </StackPanel>
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
index a1a9af2..69a0bea 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
@@ -12,54 +12,54 @@
     mc:Ignorable="d">
     <TabControl>
         <TabItem Header="DataGrid">
-           <Grid RowDefinitions="Auto, *">
-               <StackPanel Grid.Row="0" Orientation="Horizontal">
-                   <ToggleSwitch Content="Enable" Name="enable" IsChecked="True" />
-                   <ToggleSwitch Content="Inset Content" Name="inset" />
-                   <ToggleSwitch Content="ScrollBar Auto Hide" Name="autohide" />
-               </StackPanel>
-               <DataGrid Grid.Row="1"
-                         Margin="8"
-                         CanUserReorderColumns="True"
-                         CanUserResizeColumns="True"
-                         CanUserSortColumns="True"
-                         HeadersVisibility="All"
-                         IsReadOnly="True"
-                         Classes.InsetContent="{Binding #inset.IsChecked}"
-                         ScrollViewer.AllowAutoHide="{Binding #autohide.IsChecked}"
-                         IsEnabled="{Binding #enable.IsChecked}"
-                         ItemsSource="{Binding GridData1}">
-                   <DataGrid.Columns>
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Title}"
-                           Header="Title" />
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Artist}"
-                           Header="Artist" />
-                       <DataGridTextColumn
-                           Width="6*"
-                           x:DataType="vm:Song"
-                           Binding="{Binding Album}"
-                           Header="Album" />
-                       <DataGridTemplateColumn Header="Duration" SortMemberPath="Duration">
-                           <DataGridTemplateColumn.CellTemplate>
-                               <DataTemplate>
-                                   <TextBlock
-                                       Margin="8,0,0,0"
-                                       VerticalAlignment="Center"
-                                       Text="{Binding Duration}" />
-                               </DataTemplate>
-                           </DataGridTemplateColumn.CellTemplate>
-                       </DataGridTemplateColumn>
-                   </DataGrid.Columns>
+            <Grid RowDefinitions="Auto, *">
+                <StackPanel Grid.Row="0" Orientation="Horizontal">
+                    <ToggleSwitch Content="Enable" Name="enable" IsChecked="True" />
+                    <ToggleSwitch Content="Inset Content" Name="inset" />
+                    <ToggleSwitch Content="ScrollBar Auto Hide" Name="autohide" />
+                </StackPanel>
+                <DataGrid Grid.Row="1"
+                          Margin="8"
+                          CanUserReorderColumns="True"
+                          CanUserResizeColumns="True"
+                          CanUserSortColumns="True"
+                          HeadersVisibility="All"
+                          IsReadOnly="True"
+                          Classes.InsetContent="{Binding #inset.IsChecked}"
+                          ScrollViewer.AllowAutoHide="{Binding #autohide.IsChecked}"
+                          IsEnabled="{Binding #enable.IsChecked}"
+                          ItemsSource="{Binding GridData1}">
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Width="6*"
+                            x:DataType="vm:Song"
+                            Binding="{Binding Title}"
+                            Header="Title" />
+                        <DataGridTextColumn
+                            Width="6*"
+                            x:DataType="vm:Song"
+                            Binding="{Binding Artist}"
+                            Header="Artist" />
+                        <DataGridTextColumn
+                            Width="6*"
+                            x:DataType="vm:Song"
+                            Binding="{Binding Album}"
+                            Header="Album" />
+                        <DataGridTemplateColumn Header="Duration" SortMemberPath="Duration">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock
+                                        Margin="8,0,0,0"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding Duration}" />
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                    </DataGrid.Columns>
 
-               </DataGrid>
-               
-           </Grid>
+                </DataGrid>
+
+            </Grid>
         </TabItem>
         <TabItem Header="Grouping">
             <DataGrid
@@ -177,4 +177,4 @@
             </Grid>
         </TabItem>
     </TabControl>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
index 7af3eb8..6744fb7 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
@@ -1,18 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using Avalonia;
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
-using Avalonia.Input;
-using Avalonia.Input.Raw;
-using Avalonia.Markup.Xaml;
-using Avalonia.Threading;
 using Semi.Avalonia.Demo.ViewModels;
 
 namespace Semi.Avalonia.Demo.Pages;
diff --git a/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml
index a8e1101..ac69aa7 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml
@@ -80,4 +80,4 @@
             </TextBox>
         </StackPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml.cs
index b012533..e24584d 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,9 +8,4 @@ public partial class DataValidationErrorsDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
index cb6c0df..99ecbc4 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
@@ -26,4 +26,4 @@
         </StackPanel>
 
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml.cs
index 9d7ae48..bbba98e 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml.cs
@@ -1,7 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Media;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -11,14 +8,4 @@ public partial class DatePickerDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
-    public override void Render(DrawingContext context)
-    {
-        base.Render(context);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml.cs
index 31cf485..8201332 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
index c6653aa..4ad5f8c 100644
--- a/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
@@ -1,7 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
index 01f9480..e00d976 100644
--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
@@ -39,4 +39,4 @@
                 CornerRadius="10" />
         </Grid>
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
index b3f1927..d61f5c9 100644
--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -9,9 +8,4 @@ public partial class GridSplitterDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
index ad93fd0..d871370 100644
--- a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
@@ -1,7 +1,4 @@
-using System;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
index 250c794..9a70909 100644
--- a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
@@ -31,7 +31,7 @@
                             VerticalAlignment="Top"
                             ColumnDefinitions="Auto, *"
                             RowDefinitions="*,*,*,*,*,*,*,*,*,*,*">
-                            <TextBlock Grid.Row="0"  Grid.Column="0">Classes</TextBlock>
+                            <TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock>
                             <TextBlock Grid.Row="1" Grid.Column="0">-</TextBlock>
                             <TextBlock Grid.Row="2" Grid.Column="0">Secondary</TextBlock>
                             <TextBlock Grid.Row="3" Grid.Column="0">Tertiary</TextBlock>
@@ -221,4 +221,4 @@
             </WrapPanel>
         </StackPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs
index 1b65236..4d16769 100644
--- a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
index e8b43d4..9a9dfd8 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
@@ -16,7 +16,7 @@
                 Header="Default">
                 <ScrollViewer>
                     <StackPanel Spacing="20">
-                        <TextBlock Text="Theme: Default"/>
+                        <TextBlock Text="Theme: Default" />
                         <ListBox ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                         <ListBox IsEnabled="False">
                             <ListBoxItem IsSelected="True">Avalonia</ListBoxItem>
@@ -31,7 +31,7 @@
                 Theme="{DynamicResource GroupBox}"
                 Header="RadioGroupListBox">
                 <StackPanel Spacing="20">
-                    <TextBlock Text="Theme: RadioGroupListBox"/>
+                    <TextBlock Text="Theme: RadioGroupListBox" />
                     <ListBox
                         Theme="{DynamicResource RadioGroupListBox}"
                         ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
@@ -40,7 +40,7 @@
                         <ListBoxItem IsSelected="True">WPF</ListBoxItem>
                     </ListBox>
 
-                    <TextBlock Text="Theme: ButtonRadioGroupListBox"/>
+                    <TextBlock Text="Theme: ButtonRadioGroupListBox" />
                     <StackPanel Orientation="Horizontal">
                         <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
                             <ListBox Theme="{DynamicResource ButtonRadioGroupListBox}">
@@ -93,7 +93,7 @@
                         </Border>
                     </StackPanel>
 
-                    <TextBlock Text="Theme: CardRadioGroupListBox"/>
+                    <TextBlock Text="Theme: CardRadioGroupListBox" />
                     <ListBox Theme="{DynamicResource CardRadioGroupListBox}"
                              ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                     <ListBox Theme="{DynamicResource CardRadioGroupListBox}" IsEnabled="False">
@@ -101,7 +101,7 @@
                         <ListBoxItem>WPF</ListBoxItem>
                     </ListBox>
 
-                    <TextBlock Text="Theme: PureCardRadioGroupListBox"/>
+                    <TextBlock Text="Theme: PureCardRadioGroupListBox" />
                     <ListBox Theme="{DynamicResource PureCardRadioGroupListBox}"
                              ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                     <ListBox Theme="{DynamicResource PureCardRadioGroupListBox}" IsEnabled="False">
@@ -117,7 +117,7 @@
                 Header="CheckGroupListBox">
                 <ScrollViewer>
                     <StackPanel Spacing="20">
-                        <TextBlock Text="Theme: CheckGroupListBox"/>
+                        <TextBlock Text="Theme: CheckGroupListBox" />
                         <ListBox
                             SelectionMode="Multiple,Toggle"
                             Theme="{DynamicResource CheckGroupListBox}"
@@ -129,7 +129,7 @@
                             <ListBoxItem>WPF</ListBoxItem>
                         </ListBox>
 
-                        <TextBlock Text="Theme: CardCheckGroupListBox"/>
+                        <TextBlock Text="Theme: CardCheckGroupListBox" />
                         <ListBox
                             SelectionMode="Multiple,Toggle"
                             Theme="{DynamicResource CardCheckGroupListBox}"
diff --git a/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
index 418e8c4..e0d21a6 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
@@ -17,4 +17,4 @@
         <Button Name="SelectFolderButton" Content="Select Folder" />
         <Button Name="SaveFileButton" Content="Save File" />
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
index c487098..f1c9fa6 100644
--- a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
@@ -145,4 +145,4 @@
             <TextBlock Text="Right Click to show Context Flyout" />
         </Border>
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml.cs
index 698f0ee..e7894da 100644
--- a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -11,8 +9,4 @@ public partial class MenuDemo : UserControl
         InitializeComponent();
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml.cs
index 7c05985..6a91689 100644
--- a/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -11,8 +9,4 @@ public partial class NumericUpDownDemo : UserControl
         InitializeComponent();
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
index 0bb4e36..b7a5aa4 100644
--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Media;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs
index f24fb46..96196e1 100644
--- a/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Controls;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
index f38bd00..11fa038 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
@@ -20,7 +20,7 @@
                     Minimum="{Binding #slider.Minimum}"
                     Theme="{DynamicResource ProgressRing}"
                     Value="{Binding #slider.Value}"
-                    ShowProgressText="True"/>
+                    ShowProgressText="True" />
                 <ProgressBar
                     Width="100"
                     Height="100"
@@ -29,7 +29,7 @@
                     Maximum="{Binding #slider.Maximum}"
                     Minimum="{Binding #slider.Minimum}"
                     Theme="{DynamicResource ProgressRing}"
-                    ShowProgressText="True"/>
+                    ShowProgressText="True" />
             </StackPanel>
             <Slider
                 Name="slider"
@@ -163,4 +163,4 @@
                 Value="60" />
         </StackPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
index 54f8165..3a9c434 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,9 +8,4 @@ public partial class ProgressBarDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml.cs
index 4857c92..28fe740 100644
--- a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
index 4bb484e..5c47465 100644
--- a/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
@@ -24,4 +24,4 @@
                      ItemsSource="{Binding Items}" />
         </RefreshContainer>
     </DockPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml.cs
index 4a7e351..3c0a63e 100644
--- a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml.cs
index 4e73d1b..f109929 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,9 +8,4 @@ public partial class ScrollViewerDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml b/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml
index c353ef3..dc2ffa6 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml
@@ -165,4 +165,4 @@
             </HeaderedContentControl>
         </StackPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml.cs
index b4cc6d7..3a365e7 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -11,8 +9,4 @@ public partial class SelectableTextBlockDemo : UserControl
         InitializeComponent();
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
index f25675a..63cabf9 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
@@ -98,4 +98,4 @@
                 Value="30" />
         </StackPanel>
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml.cs
index 8bb304a..744fbee 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -11,8 +9,4 @@ public partial class SliderDemo : UserControl
         InitializeComponent();
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
index 528ab8b..a16ade3 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
@@ -114,8 +114,7 @@
                                         Theme="{DynamicResource IconBorderlessToggleSwitch}"
                                         Content="{StaticResource SemiIconSidebar}"
                                         HorizontalAlignment="Left"
-                                        IsChecked="{Binding #SplitView.IsPaneOpen}">
-                                    </ToggleSwitch>
+                                        IsChecked="{Binding #SplitView.IsPaneOpen}" />
                                 </Grid>
                             </SplitView.Pane>
 
@@ -205,8 +204,7 @@
                                         Theme="{DynamicResource IconBorderlessToggleSwitch}"
                                         Content="{StaticResource SemiIconSidebar}"
                                         HorizontalAlignment="Left"
-                                        IsChecked="{Binding #SplitView2.IsPaneOpen}">
-                                    </ToggleSwitch>
+                                        IsChecked="{Binding #SplitView2.IsPaneOpen}" />
                                     <TextBlock
                                         Grid.Row="1"
                                         Margin="8,12"
diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
index 1cb1f66..84108b7 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
@@ -1,6 +1,5 @@
 using System.Collections.ObjectModel;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Semi.Avalonia.Demo.Pages;
@@ -12,11 +11,6 @@ public partial class SplitViewDemo : UserControl
         InitializeComponent();
         this.DataContext = new SplitViewDemoViewModel();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
 
 public class SplitViewDemoViewModel : ObservableObject
diff --git a/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml.cs
index 3d5bb3d..60071b7 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Semi.Avalonia.Demo.ViewModels;
 
 namespace Semi.Avalonia.Demo.Pages;
diff --git a/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml
index 04f0fe3..8af9f46 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml
@@ -159,4 +159,4 @@
             </HeaderedContentControl>
         </StackPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml.cs
index da0cace..24fc1bb 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml.cs
index a2a42f4..b3885e7 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
diff --git a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
index 4cecd94..1405f3a 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
@@ -17,9 +17,9 @@
         <TimePicker Classes="Large" />
         <TimePicker Classes="Small" />
         <StackPanel Orientation="Horizontal">
-            <TimePicker Classes="Large" ClockIdentifier="12HourClock"/>
-            <TimePicker ClockIdentifier="12HourClock"/>
-            <TimePicker Classes="Small" ClockIdentifier="12HourClock"/>
+            <TimePicker Classes="Large" ClockIdentifier="12HourClock" />
+            <TimePicker ClockIdentifier="12HourClock" />
+            <TimePicker Classes="Small" ClockIdentifier="12HourClock" />
         </StackPanel>
         <StackPanel Orientation="Horizontal">
             <TimePicker IsEnabled="False" />
@@ -28,4 +28,4 @@
         </StackPanel>
 
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml.cs
index 71ec596..88388ca 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,9 +8,4 @@ public partial class TimePickerDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml.cs
index 3e1424e..643ed31 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,9 +8,4 @@ public partial class ToggleButtonDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml.cs
index 51b02b0..220e19e 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,9 +8,4 @@ public partial class ToggleSwitchDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/ToolTipDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ToolTipDemo.axaml.cs
index 0b3a0c7..9c1f2d0 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ToolTipDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ToolTipDemo.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,9 +8,4 @@ public partial class ToolTipDemo : UserControl
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml
index 9abc6b3..ef58855 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml
@@ -79,4 +79,4 @@
 
     </Grid>
 
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs
index 6674925..3dd9451 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs
@@ -1,7 +1,5 @@
 using System.Collections.ObjectModel;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Semi.Avalonia.Demo.Pages;
@@ -25,14 +23,16 @@ public class TreeViewVm : ObservableObject
     {
         Items = new ObservableCollection<TreeViewItemVm>()
         {
-            new TreeViewItemVm() {Name = "Item 1", Id = "1"},
-            new TreeViewItemVm() {Name = "Item 2", Id = "2"},
-            new TreeViewItemVm() {Name = "Item 3", Id = "3", Items = new ObservableCollection<TreeViewItemVm>()
+            new TreeViewItemVm() { Name = "Item 1", Id = "1" },
+            new TreeViewItemVm() { Name = "Item 2", Id = "2" },
+            new TreeViewItemVm()
             {
-                new TreeViewItemVm() {Name = "Item 3.1", Id = "3.1"},
-                new TreeViewItemVm() {Name = "Item 3.2", Id = "3.2"},
-                new TreeViewItemVm() {Name = "Item 3.3", Id = "3.3"},
-            },
+                Name = "Item 3", Id = "3", Items = new ObservableCollection<TreeViewItemVm>()
+                {
+                    new TreeViewItemVm() { Name = "Item 3.1", Id = "3.1" },
+                    new TreeViewItemVm() { Name = "Item 3.2", Id = "3.2" },
+                    new TreeViewItemVm() { Name = "Item 3.3", Id = "3.3" },
+                },
             },
         };
 
@@ -50,8 +50,10 @@ public class TreeViewVm : ObservableObject
                     ThirdItem thirdItem = new ThirdItem { Id = k, Name = $"ThirdItem {k}" };
                     secondItem.ThirdItemItems.Add(thirdItem);
                 }
+
                 firstItem.SecondItems.Add(secondItem);
             }
+
             MultipleLevelItems.Add(firstItem);
         }
     }
@@ -69,18 +71,17 @@ public class ItemBase
     public int Id { get; set; }
     public string? Name { get; set; }
 }
+
 public class FirstItem : ItemBase
 {
     public ObservableCollection<SecondItem>? SecondItems { get; set; }
 }
+
 public class SecondItem : ItemBase
 {
     public ObservableCollection<ThirdItem>? ThirdItemItems { get; set; }
-
 }
+
 public class ThirdItem : ItemBase
 {
-}
-
-
-
+}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/ViewModels/ApplicationViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/ApplicationViewModel.cs
index 5abf230..b91a492 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/ApplicationViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/ApplicationViewModel.cs
@@ -2,11 +2,10 @@ using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Semi.Avalonia.Demo.Views;
 
 namespace Semi.Avalonia.Demo.ViewModels;
 
-public partial class ApplicationViewModel: ObservableObject
+public partial class ApplicationViewModel : ObservableObject
 {
     [RelayCommand]
     private void Exit()
diff --git a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/FilesPageViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/FilesPageViewModel.cs
index c3b6ee7..587f415 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/FilesPageViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/FilesPageViewModel.cs
@@ -30,7 +30,7 @@ public partial class FilesPageViewModel : ObservableObject
             Source.Items = [Root];
         }
     }
-    
+
     partial void OnSelectedPathChanged(string? value)
     {
         SetSelectedPath(value);
diff --git a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs
index 5c0ba5e..79e49c0 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs
@@ -27,25 +27,25 @@ public class SongsPageViewModel : ObservableObject
             {
                 new CheckBoxColumn<SongViewModel>(
                     "IsSelected",
-                    a => a.IsSelected, 
+                    a => a.IsSelected,
                     (model, b) => { model.IsSelected = b; },
                     new GridLength(108, GridUnitType.Pixel)),
                 new TextColumn<SongViewModel, string>(
-                    "Title", 
-                    a => a.Title, 
+                    "Title",
+                    a => a.Title,
                     (o, a) => o.Title = a,
                     new GridLength(6, GridUnitType.Star)),
-                new TextColumn<SongViewModel, string>("Artist", 
-                    a => a.Artist, 
+                new TextColumn<SongViewModel, string>("Artist",
+                    a => a.Artist,
                     (o, a) => o.Artist = a,
                     new GridLength(6, GridUnitType.Star)),
-                new TemplateColumn<SongViewModel>("Album", 
-                    "AlbumCell", 
+                new TemplateColumn<SongViewModel>("Album",
+                    "AlbumCell",
                     "AlbumEditCell",
                     new GridLength(6, GridUnitType.Star)),
                 new TemplateColumn<SongViewModel>(
-                    "Comments", 
-                    "CommentsCell", 
+                    "Comments",
+                    "CommentsCell",
                     "CommentsEditCell",
                     new GridLength(6, GridUnitType.Star)),
             }
diff --git a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/TreeDataGridDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/TreeDataGridDemoViewModel.cs
index 791d14b..69d7379 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/TreeDataGridDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/TreeDataGridDemoViewModel.cs
@@ -2,7 +2,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Semi.Avalonia.Demo.ViewModels;
 
-public class TreeDataGridDemoViewModel: ObservableObject
+public class TreeDataGridDemoViewModel : ObservableObject
 {
     public SongsPageViewModel SongsContext { get; } = new();
     public FilesPageViewModel FilesContext { get; } = new();
diff --git a/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml b/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml
index 858b471..6df182c 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml
@@ -11,4 +11,4 @@
     Icon="/Assets/irihi.ico"
     mc:Ignorable="d">
     <views:MainView />
-</Window>
+</Window>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml.cs b/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml.cs
index aabf593..505265d 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Notifications;
 
 namespace Semi.Avalonia.Demo.Views;