diff --git a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
index d2c8add..475c6af 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
@@ -101,7 +101,7 @@
                 </DataGrid.Columns>
             </DataGrid>
         </TabItem>
-        <TabItem x:Name="EditableTab" Header="Editable">
+        <TabItem Name="EditableTab" Header="Editable">
             <Grid Margin="8" RowDefinitions="Auto,*,Auto">
                 <StackPanel
                     Grid.Row="0"
@@ -109,14 +109,14 @@
                     Spacing="4">
                     <TextBlock VerticalAlignment="Center" Text="FontSize:" />
                     <Slider
-                        x:Name="FontSizeSlider"
+                        Name="FontSizeSlider"
                         Width="100"
                         VerticalAlignment="Center"
                         Maximum="30"
                         Minimum="5"
                         Value="14" />
                     <CheckBox
-                        x:Name="IsThreeStateCheckBox"
+                        Name="IsThreeStateCheckBox"
                         Content="IsThreeState"
                         IsChecked="False" />
                 </StackPanel>
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
index 8d13327..31cc570 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
@@ -81,7 +81,7 @@
                                 <!--  Backgrounds  -->
                                 <!--  TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}"  -->
                                 <Border
-                                    x:Name="ContentBackgroundBorder"
+                                    Name="ContentBackgroundBorder"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Height="{TemplateBinding Height}"
@@ -93,7 +93,7 @@
                                     CornerRadius="{TemplateBinding CornerRadius}" />
 
                                 <TabControl
-                                    x:Name="PART_TabControl"
+                                    Name="PART_TabControl"
                                     Grid.Row="0"
                                     Padding="0"
                                     VerticalAlignment="Stretch"
@@ -130,7 +130,7 @@
                                                 <ColumnDefinition Width="Auto" MinWidth="32" />
                                             </Grid.ColumnDefinitions>
                                             <primitives:ColorSlider
-                                                x:Name="ColorSpectrumThirdComponentSlider"
+                                                Name="ColorSpectrumThirdComponentSlider"
                                                 Grid.Column="0"
                                                 Margin="0,0,12,0"
                                                 HorizontalAlignment="Center"
@@ -144,7 +144,7 @@
                                                 IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
                                                 Orientation="Vertical" />
                                             <primitives:ColorSpectrum
-                                                x:Name="ColorSpectrum"
+                                                Name="ColorSpectrum"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Stretch"
@@ -158,7 +158,7 @@
                                                 MinValue="{TemplateBinding MinValue}"
                                                 Shape="{TemplateBinding ColorSpectrumShape}" />
                                             <primitives:ColorSlider
-                                                x:Name="ColorSpectrumAlphaSlider"
+                                                Name="ColorSpectrumAlphaSlider"
                                                 Grid.Column="2"
                                                 Margin="12,0,0,0"
                                                 HorizontalAlignment="Center"
@@ -282,7 +282,7 @@
                                                     CornerRadius="3">
                                                     <Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}">
                                                         <RadioButton
-                                                            x:Name="RgbRadioButton"
+                                                            Name="RgbRadioButton"
                                                             Grid.Column="0"
                                                             HorizontalContentAlignment="Center"
                                                             VerticalContentAlignment="Center"
@@ -294,7 +294,7 @@
                                                                                         Mode=TwoWay}"
                                                             Theme="{DynamicResource ColorViewRadioButton}" />
                                                         <RadioButton
-                                                            x:Name="HsvRadioButton"
+                                                            Name="HsvRadioButton"
                                                             Grid.Column="1"
                                                             HorizontalContentAlignment="Center"
                                                             VerticalContentAlignment="Center"
@@ -308,7 +308,7 @@
                                                     </Grid>
                                                 </Border>
                                                 <TextBox
-                                                    x:Name="PART_HexTextBox"
+                                                    Name="PART_HexTextBox"
                                                     Grid.Column="2"
                                                     Height="32"
                                                     HorizontalAlignment="Stretch"
@@ -320,7 +320,7 @@
                                             <!--  Color component editing controls  -->
                                             <!--  Component 1 RGB:Red HSV:Hue  -->
                                             <NumericUpDown
-                                                x:Name="Component1NumericUpDown"
+                                                Name="Component1NumericUpDown"
                                                 Grid.Row="2"
                                                 Grid.Column="0"
                                                 Width="{DynamicResource ColorViewNumericUpDownWidth}"
@@ -335,7 +335,7 @@
                                                 ShowButtonSpinner="False"
                                                 Value="{Binding Value, ElementName=Component1Slider}" />
                                             <primitives:ColorSlider
-                                                x:Name="Component1Slider"
+                                                Name="Component1Slider"
                                                 Grid.Row="2"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
@@ -351,7 +351,7 @@
                                                 TickFrequency="1" />
                                             <!--  Component 2 RGB:Green HSV:Saturation  -->
                                             <NumericUpDown
-                                                x:Name="Component2NumericUpDown"
+                                                Name="Component2NumericUpDown"
                                                 Grid.Row="3"
                                                 Grid.Column="0"
                                                 Width="{DynamicResource ColorViewNumericUpDownWidth}"
@@ -366,7 +366,7 @@
                                                 ShowButtonSpinner="False"
                                                 Value="{Binding Value, ElementName=Component2Slider}" />
                                             <primitives:ColorSlider
-                                                x:Name="Component2Slider"
+                                                Name="Component2Slider"
                                                 Grid.Row="3"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
@@ -382,7 +382,7 @@
                                                 TickFrequency="1" />
                                             <!--  Component 3 RGB:Blue HSV:Value  -->
                                             <NumericUpDown
-                                                x:Name="Component3NumericUpDown"
+                                                Name="Component3NumericUpDown"
                                                 Grid.Row="4"
                                                 Grid.Column="0"
                                                 Width="{DynamicResource ColorViewNumericUpDownWidth}"
@@ -397,7 +397,7 @@
                                                 ShowButtonSpinner="False"
                                                 Value="{Binding Value, ElementName=Component3Slider}" />
                                             <primitives:ColorSlider
-                                                x:Name="Component3Slider"
+                                                Name="Component3Slider"
                                                 Grid.Row="4"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
@@ -413,7 +413,7 @@
                                                 TickFrequency="1" />
                                             <!--  Alpha Component  -->
                                             <NumericUpDown
-                                                x:Name="AlphaComponentNumericUpDown"
+                                                Name="AlphaComponentNumericUpDown"
                                                 Grid.Row="5"
                                                 Grid.Column="0"
                                                 Width="{DynamicResource ColorViewNumericUpDownWidth}"
@@ -435,7 +435,7 @@
                                                 </NumericUpDown.IsVisible>
                                             </NumericUpDown>
                                             <primitives:ColorSlider
-                                                x:Name="AlphaComponentSlider"
+                                                Name="AlphaComponentSlider"
                                                 Grid.Row="5"
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Stretch"
@@ -560,7 +560,7 @@
                                     CornerRadius="8 8 0 0"
                                     ClipToBounds="True">
                                     <primitives:ColorSpectrum
-                                        x:Name="ColorSpectrum"
+                                        Name="ColorSpectrum"
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Stretch"
                                         Components="{TemplateBinding ColorSpectrumComponents}"
@@ -574,7 +574,7 @@
                                         Shape="{TemplateBinding ColorSpectrumShape}" />
                                 </Border>
                                 <primitives:ColorSlider
-                                    x:Name="ColorSpectrumThirdComponentSlider"
+                                    Name="ColorSpectrumThirdComponentSlider"
                                     Grid.Row="1"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
@@ -586,7 +586,7 @@
                                     Orientation="Horizontal" />
 
                                 <primitives:ColorSlider
-                                    x:Name="ColorSpectrumAlphaSlider"
+                                    Name="ColorSpectrumAlphaSlider"
                                     Grid.Row="2"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
@@ -613,32 +613,32 @@
                                         Height="20"
                                         CornerRadius="4" />
                                     <Panel
-                                        x:Name="PART_TextBoxPanel"
+                                        Name="PART_TextBoxPanel"
                                         Width="106"
                                         Margin="4 0 0 0"
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Center">
                                         <TextBox
-                                            x:Name="PART_HexTextBox"
+                                            Name="PART_HexTextBox"
                                             Classes="Small"
                                             InnerLeftContent="#"
                                             IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}"
                                             Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}"
                                             MaxLength="8" />
                                         <TextBox
-                                            x:Name="PART_RgbaTextBox"
+                                            Name="PART_RgbaTextBox"
                                             Classes="Small"
                                             IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}"
                                             Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" />
                                         <TextBox
-                                            x:Name="PART_HsvaTextBox"
+                                            Name="PART_HsvaTextBox"
                                             Classes="Small"
                                             IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}"
                                             Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" />
                                     </Panel>
 
                                     <NumericUpDown
-                                        x:Name="AlphaComponentNumericUpDown"
+                                        Name="AlphaComponentNumericUpDown"
                                         Width="70"
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Center"
@@ -653,7 +653,7 @@
                                         IsVisible="{TemplateBinding IsAlphaVisible}"
                                         Value="{Binding #ColorSpectrumAlphaSlider.Value}" />
                                     <ComboBox
-                                        x:Name="ColorModelComboBox"
+                                        Name="ColorModelComboBox"
                                         Width="80"
                                         VerticalAlignment="Center"
                                         Classes="Small"
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
index 67a5f86..f66bdd8 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
@@ -31,7 +31,7 @@
                                 VerticalAlignment="Stretch"
                                 Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" />
                             <Border
-                                x:Name="PART_AccentDecrement2Border"
+                                Name="PART_AccentDecrement2Border"
                                 Grid.Column="0"
                                 Background="{TemplateBinding HsvColor,
                                                              Converter={StaticResource AccentColorConverter},
@@ -40,7 +40,7 @@
                                                                Converter={StaticResource LeftCornerRadiusFilterConverter}}"
                                 Tag="-2" />
                             <Border
-                                x:Name="PART_AccentDecrement1Border"
+                                Name="PART_AccentDecrement1Border"
                                 Grid.Column="1"
                                 Background="{TemplateBinding HsvColor,
                                                              Converter={StaticResource AccentColorConverter},
@@ -61,14 +61,14 @@
                                 VerticalAlignment="Stretch"
                                 Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" />
                             <Border
-                                x:Name="PART_AccentIncrement1Border"
+                                Name="PART_AccentIncrement1Border"
                                 Grid.Column="0"
                                 Background="{TemplateBinding HsvColor,
                                                              Converter={StaticResource AccentColorConverter},
                                                              ConverterParameter='1'}"
                                 Tag="1" />
                             <Border
-                                x:Name="PART_AccentIncrement2Border"
+                                Name="PART_AccentIncrement2Border"
                                 Grid.Column="1"
                                 Background="{TemplateBinding HsvColor,
                                                              Converter={StaticResource AccentColorConverter},
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
index a2f5ced..2dcaaa8 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
@@ -16,16 +16,16 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ColorSpectrum}">
                     <Panel
-                        x:Name="PART_LayoutRoot"
+                        Name="PART_LayoutRoot"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch">
                         <Panel
-                            x:Name="PART_SizingPanel"
+                            Name="PART_SizingPanel"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             ClipToBounds="True">
                             <Rectangle
-                                x:Name="PART_SpectrumRectangle"
+                                Name="PART_SpectrumRectangle"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 IsHitTestVisible="False"
@@ -37,7 +37,7 @@
                                 RadiusY="{TemplateBinding CornerRadius,
                                                           Converter={StaticResource BottomRightCornerRadiusConverter}}" />
                             <Rectangle
-                                x:Name="PART_SpectrumOverlayRectangle"
+                                Name="PART_SpectrumOverlayRectangle"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 IsHitTestVisible="False"
@@ -49,7 +49,7 @@
                                 RadiusY="{TemplateBinding CornerRadius,
                                                           Converter={StaticResource BottomRightCornerRadiusConverter}}" />
                             <Ellipse
-                                x:Name="PART_SpectrumEllipse"
+                                Name="PART_SpectrumEllipse"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 IsHitTestVisible="False"
@@ -57,7 +57,7 @@
                                                             Converter={StaticResource EnumToBoolConverter},
                                                             ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
                             <Ellipse
-                                x:Name="PART_SpectrumOverlayEllipse"
+                                Name="PART_SpectrumOverlayEllipse"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 IsHitTestVisible="False"
@@ -65,24 +65,24 @@
                                                             Converter={StaticResource EnumToBoolConverter},
                                                             ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
                             <Canvas
-                                x:Name="PART_InputTarget"
+                                Name="PART_InputTarget"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 Background="Transparent">
                                 <!--  Note: ToolTip.VerticalOffset is for touch devices to keep the tip above fingers  -->
                                 <Panel
-                                    x:Name="PART_SelectionEllipsePanel"
+                                    Name="PART_SelectionEllipsePanel"
                                     ToolTip.Placement="Top"
                                     ToolTip.VerticalOffset="-10">
                                     <Ellipse
-                                        x:Name="FocusEllipse"
+                                        Name="FocusEllipse"
                                         Margin="-2"
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Stretch"
                                         IsHitTestVisible="False"
                                         StrokeThickness="2" />
                                     <Ellipse
-                                        x:Name="SelectionEllipse"
+                                        Name="SelectionEllipse"
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Stretch"
                                         IsHitTestVisible="False"
@@ -93,7 +93,7 @@
                                 </Panel>
                             </Canvas>
                             <Rectangle
-                                x:Name="BorderRectangle"
+                                Name="BorderRectangle"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 IsHitTestVisible="False"
@@ -105,7 +105,7 @@
                                 RadiusY="{TemplateBinding CornerRadius,
                                                           Converter={StaticResource BottomRightCornerRadiusConverter}}" />
                             <Ellipse
-                                x:Name="BorderEllipse"
+                                Name="BorderEllipse"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
                                 IsHitTestVisible="False"
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml
index f0805f6..939d627 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml
@@ -90,7 +90,7 @@
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         CornerRadius="{TemplateBinding CornerRadius}" />
                     <Rectangle
-                        x:Name="BorderRectangle"
+                        Name="BorderRectangle"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         IsHitTestVisible="False"
@@ -124,7 +124,7 @@
         <Setter Property="RadioButton.Template">
             <ControlTemplate TargetType="RadioButton">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Margin="{TemplateBinding Margin}"
                     Padding="{TemplateBinding Padding}"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -174,7 +174,7 @@
                     <!--  Backgrounds  -->
                     <!--  TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}"  -->
                     <Border
-                        x:Name="ContentBackgroundBorder"
+                        Name="ContentBackgroundBorder"
                         Grid.Row="0"
                         Grid.RowSpan="2"
                         Height="{TemplateBinding Height}"
@@ -186,7 +186,7 @@
                         CornerRadius="{TemplateBinding CornerRadius}" />
 
                     <TabControl
-                        x:Name="PART_TabControl"
+                        Name="PART_TabControl"
                         Grid.Row="0"
                         Padding="0"
                         VerticalAlignment="Stretch"
@@ -223,7 +223,7 @@
                                     <ColumnDefinition Width="Auto" MinWidth="32" />
                                 </Grid.ColumnDefinitions>
                                 <primitives:ColorSlider
-                                    x:Name="ColorSpectrumThirdComponentSlider"
+                                    Name="ColorSpectrumThirdComponentSlider"
                                     Grid.Column="0"
                                     Margin="0,0,12,0"
                                     HorizontalAlignment="Center"
@@ -237,7 +237,7 @@
                                     IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
                                     Orientation="Vertical" />
                                 <primitives:ColorSpectrum
-                                    x:Name="ColorSpectrum"
+                                    Name="ColorSpectrum"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
@@ -251,7 +251,7 @@
                                     MinValue="{TemplateBinding MinValue}"
                                     Shape="{TemplateBinding ColorSpectrumShape}" />
                                 <primitives:ColorSlider
-                                    x:Name="ColorSpectrumAlphaSlider"
+                                    Name="ColorSpectrumAlphaSlider"
                                     Grid.Column="2"
                                     Margin="12,0,0,0"
                                     HorizontalAlignment="Center"
@@ -347,7 +347,7 @@
                                         CornerRadius="3">
                                         <Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}">
                                             <RadioButton
-                                                x:Name="RgbRadioButton"
+                                                Name="RgbRadioButton"
                                                 Grid.Column="0"
                                                 HorizontalContentAlignment="Center"
                                                 VerticalContentAlignment="Center"
@@ -359,7 +359,7 @@
                                                                             Mode=TwoWay}"
                                                 Theme="{DynamicResource ColorViewRadioButton}" />
                                             <RadioButton
-                                                x:Name="HsvRadioButton"
+                                                Name="HsvRadioButton"
                                                 Grid.Column="1"
                                                 HorizontalContentAlignment="Center"
                                                 VerticalContentAlignment="Center"
@@ -373,7 +373,7 @@
                                         </Grid>
                                     </Border>
                                     <TextBox
-                                        x:Name="PART_HexTextBox"
+                                        Name="PART_HexTextBox"
                                         Grid.Column="2"
                                         Height="32"
                                         HorizontalAlignment="Stretch"
@@ -385,7 +385,7 @@
                                 <!--  Color component editing controls  -->
                                 <!--  Component 1 RGB:Red HSV:Hue  -->
                                 <NumericUpDown
-                                    x:Name="Component1NumericUpDown"
+                                    Name="Component1NumericUpDown"
                                     Grid.Row="2"
                                     Grid.Column="0"
                                     Width="{DynamicResource ColorViewNumericUpDownWidth}"
@@ -400,7 +400,7 @@
                                     ShowButtonSpinner="False"
                                     Value="{Binding Value, ElementName=Component1Slider}" />
                                 <primitives:ColorSlider
-                                    x:Name="Component1Slider"
+                                    Name="Component1Slider"
                                     Grid.Row="2"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
@@ -416,7 +416,7 @@
                                     TickFrequency="1" />
                                 <!--  Component 2 RGB:Green HSV:Saturation  -->
                                 <NumericUpDown
-                                    x:Name="Component2NumericUpDown"
+                                    Name="Component2NumericUpDown"
                                     Grid.Row="3"
                                     Grid.Column="0"
                                     Width="{DynamicResource ColorViewNumericUpDownWidth}"
@@ -431,7 +431,7 @@
                                     ShowButtonSpinner="False"
                                     Value="{Binding Value, ElementName=Component2Slider}" />
                                 <primitives:ColorSlider
-                                    x:Name="Component2Slider"
+                                    Name="Component2Slider"
                                     Grid.Row="3"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
@@ -447,7 +447,7 @@
                                     TickFrequency="1" />
                                 <!--  Component 3 RGB:Blue HSV:Value  -->
                                 <NumericUpDown
-                                    x:Name="Component3NumericUpDown"
+                                    Name="Component3NumericUpDown"
                                     Grid.Row="4"
                                     Grid.Column="0"
                                     Width="{DynamicResource ColorViewNumericUpDownWidth}"
@@ -462,7 +462,7 @@
                                     ShowButtonSpinner="False"
                                     Value="{Binding Value, ElementName=Component3Slider}" />
                                 <primitives:ColorSlider
-                                    x:Name="Component3Slider"
+                                    Name="Component3Slider"
                                     Grid.Row="4"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
@@ -478,7 +478,7 @@
                                     TickFrequency="1" />
                                 <!--  Alpha Component  -->
                                 <NumericUpDown
-                                    x:Name="AlphaComponentNumericUpDown"
+                                    Name="AlphaComponentNumericUpDown"
                                     Grid.Row="5"
                                     Grid.Column="0"
                                     Width="{DynamicResource ColorViewNumericUpDownWidth}"
@@ -500,7 +500,7 @@
                                     </NumericUpDown.IsVisible>
                                 </NumericUpDown>
                                 <primitives:ColorSlider
-                                    x:Name="AlphaComponentSlider"
+                                    Name="AlphaComponentSlider"
                                     Grid.Row="5"
                                     Grid.Column="1"
                                     HorizontalAlignment="Stretch"
@@ -584,7 +584,7 @@
                         CornerRadius="8 8 0 0"
                         ClipToBounds="True">
                         <primitives:ColorSpectrum
-                            x:Name="ColorSpectrum"
+                            Name="ColorSpectrum"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Components="{TemplateBinding ColorSpectrumComponents}"
@@ -598,7 +598,7 @@
                             Shape="{TemplateBinding ColorSpectrumShape}" />
                     </Border>
                     <primitives:ColorSlider
-                        x:Name="ColorSpectrumThirdComponentSlider"
+                        Name="ColorSpectrumThirdComponentSlider"
                         Grid.Row="1"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Center"
@@ -610,7 +610,7 @@
                         Orientation="Horizontal" />
 
                     <primitives:ColorSlider
-                        x:Name="ColorSpectrumAlphaSlider"
+                        Name="ColorSpectrumAlphaSlider"
                         Grid.Row="2"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Center"
@@ -637,32 +637,32 @@
                             Height="20"
                             CornerRadius="4" />
                         <Panel
-                            x:Name="PART_TextBoxPanel"
+                            Name="PART_TextBoxPanel"
                             Width="106"
                             Margin="4 0 0 0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center">
                             <TextBox
-                                x:Name="PART_HexTextBox"
+                                Name="PART_HexTextBox"
                                 Classes="Small"
                                 InnerLeftContent="#"
                                 IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}"
                                 Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}"
                                 MaxLength="8" />
                             <TextBox
-                                x:Name="PART_RgbaTextBox"
+                                Name="PART_RgbaTextBox"
                                 Classes="Small"
                                 IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}"
                                 Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" />
                             <TextBox
-                                x:Name="PART_HsvaTextBox"
+                                Name="PART_HsvaTextBox"
                                 Classes="Small"
                                 IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}"
                                 Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" />
                         </Panel>
 
                         <NumericUpDown
-                            x:Name="AlphaComponentNumericUpDown"
+                            Name="AlphaComponentNumericUpDown"
                             Width="70"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Center"
@@ -677,7 +677,7 @@
                             IsVisible="{TemplateBinding IsAlphaVisible}"
                             Value="{Binding #ColorSpectrumAlphaSlider.Value}" />
                         <ComboBox
-                            x:Name="ColorModelComboBox"
+                            Name="ColorModelComboBox"
                             Width="80"
                             VerticalAlignment="Center"
                             Classes="Small"
diff --git a/src/Semi.Avalonia.DataGrid/DataGrid.axaml b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
index cdd206f..0b3f116 100644
--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -35,14 +35,14 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border
-                    x:Name="CellBorder"
+                    Name="CellBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
-                    <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
+                    <Grid Name="PART_CellRoot" ColumnDefinitions="*,Auto">
                         <Rectangle
-                            x:Name="CurrencyVisual"
+                            Name="CurrencyVisual"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Fill="Transparent"
@@ -51,7 +51,7 @@
                             Stroke="{DynamicResource DataGridCellCurrentBorderBrush}"
                             StrokeThickness="{DynamicResource DataGridCellVisualStrokeThickness}" />
                         <Panel
-                            x:Name="FocusVisual"
+                            Name="FocusVisual"
                             Grid.Column="0"
                             IsHitTestVisible="False"
                             IsVisible="False">
@@ -75,7 +75,7 @@
                             Foreground="{TemplateBinding Foreground}" />
 
                         <Rectangle
-                            x:Name="InvalidVisualElement"
+                            Name="InvalidVisualElement"
                             Grid.Column="0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
@@ -117,7 +117,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="DataGridColumnHeader">
                 <Border
-                    x:Name="HeaderBorder"
+                    Name="HeaderBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -153,7 +153,7 @@
                             Fill="{TemplateBinding SeparatorBrush}"
                             IsVisible="{TemplateBinding AreSeparatorsVisible}" />
                         <Panel
-                            x:Name="FocusVisual"
+                            Name="FocusVisual"
                             Grid.Column="0"
                             IsHitTestVisible="False"
                             IsVisible="False">
@@ -204,7 +204,7 @@
         TargetType="DataGridColumnHeader">
         <Setter Property="Template">
             <ControlTemplate>
-                <Grid x:Name="TopLeftHeaderRoot" RowDefinitions="*,*,Auto">
+                <Grid Name="TopLeftHeaderRoot" RowDefinitions="*,*,Auto">
                     <Border
                         Grid.RowSpan="2"
                         BorderBrush="{DynamicResource DataGridLineBrush}"
@@ -228,7 +228,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid
-                    x:Name="PART_Root"
+                    Name="PART_Root"
                     ColumnDefinitions="Auto,*"
                     RowDefinitions="*,*,Auto">
                     <Border
@@ -238,18 +238,18 @@
                         BorderThickness="0,0,1,0">
                         <Grid Background="{TemplateBinding Background}">
                             <Rectangle
-                                x:Name="RowInvalidVisualElement"
+                                Name="RowInvalidVisualElement"
                                 Fill="{DynamicResource DataGridCellErrorBrush}"
                                 Opacity="0"
                                 Stretch="Fill" />
                             <Rectangle
-                                x:Name="BackgroundRectangle"
+                                Name="BackgroundRectangle"
                                 Fill="{DynamicResource DataGridRowBackground}"
                                 Stretch="Fill" />
                         </Grid>
                     </Border>
                     <Rectangle
-                        x:Name="HorizontalSeparator"
+                        Name="HorizontalSeparator"
                         Grid.Row="2"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
@@ -278,7 +278,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="DataGridRow">
                 <Border
-                    x:Name="RowBorder"
+                    Name="RowBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -296,7 +296,7 @@
                             Background="{DynamicResource DataGridRowBackground}"
                             CornerRadius="3" />
                         <Rectangle
-                            x:Name="InvalidVisualElement"
+                            Name="InvalidVisualElement"
                             Grid.ColumnSpan="2"
                             Fill="{DynamicResource DataGridRowErrorBackground}"
                             Opacity="0" />
@@ -420,7 +420,7 @@
                     </StackPanel>
 
                     <Rectangle
-                        x:Name="CurrencyVisual"
+                        Name="CurrencyVisual"
                         Grid.Row="0"
                         Grid.Column="0"
                         HorizontalAlignment="Stretch"
@@ -431,7 +431,7 @@
                         Stroke="{DynamicResource DataGridRowGroupHeaderCurrentBorderBrush}"
                         StrokeThickness="{DynamicResource DataGridRowGroupHeaderVisualStrokeThickness}" />
                     <Panel
-                        x:Name="FocusVisual"
+                        Name="FocusVisual"
                         Grid.Row="0"
                         Grid.Column="0"
                         IsHitTestVisible="False"
@@ -454,7 +454,7 @@
                         DataGridFrozenGrid.IsFrozen="True" />
 
                     <Rectangle
-                        x:Name="PART_BottomGridLine"
+                        Name="PART_BottomGridLine"
                         Grid.Row="1"
                         Grid.Column="0"
                         Grid.ColumnSpan="5"
@@ -483,7 +483,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="DataGrid">
                 <Border
-                    x:Name="DataGridBorder"
+                    Name="DataGridBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -545,7 +545,7 @@
                                 Orientation="Horizontal" />
                         </Grid>
                         <Border
-                            x:Name="PART_DisabledVisualElement"
+                            Name="PART_DisabledVisualElement"
                             Grid.Row="0"
                             Grid.RowSpan="4"
                             Grid.Column="0"
diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
index 9a83369..e3e98c2 100644
--- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
@@ -12,7 +12,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="TreeDataGrid">
                 <Border
-                    x:Name="RootBorder"
+                    Name="RootBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -24,7 +24,7 @@
                             HorizontalScrollBarVisibility="Hidden"
                             IsVisible="{TemplateBinding ShowColumnHeaders}"
                             VerticalScrollBarVisibility="Disabled">
-                            <Border x:Name="ColumnHeadersPresenterBorder">
+                            <Border Name="ColumnHeadersPresenterBorder">
                                 <TreeDataGridColumnHeadersPresenter
                                     Name="PART_ColumnHeadersPresenter"
                                     ElementFactory="{TemplateBinding ElementFactory}"
@@ -174,7 +174,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border
-                    x:Name="CellBorder"
+                    Name="CellBorder"
                     Padding="{TemplateBinding Padding}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
@@ -206,7 +206,7 @@
                     VerticalAlignment="Center"
                     Background="Transparent">
                     <PathIcon
-                        x:Name="ChevronPath"
+                        Name="ChevronPath"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Data="{DynamicResource TreeDataGridItemCollapsedChevronPathData}"
@@ -223,7 +223,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border
-                    x:Name="CellBorder"
+                    Name="CellBorder"
                     Padding="{TemplateBinding Indent,
                                               Converter={x:Static conv:IndentConverter.Instance}}"
                     Background="{TemplateBinding Background}"
@@ -254,7 +254,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border
-                    x:Name="CellBorder"
+                    Name="CellBorder"
                     Padding="{TemplateBinding Padding}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
@@ -276,7 +276,7 @@
             <Setter Property="Template">
                 <ControlTemplate>
                     <Border
-                        x:Name="CellBorder"
+                        Name="CellBorder"
                         Padding="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index 0a46233..e32ea29 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -27,7 +27,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="Button">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
diff --git a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
index e7526b4..1b917a9 100644
--- a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
@@ -13,7 +13,7 @@
         <Setter Property="RepeatButton.Template">
             <ControlTemplate>
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
index d9deb27..2799f86 100644
--- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
@@ -21,11 +21,11 @@
             <ControlTemplate TargetType="CalendarDatePicker">
                 <DataValidationErrors>
                     <Panel
-                        x:Name="LayoutRoot"
+                        Name="LayoutRoot"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch">
                         <Border
-                            x:Name="Background"
+                            Name="Background"
                             BackgroundSizing="{TemplateBinding BackgroundSizing}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
diff --git a/src/Semi.Avalonia/Controls/CaptionButtons.axaml b/src/Semi.Avalonia/Controls/CaptionButtons.axaml
index 1ab3b00..2a83b39 100644
--- a/src/Semi.Avalonia/Controls/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Controls/CaptionButtons.axaml
@@ -45,7 +45,7 @@
                     Orientation="Horizontal"
                     Spacing="2"
                     TextElement.FontSize="10">
-                    <Button x:Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}">
+                    <Button Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}">
                         <PathIcon
                             Name="PART_FullScreenButtonIcon"
                             Width="12"
@@ -53,14 +53,14 @@
                             Data="{DynamicResource WindowExpandGlyph}"
                             Foreground="{Binding $parent[Button].Foreground}" />
                     </Button>
-                    <Button x:Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}">
+                    <Button Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}">
                         <PathIcon
                             Width="12"
                             Height="12"
                             Data="{DynamicResource WindowMinimizeGlyph}"
                             Foreground="{Binding $parent[Button].Foreground}" />
                     </Button>
-                    <Button x:Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}">
+                    <Button Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}">
                         <PathIcon
                             Name="PART_RestoreButtonIcon"
                             Width="12"
@@ -69,7 +69,7 @@
                             Foreground="{Binding $parent[Button].Foreground}" />
                     </Button>
                     <Button
-                        x:Name="PART_CloseButton"
+                        Name="PART_CloseButton"
                         Background="{DynamicResource CaptionButtonClosePointeroverBackground}"
                         BorderBrush="{DynamicResource CaptionButtonClosePressedBackground}"
                         Theme="{StaticResource CaptionButton}">
diff --git a/src/Semi.Avalonia/Controls/CheckBox.axaml b/src/Semi.Avalonia/Controls/CheckBox.axaml
index c8767ee..527e887 100644
--- a/src/Semi.Avalonia/Controls/CheckBox.axaml
+++ b/src/Semi.Avalonia/Controls/CheckBox.axaml
@@ -26,7 +26,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="CheckBox">
                 <Border
-                    x:Name="RootBorder"
+                    Name="RootBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -37,7 +37,7 @@
                             TemplatedControl.IsTemplateFocusTarget="True"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                             <Border
-                                x:Name="NormalRectangle"
+                                Name="NormalRectangle"
                                 Width="{DynamicResource CheckBoxBoxWidth}"
                                 Height="{DynamicResource CheckBoxBoxHeight}"
                                 Background="{DynamicResource CheckBoxDefaultBackground}"
@@ -46,13 +46,13 @@
                                 CornerRadius="{TemplateBinding CornerRadius}"
                                 UseLayoutRounding="False" />
                             <PathIcon
-                                x:Name="CheckGlyph"
+                                Name="CheckGlyph"
                                 Width="{DynamicResource CheckBoxBoxGlyphWidth}"
                                 Height="{DynamicResource CheckBoxBoxGlyphHeight}"
                                 Foreground="{DynamicResource CheckBoxGlyphFill}" />
                         </Panel>
                         <ContentPresenter
-                            x:Name="PART_ContentPresenter"
+                            Name="PART_ContentPresenter"
                             Grid.Column="1"
                             Margin="{DynamicResource CheckBoxContentMargin}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -196,7 +196,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="CheckBox">
                 <Border
-                    x:Name="RootBorder"
+                    Name="RootBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -207,7 +207,7 @@
                             TemplatedControl.IsTemplateFocusTarget="True"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                             <Border
-                                x:Name="NormalRectangle"
+                                Name="NormalRectangle"
                                 Width="{DynamicResource CheckBoxBoxWidth}"
                                 Height="{DynamicResource CheckBoxBoxHeight}"
                                 Background="{DynamicResource CheckBoxDefaultBackground}"
@@ -216,7 +216,7 @@
                                 CornerRadius="{TemplateBinding CornerRadius}"
                                 UseLayoutRounding="False" />
                             <PathIcon
-                                x:Name="CheckGlyph"
+                                Name="CheckGlyph"
                                 Width="{DynamicResource CheckBoxBoxGlyphWidth}"
                                 Height="{DynamicResource CheckBoxBoxGlyphHeight}"
                                 Foreground="{DynamicResource CheckBoxGlyphFill}" />
@@ -343,7 +343,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="CheckBox">
                 <Border
-                    x:Name="RootBorder"
+                    Name="RootBorder"
                     Padding="{TemplateBinding Padding}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
@@ -358,7 +358,7 @@
                             VerticalAlignment="Top"
                             Margin="{DynamicResource CheckBoxBoxMargin}">
                             <Border
-                                x:Name="NormalRectangle"
+                                Name="NormalRectangle"
                                 Width="{DynamicResource CheckBoxBoxWidth}"
                                 Height="{DynamicResource CheckBoxBoxHeight}"
                                 Background="{DynamicResource CheckBoxDefaultBackground}"
@@ -367,14 +367,14 @@
                                 CornerRadius="{DynamicResource CheckBoxBoxCornerRadius}"
                                 UseLayoutRounding="False" />
                             <PathIcon
-                                x:Name="CheckGlyph"
+                                Name="CheckGlyph"
                                 Width="{DynamicResource CheckBoxBoxGlyphWidth}"
                                 Height="{DynamicResource CheckBoxBoxGlyphHeight}"
                                 Foreground="{DynamicResource CheckBoxGlyphFill}" />
                         </Panel>
 
                         <ContentPresenter
-                            x:Name="PART_ContentPresenter"
+                            Name="PART_ContentPresenter"
                             Grid.Column="1"
                             Margin="{DynamicResource CheckBoxContentMargin}"
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -546,7 +546,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="CheckBox">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 0068c66..533ad17 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -48,7 +48,7 @@
                 <DataValidationErrors>
                     <Grid ColumnDefinitions="*, Auto">
                         <Border
-                            x:Name="Background"
+                            Name="Background"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
                             Background="{TemplateBinding Background}"
@@ -58,7 +58,7 @@
                             CornerRadius="{TemplateBinding CornerRadius}"
                             MinHeight="{TemplateBinding MinHeight}" />
                         <TextBlock
-                            x:Name="PlaceholderTextBlock"
+                            Name="PlaceholderTextBlock"
                             Grid.Column="0"
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -70,7 +70,7 @@
                             Opacity="0.3"
                             Text="{TemplateBinding PlaceholderText}" />
                         <ContentPresenter
-                            x:Name="ContentPresenter"
+                            Name="ContentPresenter"
                             Grid.Column="0"
                             Margin="{TemplateBinding Padding}"
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -87,7 +87,7 @@
                             IsVisible="False"
                             Theme="{DynamicResource InnerIconButton}" />
                         <Border
-                            x:Name="DropDownOverlay"
+                            Name="DropDownOverlay"
                             Grid.Column="1"
                             Width="30"
                             Margin="0,1,1,1"
@@ -96,7 +96,7 @@
                             IsVisible="False" />
 
                         <PathIcon
-                            x:Name="DropDownGlyph"
+                            Name="DropDownGlyph"
                             Grid.Column="1"
                             Width="12"
                             Height="12"
@@ -119,7 +119,7 @@
                             PlacementTarget="Background"
                             WindowManagerAddShadowHint="False">
                             <Border
-                                x:Name="PopupBorder"
+                                Name="PopupBorder"
                                 Margin="0,4"
                                 HorizontalAlignment="Stretch"
                                 Background="{DynamicResource ComboBoxPopupBackground}"
diff --git a/src/Semi.Avalonia/Controls/DataValidationErrors.axaml b/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
index a91ebf0..8e453de 100644
--- a/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
@@ -8,7 +8,7 @@
             <ControlTemplate TargetType="DataValidationErrors">
                 <DockPanel LastChildFill="True">
                     <ContentControl
-                        x:Name="InlineDataValidationContentControl"
+                        Name="InlineDataValidationContentControl"
                         Margin="0,4,0,0"
                         Content="{Binding (DataValidationErrors.Errors)}"
                         ContentTemplate="{TemplateBinding ErrorTemplate}"
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 253ac10..092d963 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -192,7 +192,7 @@
                                         FontWeight="{TemplateBinding FontWeight}"
                                         Text="{DynamicResource STRING_DATEPICKER_YEAR_TEXT}" />
                                     <Rectangle
-                                        x:Name="PART_FirstSpacer"
+                                        Name="PART_FirstSpacer"
                                         Grid.Column="1"
                                         Width="1"
                                         Height="{TemplateBinding Height}"
@@ -200,7 +200,7 @@
                                         HorizontalAlignment="Center"
                                         Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
                                     <Rectangle
-                                        x:Name="PART_SecondSpacer"
+                                        Name="PART_SecondSpacer"
                                         Grid.Column="3"
                                         Width="1"
                                         Height="{TemplateBinding Height}"
diff --git a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
index 7f5ad46..326bc20 100644
--- a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
@@ -84,7 +84,7 @@
             <ControlTemplate TargetType="Button">
                 <Border Background="{TemplateBinding Background}">
                     <ContentPresenter
-                        x:Name="ContentPresenter"
+                        Name="ContentPresenter"
                         Padding="{TemplateBinding Padding}"
                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Semi.Avalonia/Controls/DropDownButton.axaml b/src/Semi.Avalonia/Controls/DropDownButton.axaml
index 1528e70..9268d01 100644
--- a/src/Semi.Avalonia/Controls/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Controls/DropDownButton.axaml
@@ -23,16 +23,16 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="DropDownButton">
                 <Border
-                    x:Name="RootBorder"
+                    Name="RootBorder"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     BackgroundSizing="{TemplateBinding BackgroundSizing}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     ClipToBounds="True"
                     CornerRadius="{TemplateBinding CornerRadius}">
-                    <Grid x:Name="InnerGrid" ColumnDefinitions="*,Auto">
+                    <Grid Name="InnerGrid" ColumnDefinitions="*,Auto">
                         <ContentPresenter
-                            x:Name="PART_ContentPresenter"
+                            Name="PART_ContentPresenter"
                             Grid.Column="0"
                             Padding="{TemplateBinding Padding}"
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -42,7 +42,7 @@
                             Foreground="{TemplateBinding Foreground}"
                             RecognizesAccessKey="True" />
                         <PathIcon
-                            x:Name="DropDownGlyph"
+                            Name="DropDownGlyph"
                             Grid.Column="1"
                             Width="12"
                             Height="12"
diff --git a/src/Semi.Avalonia/Controls/Expander.axaml b/src/Semi.Avalonia/Controls/Expander.axaml
index a7aea15..5517f9e 100644
--- a/src/Semi.Avalonia/Controls/Expander.axaml
+++ b/src/Semi.Avalonia/Controls/Expander.axaml
@@ -28,9 +28,9 @@
         <Setter Property="Expander.Template">
             <ControlTemplate TargetType="Expander">
                 <DockPanel>
-                    <LayoutTransformControl x:Name="ExpanderHeaderLayoutContainer" Margin="{DynamicResource ExpanderHeaderMargin}">
+                    <LayoutTransformControl Name="ExpanderHeaderLayoutContainer" Margin="{DynamicResource ExpanderHeaderMargin}">
                         <ToggleButton
-                            x:Name="ExpanderHeader"
+                            Name="ExpanderHeader"
                             Padding="{DynamicResource ExpanderHeaderPadding}"
                             HorizontalAlignment="Stretch"
                             HorizontalContentAlignment="Stretch"
@@ -65,12 +65,12 @@
                     </LayoutTransformControl>
                     <LayoutTransformControl Name="ExpanderContentLayoutContainer" MinHeight="1">
                         <Border
-                            x:Name="ExpanderContent"
+                            Name="ExpanderContent"
                             MinHeight="2"
                             BorderBrush="{DynamicResource ExpanderSeparatorBorderBrush}"
                             BorderThickness="0,0,0,1">
                             <ContentPresenter
-                                x:Name="PART_ContentPresenter"
+                                Name="PART_ContentPresenter"
                                 Margin="{DynamicResource ExpanderContentMargin}"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Semi.Avalonia/Controls/HyperlinkButton.axaml b/src/Semi.Avalonia/Controls/HyperlinkButton.axaml
index 87daa07..de6f406 100644
--- a/src/Semi.Avalonia/Controls/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Controls/HyperlinkButton.axaml
@@ -15,20 +15,20 @@
         <Setter Property="Background" Value="{DynamicResource HyperlinkButtonDefaultBackground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="HyperlinkButton">
-                <Grid ColumnDefinitions="Auto,*" x:Name="RootGrid">
+                <Grid ColumnDefinitions="Auto,*" Name="RootGrid">
                     <Grid
                         Grid.Column="0"
                         IsVisible="False"
                         Margin="0,0,8,0"
                         VerticalAlignment="Center"
-                        x:Name="IconGrid">
+                        Name="IconGrid">
                         <Border
                             Background="{DynamicResource HyperlinkButtonDefaultBackground}"
                             Height="{DynamicResource HyperlinkButtonIconHeight}"
                             Opacity="0"
                             UseLayoutRounding="False"
                             Width="{DynamicResource HyperlinkButtonIconWidth}"
-                            x:Name="BackgroundRectangle" />
+                            Name="BackgroundRectangle" />
                         <PathIcon
                             Data="{DynamicResource HyperlinkButtonLinkGlyph}"
                             Foreground="{DynamicResource HyperlinkButtonForeground}"
@@ -46,7 +46,7 @@
                         Padding="0,0,0,0"
                         RecognizesAccessKey="True"
                         VerticalAlignment="Center"
-                        x:Name="ContentPresenter" />
+                        Name="ContentPresenter" />
                 </Grid>
             </ControlTemplate>
         </Setter>
diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml
index 34439ec..7221f71 100644
--- a/src/Semi.Avalonia/Controls/ListBox.axaml
+++ b/src/Semi.Avalonia/Controls/ListBox.axaml
@@ -295,7 +295,7 @@
         <Setter Property="ListBoxItem.Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Margin="{TemplateBinding Margin}"
                     Padding="{TemplateBinding Padding}"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -544,7 +544,7 @@
         <Setter Property="ListBoxItem.Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Margin="{TemplateBinding Margin}"
                     Padding="{TemplateBinding Padding}"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -621,18 +621,18 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Border
-                    x:Name="RootBorder"
+                    Name="RootBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
-                    <Grid x:Name="RootGrid" ColumnDefinitions="Auto,*">
+                    <Grid Name="RootGrid" ColumnDefinitions="Auto,*">
                         <Grid
                             Grid.Column="0"
                             Margin="0,0,0,0"
                             VerticalAlignment="Center">
                             <Border
-                                x:Name="NormalRectangle"
+                                Name="NormalRectangle"
                                 Width="{DynamicResource ListBoxItemCheckBoxWidth}"
                                 Height="{DynamicResource ListBoxItemCheckBoxHeight}"
                                 Background="{DynamicResource ListBoxItemCheckDefaultBackground}"
@@ -647,7 +647,7 @@
                                 Foreground="{DynamicResource ListBoxItemCheckGlyphFill}" />
                         </Grid>
                         <ContentPresenter
-                            x:Name="ContentPresenter"
+                            Name="ContentPresenter"
                             Grid.Column="1"
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -803,13 +803,13 @@
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <Grid
-                        x:Name="RootGrid"
+                        Name="RootGrid"
                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                         ColumnDefinitions="Auto,*">
                         <Grid Grid.Column="0" VerticalAlignment="Top">
                             <Border
-                                x:Name="NormalRectangle"
+                                Name="NormalRectangle"
                                 Width="{DynamicResource ListBoxItemCheckBoxWidth}"
                                 Height="{DynamicResource ListBoxItemCheckBoxHeight}"
                                 Background="{DynamicResource ListBoxItemCheckDefaultBackground}"
@@ -825,7 +825,7 @@
 
                         </Grid>
                         <ContentPresenter
-                            x:Name="ContentPresenter"
+                            Name="ContentPresenter"
                             Grid.Column="1"
                             Margin="8,0,0,0"
                             VerticalAlignment="Center"
diff --git a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
index 9313982..c15cebf 100644
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -31,7 +31,7 @@
                         DockPanel.Dock="Left"
                         Theme="{DynamicResource CardBorder}">
                         <ListBox
-                            x:Name="PART_QuickLinks"
+                            Name="PART_QuickLinks"
                             Focusable="False"
                             ItemsSource="{Binding QuickLinks}"
                             SelectedIndex="{Binding QuickLinksSelectedIndex}">
@@ -50,7 +50,7 @@
                         </ListBox>
                     </Border>
                     <DockPanel
-                        x:Name="NavBar"
+                        Name="NavBar"
                         Margin="8,8,8,0"
                         VerticalAlignment="Center"
                         DockPanel.Dock="Top">
@@ -64,7 +64,7 @@
                                 Data="{DynamicResource ManagedFileChooserUpButtonGlyph}"
                                 Foreground="{DynamicResource ManagedFileChooserIconForeground}" />
                         </Button>
-                        <TextBox x:Name="Location" Text="{Binding Location}">
+                        <TextBox Name="Location" Text="{Binding Location}">
                             <TextBox.KeyBindings>
                                 <KeyBinding Command="{Binding EnterPressed}" Gesture="Enter" />
                             </TextBox.KeyBindings>
@@ -89,7 +89,7 @@
                             DockPanel.Dock="Left"
                             IsChecked="{Binding ShowHiddenFiles}" />
                         <UniformGrid
-                            x:Name="Finalize"
+                            Name="Finalize"
                             HorizontalAlignment="Right"
                             Rows="1">
                             <Button
diff --git a/src/Semi.Avalonia/Controls/Menu.axaml b/src/Semi.Avalonia/Controls/Menu.axaml
index 7bf0dda..f1d9241 100644
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/src/Semi.Avalonia/Controls/Menu.axaml
@@ -173,7 +173,7 @@
                                 ContentTemplate="{TemplateBinding HeaderTemplate}"
                                 RecognizesAccessKey="True" />
                             <TextBlock
-                                x:Name="PART_InputGestureText"
+                                Name="PART_InputGestureText"
                                 Grid.Column="3"
                                 Margin="{DynamicResource MenuItemInputGestureTextMargin}"
                                 HorizontalAlignment="Right"
diff --git a/src/Semi.Avalonia/Controls/NotificationCard.axaml b/src/Semi.Avalonia/Controls/NotificationCard.axaml
index 887e9ff..2fd8b85 100644
--- a/src/Semi.Avalonia/Controls/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Controls/NotificationCard.axaml
@@ -34,7 +34,7 @@
                         Background="{TemplateBinding Background}"
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <Border
-                            x:Name="PART_RootBorder"
+                            Name="PART_RootBorder"
                             Padding="{DynamicResource NotificationCardPadding}"
                             BoxShadow="{DynamicResource NotificationCardBoxShadows}"
                             BorderBrush="{TemplateBinding BorderBrush}"
diff --git a/src/Semi.Avalonia/Controls/ProgressBar.axaml b/src/Semi.Avalonia/Controls/ProgressBar.axaml
index 2c68a42..65fea16 100644
--- a/src/Semi.Avalonia/Controls/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Controls/ProgressBar.axaml
@@ -104,7 +104,7 @@
             <ControlTemplate TargetType="ProgressBar">
                 <Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, *, Auto">
                     <Border
-                        x:Name="ProgressBarRoot"
+                        Name="ProgressBarRoot"
                         Grid.Row="1"
                         Grid.Column="1"
                         Background="{TemplateBinding Background}"
@@ -113,31 +113,31 @@
                         ClipToBounds="True"
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <Panel>
-                            <Panel x:Name="DeterminateRoot" Opacity="1">
+                            <Panel Name="DeterminateRoot" Opacity="1">
                                 <Panel.Transitions>
                                     <Transitions>
                                         <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
                                     </Transitions>
                                 </Panel.Transitions>
                                 <Border
-                                    x:Name="PART_Indicator"
+                                    Name="PART_Indicator"
                                     Margin="{TemplateBinding Padding}"
                                     Background="{TemplateBinding Foreground}"
                                     CornerRadius="{TemplateBinding CornerRadius}" />
                             </Panel>
-                            <Panel x:Name="IndeterminateRoot" Opacity="0">
+                            <Panel Name="IndeterminateRoot" Opacity="0">
                                 <Panel.Transitions>
                                     <Transitions>
                                         <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
                                     </Transitions>
                                 </Panel.Transitions>
                                 <Border
-                                    x:Name="IndeterminateProgressBarIndicator"
+                                    Name="IndeterminateProgressBarIndicator"
                                     Margin="{TemplateBinding Padding}"
                                     Background="{TemplateBinding Foreground}"
                                     CornerRadius="{TemplateBinding CornerRadius}" />
                                 <Border
-                                    x:Name="IndeterminateProgressBarIndicator2"
+                                    Name="IndeterminateProgressBarIndicator2"
                                     Margin="{TemplateBinding Padding}"
                                     Background="{TemplateBinding Foreground}"
                                     CornerRadius="{TemplateBinding CornerRadius}" />
@@ -145,7 +145,7 @@
                         </Panel>
                     </Border>
                     <LayoutTransformControl
-                        x:Name="PART_LayoutTransformControl"
+                        Name="PART_LayoutTransformControl"
                         Grid.Row="1"
                         Grid.Column="1"
                         Margin="0"
diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml
index de52865..0422c3f 100644
--- a/src/Semi.Avalonia/Controls/RadioButton.axaml
+++ b/src/Semi.Avalonia/Controls/RadioButton.axaml
@@ -27,7 +27,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="RadioButton">
                 <Border
-                    x:Name="RootBorder"
+                    Name="RootBorder"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -38,7 +38,7 @@
                             TemplatedControl.IsTemplateFocusTarget="True"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                             <Ellipse
-                                x:Name="OuterEllipse"
+                                Name="OuterEllipse"
                                 Width="{DynamicResource RadioButtonIconRadius}"
                                 Height="{DynamicResource RadioButtonIconRadius}"
                                 Fill="{DynamicResource RadioButtonUncheckIconDefaultBackground}"
@@ -47,7 +47,7 @@
                                 UseLayoutRounding="False" />
 
                             <Ellipse
-                                x:Name="CheckGlyph"
+                                Name="CheckGlyph"
                                 Width="{DynamicResource RadioButtonGlyphRadius}"
                                 Height="{DynamicResource RadioButtonGlyphRadius}"
                                 Fill="{DynamicResource RadioButtonCheckGlyphFill}"
@@ -55,7 +55,7 @@
                                 UseLayoutRounding="False" />
                         </Panel>
                         <ContentPresenter
-                            x:Name="PART_ContentPresenter"
+                            Name="PART_ContentPresenter"
                             Grid.Column="1"
                             Margin="{DynamicResource RadioButtonContentMargin}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -166,7 +166,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="RadioButton">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Margin="{TemplateBinding Margin}"
                     Padding="{TemplateBinding Padding}"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -221,7 +221,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="RadioButton">
                 <Border
-                    x:Name="RootBorder"
+                    Name="RootBorder"
                     Padding="{TemplateBinding Padding}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
@@ -236,7 +236,7 @@
                             VerticalAlignment="Top"
                             Margin="{DynamicResource RadioButtonIconMargin}">
                             <Ellipse
-                                x:Name="OuterEllipse"
+                                Name="OuterEllipse"
                                 Width="{DynamicResource RadioButtonIconRadius}"
                                 Height="{DynamicResource RadioButtonIconRadius}"
                                 Fill="{DynamicResource RadioButtonUncheckIconDefaultBackground}"
@@ -245,7 +245,7 @@
                                 UseLayoutRounding="False" />
 
                             <Ellipse
-                                x:Name="CheckGlyph"
+                                Name="CheckGlyph"
                                 Width="{DynamicResource RadioButtonGlyphRadius}"
                                 Height="{DynamicResource RadioButtonGlyphRadius}"
                                 Fill="{DynamicResource RadioButtonCheckGlyphFill}"
@@ -254,7 +254,7 @@
                         </Panel>
 
                         <ContentPresenter
-                            x:Name="PART_ContentPresenter"
+                            Name="PART_ContentPresenter"
                             Grid.Column="1"
                             Margin="{DynamicResource RadioButtonContentMargin}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -372,7 +372,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="RadioButton">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Semi.Avalonia/Controls/RepeatButton.axaml b/src/Semi.Avalonia/Controls/RepeatButton.axaml
index 357c94f..e51a0ef 100644
--- a/src/Semi.Avalonia/Controls/RepeatButton.axaml
+++ b/src/Semi.Avalonia/Controls/RepeatButton.axaml
@@ -22,7 +22,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="RepeatButton">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
diff --git a/src/Semi.Avalonia/Controls/Slider.axaml b/src/Semi.Avalonia/Controls/Slider.axaml
index 6eb16dc..0e877d5 100644
--- a/src/Semi.Avalonia/Controls/Slider.axaml
+++ b/src/Semi.Avalonia/Controls/Slider.axaml
@@ -77,7 +77,7 @@
                 <ControlTemplate TargetType="Slider">
                     <DataValidationErrors>
                         <Grid
-                            x:Name="SliderContainer"
+                            Name="SliderContainer"
                             Margin="{TemplateBinding Padding}"
                             Background="Transparent"
                             RowDefinitions="Auto,Auto,Auto">
@@ -154,7 +154,7 @@
                 <ControlTemplate>
                     <DataValidationErrors>
                         <Grid
-                            x:Name="SliderContainer"
+                            Name="SliderContainer"
                             Margin="{TemplateBinding Padding}"
                             Background="{DynamicResource SliderContainerBackground}"
                             ColumnDefinitions="Auto,Auto,Auto">
diff --git a/src/Semi.Avalonia/Controls/SplitButton.axaml b/src/Semi.Avalonia/Controls/SplitButton.axaml
index 027b580..c412797 100644
--- a/src/Semi.Avalonia/Controls/SplitButton.axaml
+++ b/src/Semi.Avalonia/Controls/SplitButton.axaml
@@ -25,7 +25,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="Button">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     Padding="{TemplateBinding Padding}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
@@ -69,7 +69,7 @@
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <DockPanel>
                         <Button
-                            x:Name="PART_SecondaryButton"
+                            Name="PART_SecondaryButton"
                             Padding="4,0"
                             VerticalAlignment="Stretch"
                             HorizontalContentAlignment="Center"
@@ -87,14 +87,14 @@
                                 Foreground="{Binding $parent[Button].Foreground}" />
                         </Button>
                         <Rectangle
-                            x:Name="SeparatorBorder"
+                            Name="SeparatorBorder"
                             Width="{DynamicResource SplitButtonSeparatorWidth}"
                             VerticalAlignment="Stretch"
                             DockPanel.Dock="Right"
                             Fill="{TemplateBinding BorderBrush}"
                             StrokeThickness="0" />
                         <Button
-                            x:Name="PART_PrimaryButton"
+                            Name="PART_PrimaryButton"
                             Padding="{TemplateBinding Padding}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
diff --git a/src/Semi.Avalonia/Controls/SplitView.axaml b/src/Semi.Avalonia/Controls/SplitView.axaml
index 852ffc2..d97349f 100644
--- a/src/Semi.Avalonia/Controls/SplitView.axaml
+++ b/src/Semi.Avalonia/Controls/SplitView.axaml
@@ -23,7 +23,7 @@
                             ClipToBounds="True"
                             ZIndex="100">
                             <ContentPresenter
-                                x:Name="PART_PanePresenter"
+                                Name="PART_PanePresenter"
                                 Content="{TemplateBinding Pane}"
                                 ContentTemplate="{TemplateBinding PaneTemplate}" />
                             <Rectangle
@@ -35,7 +35,7 @@
 
                         <Panel Name="ContentRoot">
                             <ContentPresenter
-                                x:Name="PART_ContentPresenter"
+                                Name="PART_ContentPresenter"
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}" />
                             <Rectangle
@@ -114,7 +114,7 @@
                             ClipToBounds="True"
                             ZIndex="100">
                             <ContentPresenter
-                                x:Name="PART_PanePresenter"
+                                Name="PART_PanePresenter"
                                 Content="{TemplateBinding Pane}"
                                 ContentTemplate="{TemplateBinding PaneTemplate}" />
                             <Rectangle
@@ -126,7 +126,7 @@
 
                         <Panel Name="ContentRoot">
                             <ContentPresenter
-                                x:Name="PART_ContentPresenter"
+                                Name="PART_ContentPresenter"
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}" />
                             <Rectangle Name="LightDismissLayer" IsVisible="False" />
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index e913134..72b5d4e 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -2,8 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-
     <ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
         <Setter Property="Width" Value="242" />
         <Setter Property="MinWidth" Value="242" />
@@ -145,7 +143,7 @@
                         Margin="{TemplateBinding Padding}"
                         ColumnDefinitions="*, Auto">
                         <Button
-                            x:Name="PART_FlyoutButton"
+                            Name="PART_FlyoutButton"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
                             Width="242"
@@ -166,12 +164,12 @@
                                 <Grid Name="PART_FlyoutButtonContentGrid" Grid.Column="0">
                                     <!--  Ignore col defs here, set in code  -->
                                     <Border
-                                        x:Name="PART_FirstPickerHost"
+                                        Name="PART_FirstPickerHost"
                                         Grid.Column="0"
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Stretch">
                                         <TextBlock
-                                            x:Name="PART_HourTextBlock"
+                                            Name="PART_HourTextBlock"
                                             Padding="12,0"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
@@ -189,12 +187,12 @@
                                         Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
 
                                     <Border
-                                        x:Name="PART_SecondPickerHost"
+                                        Name="PART_SecondPickerHost"
                                         Grid.Column="2"
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Stretch">
                                         <TextBlock
-                                            x:Name="PART_MinuteTextBlock"
+                                            Name="PART_MinuteTextBlock"
                                             Padding="12,0"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
@@ -212,12 +210,12 @@
                                         Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
 
                                     <Border
-                                        x:Name="PART_ThirdPickerHost"
+                                        Name="PART_ThirdPickerHost"
                                         Grid.Column="4"
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Stretch">
                                         <TextBlock
-                                            x:Name="PART_PeriodTextBlock"
+                                            Name="PART_PeriodTextBlock"
                                             Padding="12,0"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
diff --git a/src/Semi.Avalonia/Controls/TitleBar.axaml b/src/Semi.Avalonia/Controls/TitleBar.axaml
index de0b3cd..cd17244 100644
--- a/src/Semi.Avalonia/Controls/TitleBar.axaml
+++ b/src/Semi.Avalonia/Controls/TitleBar.axaml
@@ -11,16 +11,16 @@
             <ControlTemplate>
                 <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
                     <Panel
-                        x:Name="PART_MouseTracker"
+                        Name="PART_MouseTracker"
                         Height="1"
                         VerticalAlignment="Top" />
-                    <Panel x:Name="PART_Container">
+                    <Panel Name="PART_Container">
                         <Border
-                            x:Name="PART_Background"
+                            Name="PART_Background"
                             Background="{TemplateBinding Background}"
                             IsHitTestVisible="False" />
                         <CaptionButtons
-                            x:Name="PART_CaptionButtons"
+                            Name="PART_CaptionButtons"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Top"
                             Foreground="{TemplateBinding Foreground}" />
diff --git a/src/Semi.Avalonia/Controls/ToggleButton.axaml b/src/Semi.Avalonia/Controls/ToggleButton.axaml
index 730a0e8..86dcf60 100644
--- a/src/Semi.Avalonia/Controls/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleButton.axaml
@@ -39,7 +39,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="ToggleButton">
                 <ContentPresenter
-                    x:Name="PART_ContentPresenter"
+                    Name="PART_ContentPresenter"
                     BackgroundSizing="{TemplateBinding BackgroundSizing}"
                     Padding="{TemplateBinding Padding}"
                     HorizontalAlignment="Stretch"
diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
index f495b36..40fded7 100644
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -38,7 +38,7 @@
                     RowDefinitions="Auto,*"
                     ColumnDefinitions="Auto, *">
                     <ContentPresenter
-                        x:Name="PART_ContentPresenter"
+                        Name="PART_ContentPresenter"
                         Grid.Row="0" Grid.Column="0"
                         Grid.ColumnSpan="2"
                         Margin="{DynamicResource ToggleSwitchHeaderMargin}"
@@ -49,7 +49,7 @@
                         RecognizesAccessKey="True" />
 
                     <Border
-                        x:Name="SwitchBackgroundBorder"
+                        Name="SwitchBackgroundBorder"
                         Grid.Row="1" Grid.Column="0"
                         TemplatedControl.IsTemplateFocusTarget="True"
                         Width="{DynamicResource ToggleSwitchDefaultWidth}"
@@ -61,22 +61,22 @@
                             </Transitions>
                         </Border.Transitions>
                         <Canvas
-                            x:Name="PART_SwitchKnob"
+                            Name="PART_SwitchKnob"
                             Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                             Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                             HorizontalAlignment="Left">
                             <Grid
-                                x:Name="PART_MovingKnobs"
+                                Name="PART_MovingKnobs"
                                 Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                                 Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                                 Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}">
                                 <Border
-                                    x:Name="SwitchKnobIndicator"
+                                    Name="SwitchKnobIndicator"
                                     Background="White"
                                     BoxShadow="0 0 1 1 #222E3238"
                                     CornerRadius="100" />
                                 <Arc
-                                    x:Name="SwitchKnobLoadingIndicator"
+                                    Name="SwitchKnobLoadingIndicator"
                                     IsVisible="False"
                                     StrokeThickness="2"
                                     StartAngle="0"
@@ -111,7 +111,7 @@
                     </Border>
 
                     <ContentPresenter
-                        x:Name="PART_OnContentPresenter"
+                        Name="PART_OnContentPresenter"
                         Grid.Row="1" Grid.Column="1"
                         Margin="{DynamicResource ToggleSwitchOnContentMargin}"
                         HorizontalAlignment="Left"
@@ -120,7 +120,7 @@
                         Content="{TemplateBinding OnContent}"
                         ContentTemplate="{TemplateBinding OnContentTemplate}" />
                     <ContentPresenter
-                        x:Name="PART_OffContentPresenter"
+                        Name="PART_OffContentPresenter"
                         Grid.Row="1" Grid.Column="1"
                         Margin="{DynamicResource ToggleSwitchOnContentMargin}"
                         HorizontalAlignment="Left"
@@ -255,15 +255,15 @@
                     CornerRadius="{TemplateBinding CornerRadius}"
                     Cursor="Hand">
                     <Panel>
-                        <Panel x:Name="PART_SwitchKnob" />
-                        <Panel x:Name="PART_MovingKnobs" />
+                        <Panel Name="PART_SwitchKnob" />
+                        <Panel Name="PART_MovingKnobs" />
                         <ContentPresenter
-                            x:Name="PART_OnContentPresenter"
+                            Name="PART_OnContentPresenter"
                             Margin="{DynamicResource ToggleSwitchOnContentMargin}"
                             Content="{TemplateBinding OnContent}"
                             ContentTemplate="{TemplateBinding OnContentTemplate}" />
                         <ContentPresenter
-                            x:Name="PART_OffContentPresenter"
+                            Name="PART_OffContentPresenter"
                             Margin="{DynamicResource ToggleSwitchOnContentMargin}"
                             Content="{TemplateBinding OffContent}"
                             ContentTemplate="{TemplateBinding OffContentTemplate}" />
@@ -289,7 +289,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="ToggleSwitch">
                 <Border
-                    x:Name="SwitchBackgroundBorder"
+                    Name="SwitchBackgroundBorder"
                     Background="{TemplateBinding Background}"
                     Cursor="Hand"
                     Width="{DynamicResource ToggleSwitchDefaultWidth}"
@@ -303,24 +303,24 @@
                     <Grid
                         ColumnDefinitions="*,*">
                         <Canvas
-                            x:Name="PART_SwitchKnob"
+                            Name="PART_SwitchKnob"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
                             Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                             Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                             HorizontalAlignment="Left">
                             <Grid
-                                x:Name="PART_MovingKnobs"
+                                Name="PART_MovingKnobs"
                                 Width="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                                 Height="{DynamicResource ToggleSwitchIndicatorDefaultWidth}"
                                 Margin="{DynamicResource ToggleSwitchIndicatorDefaultMargin}">
                                 <Border
-                                    x:Name="SwitchKnobIndicator"
+                                    Name="SwitchKnobIndicator"
                                     Background="White"
                                     BoxShadow="0 0 1 1 #222E3238"
                                     CornerRadius="100" />
                                 <Arc
-                                    x:Name="SwitchKnobLoadingIndicator"
+                                    Name="SwitchKnobLoadingIndicator"
                                     IsVisible="False"
                                     StrokeThickness="2"
                                     StartAngle="0"
@@ -353,7 +353,7 @@
                             </Grid>
                         </Canvas>
                         <ContentPresenter
-                            x:Name="PART_OnContentPresenter"
+                            Name="PART_OnContentPresenter"
                             Grid.Column="0"
                             VerticalAlignment="Center"
                             HorizontalAlignment="Center"
@@ -362,7 +362,7 @@
                             Content="{TemplateBinding OnContent}"
                             ContentTemplate="{TemplateBinding OnContentTemplate}" />
                         <ContentPresenter
-                            x:Name="PART_OffContentPresenter"
+                            Name="PART_OffContentPresenter"
                             Grid.Column="1"
                             VerticalAlignment="Center"
                             HorizontalAlignment="Center"