diff --git a/src/Semi.Avalonia/Controls/Border.axaml b/src/Semi.Avalonia/Controls/Border.axaml
index 53806cf..9967017 100644
--- a/src/Semi.Avalonia/Controls/Border.axaml
+++ b/src/Semi.Avalonia/Controls/Border.axaml
@@ -17,12 +17,12 @@
     </Design.PreviewWith>
 
     <ControlTheme x:Key="CardBorder" TargetType="Border">
-        <Setter Property="Border.Padding" Value="{DynamicResource ThicknessCardPadding}" />
-        <Setter Property="Border.BorderBrush" Value="{DynamicResource BorderCardBorderBrush}" />
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource RadiusCardCornerRadius}" />
-        <Setter Property="Border.Background" Value="{DynamicResource BorderCardBackground}" />
-        <Setter Property="Border.BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" />
-        <Setter Property="Border.Margin" Value="{DynamicResource ThicknessCardMargin}" />
+        <Setter Property="Padding" Value="{DynamicResource ThicknessCardPadding}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderCardBorderBrush}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource RadiusCardCornerRadius}" />
+        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" />
+        <Setter Property="Margin" Value="{DynamicResource ThicknessCardMargin}" />
         <Style Selector="^.Shadow">
             <Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml
index ed2379a..cb2dab2 100644
--- a/src/Semi.Avalonia/Controls/Carousel.axaml
+++ b/src/Semi.Avalonia/Controls/Carousel.axaml
@@ -26,9 +26,9 @@
 
     <ControlTheme x:Key="CarouselIndicatorDotListBoxItem" TargetType="ListBoxItem">
         <!--  Use fit in different color themes, Use Foreground to normal, Background to hover, BorderBrush to Selected  -->
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.Foreground" Value="{DynamicResource CarouselIndicatorForeground}" />
-        <Setter Property="ListBoxItem.Template">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorForeground}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Panel>
                     <Border Padding="4" Background="Transparent">
@@ -56,9 +56,9 @@
 
     <ControlTheme x:Key="CarouselIndicatorLineListBoxItem" TargetType="ListBoxItem">
         <!--  Use fit in different color themes, Use Foreground to normal, Background to hover, BorderBrush to Selected  -->
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.Background" Value="{DynamicResource CarouselIndicatorForeground}" />
-        <Setter Property="ListBoxItem.Template">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Background" Value="{DynamicResource CarouselIndicatorForeground}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Panel Background="Transparent">
                     <Border Padding="2,0" Background="Transparent">
@@ -83,9 +83,9 @@
     </ControlTheme>
 
     <ControlTheme x:Key="CarouselIndicatorColumnarListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.Cursor" Value="Hand" />
-        <Setter Property="ListBoxItem.Background" Value="{DynamicResource CarouselIndicatorForeground}" />
-        <Setter Property="ListBoxItem.Template">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Background" Value="{DynamicResource CarouselIndicatorForeground}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Panel Background="Transparent">
                     <Border Padding="2,0" Background="Transparent">
@@ -120,9 +120,9 @@
     </ControlTheme>
 
     <ControlTheme x:Key="CarouselButton" TargetType="Button">
-        <Setter Property="Button.Cursor" Value="Hand" />
-        <Setter Property="Button.Foreground" Value="{DynamicResource CarouselButtonForeground}" />
-        <Setter Property="Button.Template">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Foreground" Value="{DynamicResource CarouselButtonForeground}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="Button">
                 <Grid Background="Transparent">
                     <PathIcon
diff --git a/src/Semi.Avalonia/Controls/ContextMenu.axaml b/src/Semi.Avalonia/Controls/ContextMenu.axaml
index 4bd99ec..71b91aa 100644
--- a/src/Semi.Avalonia/Controls/ContextMenu.axaml
+++ b/src/Semi.Avalonia/Controls/ContextMenu.axaml
@@ -3,18 +3,18 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <ControlTheme x:Key="{x:Type ContextMenu}" TargetType="ContextMenu">
-        <Setter Property="ContextMenu.Background" Value="{DynamicResource MenuFlyoutBackground}" />
-        <Setter Property="ContextMenu.BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" />
-        <Setter Property="ContextMenu.BorderThickness" Value="{DynamicResource MenuFlyoutBorderThickness}" />
-        <Setter Property="ContextMenu.CornerRadius" Value="{DynamicResource MenuFlyoutCornerRadius}" />
-        <Setter Property="ContextMenu.MaxWidth" Value="{DynamicResource MenuFlyoutMaxWidth}" />
-        <Setter Property="ContextMenu.MinHeight" Value="{DynamicResource MenuFlyoutMinHeight}" />
-        <Setter Property="ContextMenu.Padding" Value="{DynamicResource MenuFlyoutPadding}" />
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource MenuFlyoutCornerRadius}" />
+        <Setter Property="MaxWidth" Value="{DynamicResource MenuFlyoutMaxWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutMinHeight}" />
+        <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPadding}" />
         <Setter Property="Focusable" Value="True"></Setter>
-        <Setter Property="ContextMenu.HorizontalAlignment" Value="Stretch" />
-        <Setter Property="TextBlock.FontWeight" Value="Normal" />
-        <Setter Property="ContextMenu.WindowManagerAddShadowHint" Value="False" />
-        <Setter Property="ContextMenu.Template">
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="WindowManagerAddShadowHint" Value="False" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ContextMenu">
                 <Border
                     MinHeight="{TemplateBinding MinHeight}"
diff --git a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
index 6fa26a2..eecfc4e 100644
--- a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
@@ -57,7 +57,7 @@
         x:Key="DateTimePickerItem"
         BasedOn="{StaticResource {x:Type ListBoxItem}}"
         TargetType="ListBoxItem">
-        <Setter Property="ListBoxItem.CornerRadius" Value="0" />
+        <Setter Property="CornerRadius" Value="0" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Background" Value="{DynamicResource DateTimePickerListItemBackground}" />
diff --git a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
index 18d9663..22e5c05 100644
--- a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
@@ -3,24 +3,24 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <ControlTheme x:Key="{x:Type FlyoutPresenter}" TargetType="FlyoutPresenter">
-        <Setter Property="FlyoutPresenter.HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="FlyoutPresenter.VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="FlyoutPresenter.UseLayoutRounding" Value="False" />
-        <Setter Property="FlyoutPresenter.FontWeight" Value="{DynamicResource FlyoutFontWeight}" />
-        <Setter Property="FlyoutPresenter.Background" Value="{DynamicResource FlyoutBackground}" />
-        <Setter Property="FlyoutPresenter.BorderBrush" Value="{DynamicResource FlyoutBorderBrush}" />
-        <Setter Property="FlyoutPresenter.BorderThickness" Value="{DynamicResource FlyoutBorderThickness}" />
-        <Setter Property="FlyoutPresenter.Padding" Value="{DynamicResource FlyoutPadding}" />
-        <Setter Property="FlyoutPresenter.MinWidth" Value="{DynamicResource FlyoutMinWidth}" />
-        <Setter Property="FlyoutPresenter.MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" />
-        <Setter Property="FlyoutPresenter.MinHeight" Value="{DynamicResource FlyoutMinHeight}" />
-        <Setter Property="FlyoutPresenter.MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" />
-        <Setter Property="FlyoutPresenter.Foreground" Value="{DynamicResource FlyoutForeground}" />
-        <Setter Property="FlyoutPresenter.ClipToBounds" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="UseLayoutRounding" Value="False" />
+        <Setter Property="FontWeight" Value="{DynamicResource FlyoutFontWeight}" />
+        <Setter Property="Background" Value="{DynamicResource FlyoutBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource FlyoutBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource FlyoutBorderThickness}" />
+        <Setter Property="Padding" Value="{DynamicResource FlyoutPadding}" />
+        <Setter Property="MinWidth" Value="{DynamicResource FlyoutMinWidth}" />
+        <Setter Property="MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource FlyoutMinHeight}" />
+        <Setter Property="MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" />
+        <Setter Property="Foreground" Value="{DynamicResource FlyoutForeground}" />
+        <Setter Property="ClipToBounds" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="FlyoutPresenter.CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" />
-        <Setter Property="FlyoutPresenter.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="FlyoutPresenter">
                 <Border
                     Name="LayoutRoot"
@@ -48,25 +48,25 @@
     </ControlTheme>
 
     <ControlTheme x:Key="LightFlyout" TargetType="FlyoutPresenter">
-        <Setter Property="FlyoutPresenter.HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="FlyoutPresenter.VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="FlyoutPresenter.UseLayoutRounding" Value="False" />
-        <Setter Property="FlyoutPresenter.FontWeight" Value="{DynamicResource FlyoutFontWeight}" />
-        <Setter Property="FlyoutPresenter.Background" Value="Transparent" />
-        <Setter Property="FlyoutPresenter.BorderBrush" Value="Transparent" />
-        <Setter Property="FlyoutPresenter.BorderThickness" Value="0" />
-        <Setter Property="FlyoutPresenter.Padding" Value="{DynamicResource FlyoutPadding}" />
-        <Setter Property="FlyoutPresenter.MinWidth" Value="{DynamicResource FlyoutMinWidth}" />
-        <Setter Property="FlyoutPresenter.MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" />
-        <Setter Property="FlyoutPresenter.MinHeight" Value="{DynamicResource FlyoutMinHeight}" />
-        <Setter Property="FlyoutPresenter.MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" />
-        <Setter Property="FlyoutPresenter.Foreground" Value="{DynamicResource FlyoutForeground}" />
-        <Setter Property="FlyoutPresenter.ClipToBounds" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="UseLayoutRounding" Value="False" />
+        <Setter Property="FontWeight" Value="{DynamicResource FlyoutFontWeight}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="{DynamicResource FlyoutPadding}" />
+        <Setter Property="MinWidth" Value="{DynamicResource FlyoutMinWidth}" />
+        <Setter Property="MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource FlyoutMinHeight}" />
+        <Setter Property="MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" />
+        <Setter Property="Foreground" Value="{DynamicResource FlyoutForeground}" />
+        <Setter Property="ClipToBounds" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="FlyoutPresenter.CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" />
-        <Setter Property="FlyoutPresenter.Margin" Value="4" />
-        <Setter Property="FlyoutPresenter.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" />
+        <Setter Property="Margin" Value="4" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="FlyoutPresenter">
                 <Border
                     Name="LayoutRoot"
diff --git a/src/Semi.Avalonia/Controls/Label.axaml b/src/Semi.Avalonia/Controls/Label.axaml
index 0896757..8704368 100644
--- a/src/Semi.Avalonia/Controls/Label.axaml
+++ b/src/Semi.Avalonia/Controls/Label.axaml
@@ -80,8 +80,8 @@
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type Label}" TargetType="Label">
-        <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
-        <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
+        <Setter Property="FontSize" Value="{DynamicResource TextBlockFontSize}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="Label">
                 <ContentPresenter
@@ -138,7 +138,7 @@
         x:Key="TitleLabel"
         BasedOn="{StaticResource {x:Type Label}}"
         TargetType="Label">
-        <Setter Property="Label.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
+        <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
             <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
@@ -164,14 +164,14 @@
     <!--  Size: Small, Large. Default is Small  -->
     <!--  Color: Red, Pink, Purple, Violet, Indigo, Blue, LightBlue, Cyan, Teal, Green, LightGreen, Lime, Yellow, Amber, Orange, Grey, White. Default is Grey  -->
     <ControlTheme x:Key="TagLabel" TargetType="Label">
-        <Setter Property="Label.BorderThickness" Value="{DynamicResource LabelTagBorderThickness}" />
-        <Setter Property="Label.MinHeight" Value="{DynamicResource LabelTagSmallHeight}" />
-        <Setter Property="Label.CornerRadius" Value="{DynamicResource LabelTagSquareCornerRadius}" />
-        <Setter Property="Label.HorizontalAlignment" Value="Left" />
-        <Setter Property="Label.UseLayoutRounding" Value="False" />
-        <Setter Property="Label.VerticalAlignment" Value="Center" />
-        <Setter Property="Label.Padding" Value="{DynamicResource LabelTagSmallPadding}" />
-        <Setter Property="Label.FontSize" Value="{DynamicResource LabelTagFontSize}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource LabelTagBorderThickness}" />
+        <Setter Property="MinHeight" Value="{DynamicResource LabelTagSmallHeight}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource LabelTagSquareCornerRadius}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="UseLayoutRounding" Value="False" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Padding" Value="{DynamicResource LabelTagSmallPadding}" />
+        <Setter Property="FontSize" Value="{DynamicResource LabelTagFontSize}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="Label">
                 <ContentPresenter
diff --git a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
index e461318..be7b5ba 100644
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -21,7 +21,7 @@
         <StreamGeometry x:Key="Icon_Volume">M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z</StreamGeometry>
     </converters:KeyToPathConverter>
     <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}" TargetType="dialogs:ManagedFileChooser">
-        <Setter Property="dialogs:ManagedFileChooser.Template">
+        <Setter Property="Template">
             <ControlTemplate x:DataType="internal:ManagedFileChooserViewModel" TargetType="dialogs:ManagedFileChooser">
                 <DockPanel>
                     <Border
diff --git a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml b/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
index c727b68..91f9651 100644
--- a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
@@ -18,17 +18,17 @@
     </Design.PreviewWith>
 
     <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter">
-        <Setter Property="MenuFlyoutPresenter.Background" Value="{DynamicResource MenuFlyoutBackground}" />
-        <Setter Property="MenuFlyoutPresenter.BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" />
-        <Setter Property="MenuFlyoutPresenter.BorderThickness" Value="{DynamicResource MenuFlyoutBorderThickness}" />
-        <Setter Property="MenuFlyoutPresenter.Padding" Value="{DynamicResource MenuFlyoutPadding}" />
-        <Setter Property="MenuFlyoutPresenter.FontSize" Value="{DynamicResource TextBlockFontSize}" />
-        <Setter Property="MenuFlyoutPresenter.FontWeight" Value="{DynamicResource TextBlockFontWeight}" />
-        <Setter Property="MenuFlyoutPresenter.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutBorderThickness}" />
+        <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPadding}" />
+        <Setter Property="FontSize" Value="{DynamicResource TextBlockFontSize}" />
+        <Setter Property="FontWeight" Value="{DynamicResource TextBlockFontWeight}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="MenuFlyoutPresenter.CornerRadius" Value="{DynamicResource MenuFlyoutCornerRadius}" />
-        <Setter Property="MenuFlyoutPresenter.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource MenuFlyoutCornerRadius}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="MenuFlyoutPresenter">
                 <Border
                     Name="LayoutRoot"
diff --git a/src/Semi.Avalonia/Controls/NumericUpDown.axaml b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
index 3a4210d..20277df 100644
--- a/src/Semi.Avalonia/Controls/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
@@ -3,11 +3,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
-        <Setter Property="NumericUpDown.VerticalAlignment" Value="Center" />
-        <Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
-        <Setter Property="NumericUpDown.CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
-        <Setter Property="NumericUpDown.MinHeight" Value="{DynamicResource NumericUpDownDefaultHeight}" />
-        <Setter Property="NumericUpDown.Template">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
+        <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownDefaultHeight}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="NumericUpDown">
                 <DataValidationErrors>
                     <ButtonSpinner
diff --git a/src/Semi.Avalonia/Controls/PathIcon.axaml b/src/Semi.Avalonia/Controls/PathIcon.axaml
index 489f032..d7c18a6 100644
--- a/src/Semi.Avalonia/Controls/PathIcon.axaml
+++ b/src/Semi.Avalonia/Controls/PathIcon.axaml
@@ -3,9 +3,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon">
-        <Setter Property="PathIcon.Background" Value="Transparent" />
-        <Setter Property="PathIcon.Height" Value="{DynamicResource IconElementThemeHeight}" />
-        <Setter Property="PathIcon.Width" Value="{DynamicResource IconElementThemeWidth}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+        <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="PathIcon">
                 <Border Background="{TemplateBinding Background}">
diff --git a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml b/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
index aad359e..8faeeba 100644
--- a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
+++ b/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
@@ -12,11 +12,11 @@
     </MenuFlyout>
 
     <ControlTheme x:Key="{x:Type SelectableTextBlock}" TargetType="SelectableTextBlock">
-        <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
-        <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockFontSize}" />
-        <Setter Property="SelectableTextBlock.Cursor" Value="Ibeam" />
-        <Setter Property="SelectableTextBlock.SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
-        <Setter Property="SelectableTextBlock.SelectionForegroundBrush" Value="{DynamicResource TextBlockSelectionForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />
+        <Setter Property="FontSize" Value="{DynamicResource TextBlockFontSize}" />
+        <Setter Property="Cursor" Value="Ibeam" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBlockSelectionForeground}" />
         <Style Selector="^.Secondary">
             <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>
diff --git a/src/Semi.Avalonia/Controls/Slider.axaml b/src/Semi.Avalonia/Controls/Slider.axaml
index af43caf..93601a6 100644
--- a/src/Semi.Avalonia/Controls/Slider.axaml
+++ b/src/Semi.Avalonia/Controls/Slider.axaml
@@ -43,11 +43,11 @@
     </ControlTheme>
 
     <ControlTheme x:Key="SliderThumbTheme" TargetType="Thumb">
-        <Setter Property="Thumb.CornerRadius" Value="{DynamicResource SliderThumbCornerRadius}" />
-        <Setter Property="Thumb.Cursor" Value="Hand" />
-        <Setter Property="Thumb.Background" Value="{DynamicResource SliderThumbBackground}" />
-        <Setter Property="Thumb.BorderBrush" Value="{DynamicResource SliderThumbBorderBrush}" />
-        <Setter Property="Thumb.BorderThickness" Value="{DynamicResource SliderThumbBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource SliderThumbCornerRadius}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SliderThumbBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource SliderThumbBorderThickness}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="Thumb">
                 <Border
diff --git a/src/Semi.Avalonia/Controls/TabItem.axaml b/src/Semi.Avalonia/Controls/TabItem.axaml
index 3e1c19b..ce31e3f 100644
--- a/src/Semi.Avalonia/Controls/TabItem.axaml
+++ b/src/Semi.Avalonia/Controls/TabItem.axaml
@@ -12,13 +12,13 @@
     </Design.PreviewWith>
 
     <ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem">
-        <Setter Property="TabItem.Background" Value="{DynamicResource TabItemLinePipeBackground}" />
-        <Setter Property="TabItem.Foreground" Value="{DynamicResource TabItemLineHeaderForeground}" />
-        <Setter Property="TabItem.Margin" Value="0" />
-        <Setter Property="TabItem.Padding" Value="8 4" />
-        <Setter Property="TabItem.MinHeight" Value="5" />
-        <Setter Property="TabItem.VerticalContentAlignment" Value="Center" />
-        <Setter Property="TabItem.Template">
+        <Setter Property="Background" Value="{DynamicResource TabItemLinePipeBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderForeground}" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="8 4" />
+        <Setter Property="MinHeight" Value="5" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="TabItem">
                 <Border
                     Name="PART_LayoutRoot"
diff --git a/src/Semi.Avalonia/Controls/TabStrip.axaml b/src/Semi.Avalonia/Controls/TabStrip.axaml
index 23ea298..76dd5c7 100644
--- a/src/Semi.Avalonia/Controls/TabStrip.axaml
+++ b/src/Semi.Avalonia/Controls/TabStrip.axaml
@@ -31,13 +31,13 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type TabStripItem}" TargetType="TabStripItem">
-        <Setter Property="TabStripItem.Background" Value="{DynamicResource TabItemLinePipeBackground}" />
-        <Setter Property="TabStripItem.Foreground" Value="{DynamicResource TabItemLineHeaderForeground}" />
-        <Setter Property="TabStripItem.Margin" Value="0" />
-        <Setter Property="TabStripItem.Padding" Value="8 4" />
-        <Setter Property="TabStripItem.MinHeight" Value="5" />
-        <Setter Property="TabStripItem.VerticalContentAlignment" Value="Center" />
-        <Setter Property="TabStripItem.Template">
+        <Setter Property="Background" Value="{DynamicResource TabItemLinePipeBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderForeground}" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="8 4" />
+        <Setter Property="MinHeight" Value="5" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="TabStripItem">
                 <Border
                     Name="PART_LayoutRoot"
diff --git a/src/Semi.Avalonia/Controls/TextBlock.axaml b/src/Semi.Avalonia/Controls/TextBlock.axaml
index 53cab3e..742d64c 100644
--- a/src/Semi.Avalonia/Controls/TextBlock.axaml
+++ b/src/Semi.Avalonia/Controls/TextBlock.axaml
@@ -52,7 +52,7 @@
         x:Key="TitleTextBlock"
         BasedOn="{StaticResource {x:Type TextBlock}}"
         TargetType="TextBlock">
-        <Setter Property="TextBlock.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
+        <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
             <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index f22a163..e2d5dfa 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -510,9 +510,9 @@
     </ControlTheme>
 
     <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
-        <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
-        <Setter Property="ToggleButton.Cursor" Value="Hand" />
-        <Setter Property="ToggleButton.Template">
+        <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="ToggleButton">
                 <!--  Background must be transparent or hit test will fail  -->
                 <Panel Background="Transparent">
diff --git a/src/Semi.Avalonia/Controls/TreeView.axaml b/src/Semi.Avalonia/Controls/TreeView.axaml
index bccadae..2c741f4 100644
--- a/src/Semi.Avalonia/Controls/TreeView.axaml
+++ b/src/Semi.Avalonia/Controls/TreeView.axaml
@@ -59,7 +59,7 @@
         Left="True" />
     <ControlTheme x:Key="ToggleButtonTreeViewItemIconButton" TargetType="ToggleButton">
         <Setter Property="Margin" Value="0" />
-        <Setter Property="ToggleButton.Cursor" Value="Hand" />
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ToggleButton">
                 <Border