From 1fa66bd469f29c201080824eb319bdbe11590f49 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 10 Oct 2023 00:35:53 +0800
Subject: [PATCH] misc: remove redundant property type qualifier.

---
 demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml  |   6 +-
 .../Controls/ColorPicker.axaml                |  16 +-
 .../Controls/ColorView.axaml                  |  28 +-
 src/Semi.Avalonia.DataGrid/DataGrid.axaml     |   4 +-
 .../TreeDataGrid.axaml                        |   2 +-
 .../Controls/AutoCompleteBox.axaml            |   4 +-
 src/Semi.Avalonia/Controls/Border.axaml       |   4 +-
 src/Semi.Avalonia/Controls/Button.axaml       | 134 +++++-----
 .../Controls/ButtonSpinner.axaml              |   2 +-
 src/Semi.Avalonia/Controls/Calendar.axaml     |  24 +-
 .../Controls/CalendarDatePicker.axaml         |  30 +--
 src/Semi.Avalonia/Controls/Carousel.axaml     |   2 +-
 src/Semi.Avalonia/Controls/ComboBox.axaml     |   8 +-
 .../Controls/DropDownButton.axaml             | 126 ++++-----
 src/Semi.Avalonia/Controls/Expander.axaml     |  36 +--
 src/Semi.Avalonia/Controls/Label.axaml        | 246 +++++++++---------
 src/Semi.Avalonia/Controls/ListBox.axaml      |  88 +++----
 .../Controls/NotificationCard.axaml           |  24 +-
 src/Semi.Avalonia/Controls/ProgressBar.axaml  |  52 ++--
 src/Semi.Avalonia/Controls/RadioButton.axaml  |  78 +++---
 src/Semi.Avalonia/Controls/RepeatButton.axaml | 126 ++++-----
 .../Controls/SelectableTextBlock.axaml        |  36 +--
 src/Semi.Avalonia/Controls/Slider.axaml       |   4 +-
 src/Semi.Avalonia/Controls/SplitButton.axaml  |  62 ++---
 src/Semi.Avalonia/Controls/TabControl.axaml   |  24 +-
 src/Semi.Avalonia/Controls/TabItem.axaml      |  44 ++--
 src/Semi.Avalonia/Controls/TabStrip.axaml     |  10 +-
 src/Semi.Avalonia/Controls/TextBlock.axaml    |  36 +--
 src/Semi.Avalonia/Controls/TextBox.axaml      |  80 +++---
 src/Semi.Avalonia/Controls/ToggleButton.axaml | 160 ++++++------
 src/Semi.Avalonia/Controls/ToggleSwitch.axaml |  28 +-
 src/Semi.Avalonia/Controls/TreeView.axaml     |   8 +-
 32 files changed, 766 insertions(+), 766 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml b/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
index 0c9ec39..ccdbbf4 100644
--- a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
+++ b/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
@@ -36,9 +36,9 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Border.Width" Value="1" />
-            <Setter Property="Border.VerticalAlignment" Value="Stretch" />
-            <Setter Property="Border.HorizontalAlignment" Value="Left" />
+            <Setter Property="Width" Value="1" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
index 396c747..8e67c52 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
@@ -238,30 +238,30 @@
                                                 </Style>
                                                 <Style Selector="Grid[Tag=Rgba]">
                                                     <Style Selector="^ NumericUpDown#Component1NumericUpDown">
-                                                        <Setter Property="NumericUpDown.Tag" Value="R" />
+                                                        <Setter Property="Tag" Value="R" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component2NumericUpDown">
-                                                        <Setter Property="NumericUpDown.Tag" Value="G" />
+                                                        <Setter Property="Tag" Value="G" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component3NumericUpDown">
-                                                        <Setter Property="NumericUpDown.Tag" Value="B" />
+                                                        <Setter Property="Tag" Value="B" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#AlphaComponentNumericUpDown">
-                                                        <Setter Property="NumericUpDown.Tag" Value="A" />
+                                                        <Setter Property="Tag" Value="A" />
                                                     </Style>
                                                 </Style>
                                                 <Style Selector="Grid[Tag=Hsva]">
                                                     <Style Selector="^ NumericUpDown#Component1NumericUpDown">
-                                                        <Setter Property="NumericUpDown.Tag" Value="H" />
+                                                        <Setter Property="Tag" Value="H" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component2NumericUpDown">
-                                                        <Setter Property="NumericUpDown.Tag" Value="S" />
+                                                        <Setter Property="Tag" Value="S" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#Component3NumericUpDown">
-                                                        <Setter Property="NumericUpDown.Tag" Value="V" />
+                                                        <Setter Property="Tag" Value="V" />
                                                     </Style>
                                                     <Style Selector="^ NumericUpDown#AlphaComponentNumericUpDown">
-                                                        <Setter Property="NumericUpDown.Tag" Value="A" />
+                                                        <Setter Property="Tag" Value="A" />
                                                     </Style>
                                                 </Style>
                                             </Grid.Styles>
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml
index 16ea24c..f9e0483 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml
@@ -137,21 +137,21 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked">
-            <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedBackground}" />
-            <Setter Property="RadioButton.Foreground" Value="{DynamicResource ColorViewRadioButtonCheckedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ColorViewRadioButtonCheckedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonCheckedPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonCheckedPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^:unchecked">
             <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource ColorViewRadioButtonPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ColorViewRadioButtonPressedBackground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -532,30 +532,30 @@
         </Setter>
         <Style Selector="^[ColorModel=Rgba]">
             <Style Selector="^ /template/ NumericUpDown#Component1NumericUpDown">
-                <Setter Property="NumericUpDown.Tag" Value="R" />
+                <Setter Property="Tag" Value="R" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component2NumericUpDown">
-                <Setter Property="NumericUpDown.Tag" Value="G" />
+                <Setter Property="Tag" Value="G" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component3NumericUpDown">
-                <Setter Property="NumericUpDown.Tag" Value="B" />
+                <Setter Property="Tag" Value="B" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#AlphaComponentNumericUpDown">
-                <Setter Property="NumericUpDown.Tag" Value="A" />
+                <Setter Property="Tag" Value="A" />
             </Style>
         </Style>
         <Style Selector="^[ColorModel=Hsva]">
             <Style Selector="^ /template/ NumericUpDown#Component1NumericUpDown">
-                <Setter Property="NumericUpDown.Tag" Value="H" />
+                <Setter Property="Tag" Value="H" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component2NumericUpDown">
-                <Setter Property="NumericUpDown.Tag" Value="S" />
+                <Setter Property="Tag" Value="S" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#Component3NumericUpDown">
-                <Setter Property="NumericUpDown.Tag" Value="V" />
+                <Setter Property="Tag" Value="V" />
             </Style>
             <Style Selector="^ /template/ NumericUpDown#AlphaComponentNumericUpDown">
-                <Setter Property="NumericUpDown.Tag" Value="A" />
+                <Setter Property="Tag" Value="A" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Semi.Avalonia.DataGrid/DataGrid.axaml b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
index 9087751..0cb9240 100644
--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -19,7 +19,7 @@
             <Setter Property="MinHeight" Value="20" />
         </Style>
         <Style Selector="^:error:focus /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.BorderBrush" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="Transparent" />
         </Style>
         <Style Selector="^ /template/ DataValidationErrors">
             <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
@@ -369,7 +369,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked /template/ PathIcon">
-            <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
     </ControlTheme>
 
diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
index e1dab7d..3cf32a4 100644
--- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
@@ -216,7 +216,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:checked /template/ PathIcon#ChevronPath">
-            <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
     </ControlTheme>
 
diff --git a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
index 18110f5..4270c1a 100644
--- a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
@@ -84,10 +84,10 @@
             </Setter>
         </Style>
         <Style Selector="^.Large /template/ TextBox">
-            <Setter Property="TextBox.MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
         </Style>
         <Style Selector="^.Small /template/ TextBox">
-            <Setter Property="TextBox.MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
         </Style>
     </ControlTheme>
 
diff --git a/src/Semi.Avalonia/Controls/Border.axaml b/src/Semi.Avalonia/Controls/Border.axaml
index 8e80c01..bfc8a35 100644
--- a/src/Semi.Avalonia/Controls/Border.axaml
+++ b/src/Semi.Avalonia/Controls/Border.axaml
@@ -29,10 +29,10 @@
         <Setter Property="Border.BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" />
         <Setter Property="Border.Margin" Value="{DynamicResource ThicknessCardMargin}" />
         <Style Selector="^.Shadow">
-            <Setter Property="Border.BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
+            <Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
         <Style Selector="^.Hover:pointerover">
-            <Setter Property="Border.BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
+            <Setter Property="BoxShadow" Value="{DynamicResource BorderCardBoxShadow}" />
         </Style>
 
     </ControlTheme>
diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index 2ec0991..8df463d 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -46,45 +46,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="Button.Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="Button.Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -97,97 +97,97 @@
         <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
 
         <Style Selector="^:pointerover">
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Button.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="Button.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="Button.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -198,9 +198,9 @@
         <Setter Property="Button.Background" Value="Transparent" />
         <Setter Property="Button.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="Button.BorderBrush" Value="Transparent" />
-            <Setter Property="Button.Background" Value="Transparent" />
-            <Setter Property="Button.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
     </ControlTheme>
diff --git a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
index 0f3767d..16a93a5 100644
--- a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
+++ b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
@@ -97,7 +97,7 @@
         </Setter>
         <Style Selector="^[ButtonSpinnerLocation=Left] /template/ Border#ButtonGroup">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="Border.Margin" Value="0 0 4 0" />
+            <Setter Property="Margin" Value="0 0 4 0" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/Calendar.axaml b/src/Semi.Avalonia/Controls/Calendar.axaml
index b59a238..3efe8e0 100644
--- a/src/Semi.Avalonia/Controls/Calendar.axaml
+++ b/src/Semi.Avalonia/Controls/Calendar.axaml
@@ -170,18 +170,18 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ ContentControl">
-            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ ContentControl">
-            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonPressedBackground}" />
         </Style>
 
         <Style Selector="^:selected">
             <Style Selector="^ /template/ ContentControl">
-                <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarButtonSelectedBackground}" />
-                <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarButtonSelectedForeground}" />
-                <Setter Property="ContentControl.FontWeight" Value="{DynamicResource CalendarItemCalendarButtonSelectedFontWeight}" />
+                <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarButtonSelectedBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarButtonSelectedForeground}" />
+                <Setter Property="FontWeight" Value="{DynamicResource CalendarItemCalendarButtonSelectedFontWeight}" />
             </Style>
         </Style>
 
@@ -232,25 +232,25 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ ContentControl">
-            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ ContentControl">
-            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonPressedBackground}" />
         </Style>
 
         <Style Selector="^:today /template/ ContentControl">
-            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonTodayBackground}" />
-            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonTodayForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonTodayBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonTodayForeground}" />
         </Style>
 
         <Style Selector="^:selected /template/ ContentControl">
-            <Setter Property="ContentControl.Background" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedBackground}" />
-            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonSelectedForeground}" />
         </Style>
 
         <Style Selector="^:inactive /template/ ContentControl">
-            <Setter Property="ContentControl.Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonInactiveForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonInactiveForeground}" />
         </Style>
 
         <Style Selector="^:blackout /template/ ContentControl">
diff --git a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
index 566d2ab..06210c5 100644
--- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
@@ -132,12 +132,12 @@
 
         <Style Selector="^.Large">
             <Style Selector="^ /template/ TextBox#PART_TextBox">
-                <Setter Property="TextBox.MinHeight" Value="{DynamicResource CalendarDatePickerInnerLargeHeight}" />
+                <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerLargeHeight}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
             <Style Selector="^ /template/ TextBox#PART_TextBox">
-                <Setter Property="TextBox.MinHeight" Value="{DynamicResource CalendarDatePickerInnerSmallHeight}" />
+                <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerInnerSmallHeight}" />
             </Style>
         </Style>
 
@@ -188,21 +188,21 @@
 
         <Style Selector="^.Bordered">
             <Style Selector="^ Border#Background">
-                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedDefaultBackground}" />
-                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedDefaultBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedDefaultBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedDefaultBorderBrush}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#Background">
-                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
-                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:focus-within /template/ Border#Background">
-                <Setter Property="Border.Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
-                <Setter Property="Border.BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ Border#Background">
                     <Setter Property="Background" Value="{DynamicResource CalendarDatePickerDisabledBackground}" />
-                    <Setter Property="Border.BorderBrush" Value="Transparent" />
+                    <Setter Property="BorderBrush" Value="Transparent" />
                 </Style>
 
                 <Style Selector="^ /template/ Button#PART_Button">
@@ -215,16 +215,16 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#Background">
-                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#Background">
-                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^:focus-within /template/ Border#Background">
-                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
                 </Style>
             </Style>
         </Style>
diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml
index d820f4a..d69b82f 100644
--- a/src/Semi.Avalonia/Controls/Carousel.axaml
+++ b/src/Semi.Avalonia/Controls/Carousel.axaml
@@ -178,7 +178,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Line /template/ ListBox#PART_ItemsPresenter2">
-            <Setter Property="ListBox.ItemContainerTheme" Value="{DynamicResource CarouselIndicatorLineListBoxItem}" />
+            <Setter Property="ItemContainerTheme" Value="{DynamicResource CarouselIndicatorLineListBoxItem}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 57cbb1a..69b4715 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -132,10 +132,10 @@
         </Setter>
 
         <Style Selector="^.Large /template/ Border#Background">
-            <Setter Property="ComboBox.MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
         </Style>
         <Style Selector="^.Small /template/ Border#Background">
-            <Setter Property="ComboBox.MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
         </Style>
 
         <!--  Pointerover State  -->
@@ -207,8 +207,8 @@
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ Border#Background">
-                    <Setter Property="Border.Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
-                    <Setter Property="Border.BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ ContentControl#ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />
diff --git a/src/Semi.Avalonia/Controls/DropDownButton.axaml b/src/Semi.Avalonia/Controls/DropDownButton.axaml
index d33aac7..c8bc667 100644
--- a/src/Semi.Avalonia/Controls/DropDownButton.axaml
+++ b/src/Semi.Avalonia/Controls/DropDownButton.axaml
@@ -58,45 +58,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="DropDownButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -155,88 +155,88 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="DropDownButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="DropDownButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -247,9 +247,9 @@
         <Setter Property="DropDownButton.Background" Value="Transparent" />
         <Setter Property="DropDownButton.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="DropDownButton.BorderBrush" Value="Transparent" />
-            <Setter Property="DropDownButton.Background" Value="Transparent" />
-            <Setter Property="DropDownButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/Expander.axaml b/src/Semi.Avalonia/Controls/Expander.axaml
index aede03b..600b203 100644
--- a/src/Semi.Avalonia/Controls/Expander.axaml
+++ b/src/Semi.Avalonia/Controls/Expander.axaml
@@ -86,29 +86,29 @@
         </Setter>
 
         <Style Selector="^:expanded /template/ PathIcon#PART_PathIcon">
-            <Setter Property="PathIcon.RenderTransform" Value="rotate(180deg)" />
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
         </Style>
 
         <Style Selector="^:right">
             <Style Selector="^ /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
-                <Setter Property="LayoutTransformControl.LayoutTransform">
+                <Setter Property="LayoutTransform">
                     <RotateTransform Angle="-90" />
                 </Setter>
                 <Setter Property="VerticalAlignment" Value="Stretch" />
             </Style>
-            <Setter Property="Expander.HorizontalAlignment" Value="Left" />
-            <Setter Property="Expander.VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
         </Style>
 
         <Style Selector="^:left">
             <Style Selector="^ /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
-                <Setter Property="LayoutTransformControl.LayoutTransform">
+                <Setter Property="LayoutTransform">
                     <RotateTransform Angle="90" />
                 </Setter>
                 <Setter Property="VerticalAlignment" Value="Stretch" />
             </Style>
-            <Setter Property="Expander.HorizontalAlignment" Value="Stretch" />
-            <Setter Property="Expander.VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
         </Style>
 
         <Style Selector="^:left /template/ LayoutTransformControl#ExpanderHeaderLayoutContainer">
@@ -125,30 +125,30 @@
         </Style>
 
         <Style Selector="^:left /template/ Border#ExpanderContent">
-            <Setter Property="Border.MinWidth" Value="2" />
-            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderLeftContentBorderThickness}" />
+            <Setter Property="MinWidth" Value="2" />
+            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderLeftContentBorderThickness}" />
         </Style>
         <Style Selector="^:up /template/ Border#ExpanderContent">
-            <Setter Property="Border.MinHeight" Value="2" />
-            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderUpContentBorderThickness}" />
+            <Setter Property="MinHeight" Value="2" />
+            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderUpContentBorderThickness}" />
         </Style>
         <Style Selector="^:right /template/ Border#ExpanderContent">
-            <Setter Property="Border.MinWidth" Value="2" />
-            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderRightContentBorderThickness}" />
+            <Setter Property="MinWidth" Value="2" />
+            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderRightContentBorderThickness}" />
         </Style>
         <Style Selector="^:down /template/ Border#ExpanderContent">
-            <Setter Property="Border.MinHeight" Value="2" />
-            <Setter Property="Border.BorderThickness" Value="{DynamicResource ExpanderDownContentBorderThickness}" />
+            <Setter Property="MinHeight" Value="2" />
+            <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDownContentBorderThickness}" />
         </Style>
 
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pointerover">
-            <Setter Property="ToggleButton.Background" Value="{DynamicResource ExpanderHeaderHoverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ExpanderHeaderHoverBackground}" />
         </Style>
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pressed">
-            <Setter Property="ToggleButton.Background" Value="{DynamicResource ExpanderHeaderPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ExpanderHeaderPressedBackground}" />
         </Style>
         <Style Selector="^ /template/ ToggleButton#ExpanderHeader:disabled">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/Label.axaml b/src/Semi.Avalonia/Controls/Label.axaml
index 3af052a..0896757 100644
--- a/src/Semi.Avalonia/Controls/Label.axaml
+++ b/src/Semi.Avalonia/Controls/Label.axaml
@@ -100,38 +100,38 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Secondary">
-            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
         </Style>
         <Style Selector="^.Quaternary">
-            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
         </Style>
         <Style Selector="^.Mark">
-            <Setter Property="Label.Background" Value="{DynamicResource TextBlockMarkBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBlockMarkBackground}" />
         </Style>
         <Style Selector="^.Code">
-            <Setter Property="Label.Background" Value="{DynamicResource TextBlockCodeBackground}" />
-            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockCodeForeground}" />
-            <Setter Property="Label.BorderBrush" Value="{DynamicResource TextBlockCodeBorderBrush}" />
-            <Setter Property="Label.BorderThickness" Value="1" />
-            <Setter Property="Label.Padding" Value="2" />
-            <Setter Property="Label.CornerRadius" Value="{DynamicResource TextBlockCodeCornerRadius}" />
-            <Setter Property="Label.FontFamily" Value="{DynamicResource CodeFontFamily}" />
-            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockCodeFontSize}" />
+            <Setter Property="Background" Value="{DynamicResource TextBlockCodeBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockCodeForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBlockCodeBorderBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Padding" Value="2" />
+            <Setter Property="CornerRadius" Value="{DynamicResource TextBlockCodeCornerRadius}" />
+            <Setter Property="FontFamily" Value="{DynamicResource CodeFontFamily}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockCodeFontSize}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
     <ControlTheme
@@ -140,22 +140,22 @@
         TargetType="Label">
         <Setter Property="Label.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
-            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
         <Style Selector="^.H2">
-            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
         </Style>
         <Style Selector="^.H3">
-            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
         </Style>
         <Style Selector="^.H4">
-            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
         </Style>
         <Style Selector="^.H5">
-            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
         </Style>
         <Style Selector="^.H6">
-            <Setter Property="Label.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
         </Style>
     </ControlTheme>
 
@@ -193,216 +193,216 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Large">
-            <Setter Property="Label.Padding" Value="{DynamicResource LabelTagLargePadding}" />
-            <Setter Property="Label.MinHeight" Value="{DynamicResource LabelTagLargeHeight}" />
+            <Setter Property="Padding" Value="{DynamicResource LabelTagLargePadding}" />
+            <Setter Property="MinHeight" Value="{DynamicResource LabelTagLargeHeight}" />
         </Style>
         <Style Selector="^.Circle">
-            <Setter Property="Label.CornerRadius" Value="{DynamicResource LabelTagCircleCornerRadius}" />
+            <Setter Property="CornerRadius" Value="{DynamicResource LabelTagCircleCornerRadius}" />
         </Style>
         <Style Selector="^">
-            <Setter Property="Label.BorderBrush" Value="Transparent" />
-            <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
-            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             <Style Selector="^.Red">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightRedBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightRedBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightPinkBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightPinkForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightPinkBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightPinkForeground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightPurpleBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightPurpleForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightPurpleBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightPurpleForeground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightVioletBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightVioletForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightVioletBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightVioletForeground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightIndigoBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightIndigoForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightIndigoBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightIndigoForeground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightBlueBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightBlueForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightBlueBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightBlueForeground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightBlueBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightBlueForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightLightBlueBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLightBlueForeground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightCyanBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightCyanForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightCyanBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightCyanForeground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightTealBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightTealForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightTealBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightTealForeground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreenBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreenForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightGreenBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreenForeground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLightGreenBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLightGreenForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightLightGreenBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLightGreenForeground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightLimeBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightLimeForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightLimeBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightLimeForeground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightYellowBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightYellowForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightYellowBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightYellowForeground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightAmberBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightAmberForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightAmberBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightAmberForeground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagLightWhiteBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightWhiteForeground}" />
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagLightWhiteBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagLightWhiteBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagLightWhiteForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightWhiteBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Ghost">
-            <Setter Property="Label.Background" Value="Transparent" />
-            <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagLightGreyBackground}" />
-            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightGreyBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
             <Style Selector="^.Red">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostPinkBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostPinkForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostPinkBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostPinkForeground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostPurpleBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostPurpleForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostPurpleBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostPurpleForeground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostVioletBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostVioletForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostVioletBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostVioletForeground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostIndigoBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostIndigoForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostIndigoBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostIndigoForeground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostBlueBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostBlueForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostBlueBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostBlueForeground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightBlueBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightBlueForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLightBlueBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLightBlueForeground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostCyanBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostCyanForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostCyanBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostCyanForeground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostTealBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostTealForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostTealBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostTealForeground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreenBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreenForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGreenBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGreenForeground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLightGreenBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLightGreenForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLightGreenBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLightGreenForeground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostLimeBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostLimeForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostLimeBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostLimeForeground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostYellowBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostYellowForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostYellowBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostYellowForeground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostAmberBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostAmberForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostAmberBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostAmberForeground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagGhostWhiteBackground}" />
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagGhostWhiteForeground}" />
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagGhostWhiteBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagGhostWhiteBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagGhostWhiteForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostWhiteBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Solid">
-            <Setter Property="Label.BorderBrush" Value="Transparent" />
-            <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagSolidForeground}" />
-            <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Foreground" Value="{DynamicResource LabelTagSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
             <Style Selector="^.Red">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
             </Style>
             <Style Selector="^.Pink">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidPinkBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidPinkBackground}" />
             </Style>
             <Style Selector="^.Purple">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidPurpleBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidPurpleBackground}" />
             </Style>
             <Style Selector="^.Violet">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidVioletBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidVioletBackground}" />
             </Style>
             <Style Selector="^.Indigo">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidIndigoBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidIndigoBackground}" />
             </Style>
             <Style Selector="^.Blue">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidBlueBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidBlueBackground}" />
             </Style>
             <Style Selector="^.LightBlue">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightBlueBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLightBlueBackground}" />
             </Style>
             <Style Selector="^.Cyan">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidCyanBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidCyanBackground}" />
             </Style>
             <Style Selector="^.Teal">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidTealBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidTealBackground}" />
             </Style>
             <Style Selector="^.Green">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreenBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreenBackground}" />
             </Style>
             <Style Selector="^.LightGreen">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLightGreenBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLightGreenBackground}" />
             </Style>
             <Style Selector="^.Lime">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidLimeBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidLimeBackground}" />
             </Style>
             <Style Selector="^.Yellow">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidYellowBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidYellowBackground}" />
             </Style>
             <Style Selector="^.Amber">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidAmberBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidAmberBackground}" />
             </Style>
             <Style Selector="^.Orange">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
             </Style>
             <Style Selector="^.Grey">
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
             </Style>
             <Style Selector="^.White">
-                <Setter Property="Label.Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
-                <Setter Property="Label.BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
-                <Setter Property="Label.Background" Value="{DynamicResource LabelTagSolidWhiteBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource LabelTagSolidWhiteBackground}" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml
index cb0be3e..55f7391 100644
--- a/src/Semi.Avalonia/Controls/ListBox.axaml
+++ b/src/Semi.Avalonia/Controls/ListBox.axaml
@@ -63,29 +63,29 @@
         </Setter>
 
         <Style Selector="^:disabled">
-            <Setter Property="ListBoxItem.Foreground" Value="{DynamicResource ListBoxItemDisabledForeground}" />
-            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemDisabledForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemDisabledBackground}" />
             <Style Selector="^:selected">
-                <Setter Property="ListBoxItem.Background"
+                <Setter Property="Background"
                         Value="{DynamicResource ListBoxItemSelectedDisabledBackground}" />
             </Style>
         </Style>
 
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
-            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
         </Style>
 
         <!--  Pressed State  -->
         <Style Selector="^:pressed">
-            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
         </Style>
 
         <!--  Selected State  -->
         <Style Selector="^:selected">
-            <Setter Property="ListBoxItem.Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="ListBoxItem.Background"
+                <Setter Property="Background"
                         Value="{DynamicResource ListBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
@@ -182,7 +182,7 @@
             <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDefaultBackground}" />
         </Style>
         <Style Selector="^ /template/ Ellipse#CheckGlyph">
-            <Setter Property="Ellipse.Opacity" Value="0" />
+            <Setter Property="Opacity" Value="0" />
         </Style>
 
         <!--  Unchecked Pointerover State  -->
@@ -193,7 +193,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPointeroverBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+                <Setter Property="Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -204,7 +204,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPressedBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+                <Setter Property="Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -215,7 +215,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDisabledBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+                <Setter Property="Opacity" Value="0" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -229,7 +229,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
+                <Setter Property="Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
@@ -241,7 +241,7 @@
                             Value="{DynamicResource ListBoxItemRadioGroupCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -253,7 +253,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -265,7 +265,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -312,30 +312,30 @@
         </Setter>
         <Setter Property="ListBoxItem.Background" Value="Transparent" />
         <Style Selector="^:pointerover">
-            <Setter Property="ListBoxItem.Background"
+            <Setter Property="Background"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonUncheckedPointeroverBackground}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="ListBoxItem.Foreground"
+            <Setter Property="Foreground"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonUncheckedDisabledForeground}" />
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="ListBoxItem.Background"
+            <Setter Property="Background"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedBackground}" />
-            <Setter Property="ListBoxItem.Foreground"
+            <Setter Property="Foreground"
                     Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedForeground}" />
             <Style Selector="^:disabled">
-                <Setter Property="ListBoxItem.Foreground"
+                <Setter Property="Foreground"
                         Value="{DynamicResource ListBoxItemRadioGroupButtonCheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallFontSize}" />
-            <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallPadding}" />
+            <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallFontSize}" />
+            <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonSmallPadding}" />
         </Style>
         <Style Selector="^.Large">
-            <Setter Property="ListBoxItem.FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonLargeFontSize}" />
-            <Setter Property="ListBoxItem.Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonLargePadding}" />
+            <Setter Property="FontSize" Value="{DynamicResource ListBoxItemRadioGroupButtonLargeFontSize}" />
+            <Setter Property="Padding" Value="{DynamicResource ListBoxItemRadioGroupButtonLargePadding}" />
         </Style>
     </ControlTheme>
 
@@ -412,31 +412,31 @@
             <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDefaultBackground}" />
         </Style>
         <Style Selector="^ /template/ Ellipse#CheckGlyph">
-            <Setter Property="Ellipse.Opacity" Value="0" />
+            <Setter Property="Opacity" Value="0" />
         </Style>
 
         <!--  Unchecked Pointerover State  -->
         <Style Selector="^:pointerover">
-            <Setter Property="ListBoxItem.Background"
+            <Setter Property="Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPointeroverBackground}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke"
                         Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+                <Setter Property="Opacity" Value="0" />
             </Style>
         </Style>
 
         <!--  Unchecked Pressed State  -->
         <Style Selector="^:pressed">
-            <Setter Property="ListBoxItem.Background"
+            <Setter Property="Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPressedBackground}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconPressedBorderBrush}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+                <Setter Property="Opacity" Value="0" />
             </Style>
         </Style>
 
@@ -447,7 +447,7 @@
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupUncheckIconDisabledBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+                <Setter Property="Opacity" Value="0" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Foreground" Value="{DynamicResource ListBoxItemRadioGroupDisabledForeground}" />
@@ -456,21 +456,21 @@
 
         <!--  Checked State  -->
         <Style Selector="^:selected">
-            <Setter Property="ListBoxItem.Background"
+            <Setter Property="Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckedBackground}" />
-            <Setter Property="ListBoxItem.BorderBrush"
+            <Setter Property="BorderBrush"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckDefaultBorderBrush}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBorderBrush}" />
                 <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
+                <Setter Property="Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="ListBoxItem.BorderBrush"
+                <Setter Property="BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPointeroverBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke"
@@ -485,13 +485,13 @@
                             Value="{DynamicResource ListBoxItemRadioGroupCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
             </Style>
 
             <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="ListBoxItem.BorderBrush"
+                <Setter Property="BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPressedBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke"
@@ -499,7 +499,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -511,7 +511,7 @@
                     <Setter Property="Fill" Value="{DynamicResource ListBoxItemRadioGroupCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ Border#RootBorder">
                     <Setter Property="BorderBrush"
@@ -560,11 +560,11 @@
         <Setter Property="ListBoxItem.BorderBrush"
                 Value="{DynamicResource ListBoxItemRadioGroupCardDefaultBorderBrush}" />
         <Style Selector="^:pointerover">
-            <Setter Property="ListBoxItem.Background"
+            <Setter Property="Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPointeroverBackground}" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="ListBoxItem.Background"
+            <Setter Property="Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardUncheckPressedBackground}" />
         </Style>
         <Style Selector="^:disabled">
@@ -573,16 +573,16 @@
             </Style>
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="ListBoxItem.Background"
+            <Setter Property="Background"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckedBackground}" />
-            <Setter Property="ListBoxItem.BorderBrush"
+            <Setter Property="BorderBrush"
                     Value="{DynamicResource ListBoxItemRadioGroupCardCheckDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="ListBoxItem.BorderBrush"
+                <Setter Property="BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="ListBoxItem.BorderBrush"
+                <Setter Property="BorderBrush"
                         Value="{DynamicResource ListBoxItemRadioGroupCardCheckPressedBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">
diff --git a/src/Semi.Avalonia/Controls/NotificationCard.axaml b/src/Semi.Avalonia/Controls/NotificationCard.axaml
index cd1d032..221af99 100644
--- a/src/Semi.Avalonia/Controls/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Controls/NotificationCard.axaml
@@ -134,24 +134,24 @@
         </Style>
 
         <Style Selector="^:information /template/ PathIcon#NotificationIcon">
-            <Setter Property="PathIcon.IsVisible" Value="True" />
-            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardInformationIconForeground}" />
-            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardInformationIconPathData}" />
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource NotificationCardInformationIconForeground}" />
+            <Setter Property="Data" Value="{DynamicResource NotificationCardInformationIconPathData}" />
         </Style>
         <Style Selector="^:success /template/ PathIcon#NotificationIcon">
-            <Setter Property="PathIcon.IsVisible" Value="True" />
-            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardSuccessIconForeground}" />
-            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardSuccessIconPathData}" />
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource NotificationCardSuccessIconForeground}" />
+            <Setter Property="Data" Value="{DynamicResource NotificationCardSuccessIconPathData}" />
         </Style>
         <Style Selector="^:warning /template/ PathIcon#NotificationIcon">
-            <Setter Property="PathIcon.IsVisible" Value="True" />
-            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardWarningIconForeground}" />
-            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardWarningIconPathData}" />
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource NotificationCardWarningIconForeground}" />
+            <Setter Property="Data" Value="{DynamicResource NotificationCardWarningIconPathData}" />
         </Style>
         <Style Selector="^:error /template/ PathIcon#NotificationIcon">
-            <Setter Property="PathIcon.IsVisible" Value="True" />
-            <Setter Property="PathIcon.Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
-            <Setter Property="PathIcon.Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
+            <Setter Property="Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/ProgressBar.axaml b/src/Semi.Avalonia/Controls/ProgressBar.axaml
index c976c42..a7dbb9a 100644
--- a/src/Semi.Avalonia/Controls/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Controls/ProgressBar.axaml
@@ -171,22 +171,22 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Primary">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
         </Style>
         <Style Selector="^.Error">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
         </Style>
         <Style Selector="^:horizontal /template/ Border#PART_Indicator">
             <Setter Property="HorizontalAlignment" Value="Left" />
@@ -293,46 +293,46 @@
             <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
                 <Setter Property="Grid.Column" Value="0" />
                 <Setter Property="Grid.Row" Value="1" />
-                <Setter Property="LayoutTransformControl.Margin" Value="4 0" />
+                <Setter Property="Margin" Value="4 0" />
             </Style>
             <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
                 <Setter Property="Grid.Column" Value="1" />
                 <Setter Property="Grid.Row" Value="0" />
-                <Setter Property="LayoutTransformControl.Margin" Value="0 4" />
+                <Setter Property="Margin" Value="0 4" />
             </Style>
             <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
-                <Setter Property="Border.MinHeight" Value="4" />
-                <Setter Property="Border.VerticalAlignment" Value="Center" />
+                <Setter Property="MinHeight" Value="4" />
+                <Setter Property="VerticalAlignment" Value="Center" />
             </Style>
             <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
-                <Setter Property="Border.MinWidth" Value="4" />
-                <Setter Property="Border.HorizontalAlignment" Value="Center" />
+                <Setter Property="MinWidth" Value="4" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_ProgressText">
-                <Setter Property="TextBlock.Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
             </Style>
         </Style>
         <Style Selector="^.Right">
             <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
                 <Setter Property="Grid.Column" Value="2" />
                 <Setter Property="Grid.Row" Value="1" />
-                <Setter Property="LayoutTransformControl.Margin" Value="4 0" />
+                <Setter Property="Margin" Value="4 0" />
             </Style>
             <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
                 <Setter Property="Grid.Column" Value="1" />
                 <Setter Property="Grid.Row" Value="2" />
-                <Setter Property="LayoutTransformControl.Margin" Value="0 4" />
+                <Setter Property="Margin" Value="0 4" />
             </Style>
             <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
-                <Setter Property="Border.MinHeight" Value="4" />
-                <Setter Property="Border.VerticalAlignment" Value="Center" />
+                <Setter Property="MinHeight" Value="4" />
+                <Setter Property="VerticalAlignment" Value="Center" />
             </Style>
             <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
-                <Setter Property="Border.MinWidth" Value="4" />
-                <Setter Property="Border.HorizontalAlignment" Value="Center" />
+                <Setter Property="MinWidth" Value="4" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_ProgressText">
-                <Setter Property="TextBlock.Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -397,22 +397,22 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Primary">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
         </Style>
         <Style Selector="^.Error">
-            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
         </Style>
         <Style Selector="^:indeterminate /template/ Arc#Indicator">
             <Setter Property="Opacity" Value="0" />
diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml
index e351271..a5125b9 100644
--- a/src/Semi.Avalonia/Controls/RadioButton.axaml
+++ b/src/Semi.Avalonia/Controls/RadioButton.axaml
@@ -83,7 +83,7 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+                <Setter Property="Opacity" Value="0" />
             </Style>
 
             <!--  Unchecked Pointerover State  -->
@@ -93,7 +93,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="0" />
+                    <Setter Property="Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -104,7 +104,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="0" />
+                    <Setter Property="Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -115,7 +115,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="0" />
+                    <Setter Property="Opacity" Value="0" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -130,7 +130,7 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
+                <Setter Property="Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
@@ -140,7 +140,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -151,7 +151,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -162,7 +162,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -201,28 +201,28 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:unchecked">
-            <Setter Property="RadioButton.Background" Value="Transparent" />
+            <Setter Property="Background" Value="Transparent" />
             <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonUncheckedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource RadioButtonButtonUncheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:disabled">
-                <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonUncheckedDisabledForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonUncheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^:checked">
-            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
-            <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource RadioButtonButtonCheckedBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonCheckedForeground}" />
             <Style Selector="^:disabled">
-                <Setter Property="RadioButton.Foreground" Value="{DynamicResource RadioButtonButtonCheckedDisabledForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource RadioButtonButtonCheckedDisabledForeground}" />
             </Style>
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="RadioButton.FontSize" Value="{DynamicResource RadioButtonButtonSmallFontSize}" />
-            <Setter Property="RadioButton.Padding" Value="{DynamicResource RadioButtonButtonSmallPadding}" />
+            <Setter Property="FontSize" Value="{DynamicResource RadioButtonButtonSmallFontSize}" />
+            <Setter Property="Padding" Value="{DynamicResource RadioButtonButtonSmallPadding}" />
         </Style>
         <Style Selector="^.Large">
-            <Setter Property="RadioButton.FontSize" Value="{DynamicResource RadioButtonButtonLargeFontSize}" />
-            <Setter Property="RadioButton.Padding" Value="{DynamicResource RadioButtonButtonLargePadding}" />
+            <Setter Property="FontSize" Value="{DynamicResource RadioButtonButtonLargeFontSize}" />
+            <Setter Property="Padding" Value="{DynamicResource RadioButtonButtonLargePadding}" />
         </Style>
     </ControlTheme>
 
@@ -294,28 +294,28 @@
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="0" />
+                <Setter Property="Opacity" Value="0" />
             </Style>
 
             <!--  Unchecked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPointeroverBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="0" />
+                    <Setter Property="Opacity" Value="0" />
                 </Style>
             </Style>
 
             <!--  Unchecked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonUncheckIconPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="0" />
+                    <Setter Property="Opacity" Value="0" />
                 </Style>
             </Style>
 
@@ -326,7 +326,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonUncheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="0" />
+                    <Setter Property="Opacity" Value="0" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource RadioButtonDisabledForeground}" />
@@ -336,19 +336,19 @@
 
         <!--  Checked State  -->
         <Style Selector="^:checked">
-            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
-            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
             <Style Selector="^ /template/ Ellipse#OuterEllipse">
                 <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconDefaultBorderBrush}" />
                 <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDefaultBackground}" />
             </Style>
             <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                <Setter Property="Ellipse.Opacity" Value="1" />
+                <Setter Property="Opacity" Value="1" />
             </Style>
 
             <!--  Checked Pointerover State  -->
             <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPointeroverBorderBrush}" />
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
@@ -358,19 +358,19 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPointeroverBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
             </Style>
 
             <!--  Checked Pressed State  -->
             <Style Selector="^:pressed">
-                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
                 <Style Selector="^ /template/ Ellipse#OuterEllipse">
                     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckIconPressedBorderBrush}" />
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconPressedBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
             </Style>
 
@@ -381,7 +381,7 @@
                     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#CheckGlyph">
-                    <Setter Property="Ellipse.Opacity" Value="1" />
+                    <Setter Property="Opacity" Value="1" />
                 </Style>
                 <Style Selector="^ /template/ Border#RootBorder">
                     <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
@@ -421,12 +421,12 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:unchecked">
-            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardDefaultBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource RadioButtonCardUncheckPressedBackground}" />
             </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -435,13 +435,13 @@
             </Style>
         </Style>
         <Style Selector="^:checked">
-            <Setter Property="RadioButton.Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
-            <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource RadioButtonCardCheckedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckDefaultBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RadioButton.BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCardCheckPressedBorderBrush}" />
             </Style>
             <Style Selector="^:disabled">
                 <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonCheckIconDisabledBackground}" />
diff --git a/src/Semi.Avalonia/Controls/RepeatButton.axaml b/src/Semi.Avalonia/Controls/RepeatButton.axaml
index 325a46e..cad9922 100644
--- a/src/Semi.Avalonia/Controls/RepeatButton.axaml
+++ b/src/Semi.Avalonia/Controls/RepeatButton.axaml
@@ -41,45 +41,45 @@
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="RepeatButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="RepeatButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 
@@ -92,88 +92,88 @@
         <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
 
         <Style Selector="^.Primary">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
             </Style>
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
             <Style Selector="^:pointerover">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
-                <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-            <Setter Property="RepeatButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -184,9 +184,9 @@
         <Setter Property="RepeatButton.Background" Value="Transparent" />
         <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled">
-            <Setter Property="RepeatButton.BorderBrush" Value="Transparent" />
-            <Setter Property="RepeatButton.Background" Value="Transparent" />
-            <Setter Property="RepeatButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
 
     </ControlTheme>
diff --git a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml b/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
index fd4a06d..864542c 100644
--- a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
+++ b/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
@@ -18,34 +18,34 @@
         <Setter Property="SelectableTextBlock.Cursor" Value="Ibeam" />
         <Setter Property="SelectableTextBlock.SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
         <Style Selector="^.Secondary">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
         </Style>
         <Style Selector="^.Quaternary">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
         </Style>
         <Style Selector="^.Mark">
-            <Setter Property="SelectableTextBlock.Background" Value="{DynamicResource TextBlockMarkBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBlockMarkBackground}" />
         </Style>
         <Style Selector="^.Underline">
-            <Setter Property="SelectableTextBlock.TextDecorations" Value="Underline" />
+            <Setter Property="TextDecorations" Value="Underline" />
         </Style>
         <Style Selector="^.Delete">
-            <Setter Property="SelectableTextBlock.TextDecorations" Value="StrikeThrough" />
+            <Setter Property="TextDecorations" Value="StrikeThrough" />
         </Style>
         <Style Selector="^.Underline.Delete">
-            <Setter Property="TextBlock.TextDecorations">
+            <Setter Property="TextDecorations">
                 <TextDecorationCollection>
                     <TextDecoration Location="Underline" />
                     <TextDecoration Location="Strikethrough" />
@@ -53,7 +53,7 @@
             </Setter>
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
         <Style Selector="^[IsEnabled=True]">
             <Setter Property="ContextFlyout" Value="{StaticResource SelectableTextBlockContextFlyout}" />
@@ -65,25 +65,25 @@
         TargetType="SelectableTextBlock">
         <Setter Property="SelectableTextBlock.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
-            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
         <Style Selector="^.H2">
-            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
         </Style>
         <Style Selector="^.H3">
-            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
         </Style>
         <Style Selector="^.H4">
-            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
         </Style>
         <Style Selector="^.H5">
-            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
         </Style>
         <Style Selector="^.H6">
-            <Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/Slider.axaml b/src/Semi.Avalonia/Controls/Slider.axaml
index cc78c77..1af8a6b 100644
--- a/src/Semi.Avalonia/Controls/Slider.axaml
+++ b/src/Semi.Avalonia/Controls/Slider.axaml
@@ -253,7 +253,7 @@
         </Style>
 
         <Style Selector="^:error /template/ Thumb#thumb">
-            <Setter Property="Thumb.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
         </Style>
 
         <!--  Disabled State  -->
@@ -268,7 +268,7 @@
             </Style>
 
             <Style Selector="^ /template/ Thumb">
-                <Setter Property="Thumb.BorderBrush" Value="{DynamicResource SliderThumbDisabledBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource SliderThumbDisabledBorderBrush}" />
             </Style>
         </Style>
 
diff --git a/src/Semi.Avalonia/Controls/SplitButton.axaml b/src/Semi.Avalonia/Controls/SplitButton.axaml
index 5893e4d..66644d1 100644
--- a/src/Semi.Avalonia/Controls/SplitButton.axaml
+++ b/src/Semi.Avalonia/Controls/SplitButton.axaml
@@ -137,77 +137,77 @@
         <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
         <Style Selector="^ /template/ Button">
             <Style Selector="^:pointerover">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^.Primary /template/ Button">
-            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Secondary /template/ Button">
-            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Tertiary /template/ Button">
-            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Success /template/ Button">
-            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Warning /template/ Button">
-            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
             </Style>
         </Style>
         <Style Selector="^.Danger /template/ Button">
-            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonSolidForeground}" />
-            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled /template/ Button">
-            <Setter Property="SplitButton.Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
-            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 
@@ -218,9 +218,9 @@
         <Setter Property="SplitButton.Background" Value="Transparent" />
         <Setter Property="SplitButton.BorderBrush" Value="Transparent" />
         <Style Selector="^:disabled /template/ Button">
-            <Setter Property="SplitButton.BorderBrush" Value="Transparent" />
-            <Setter Property="SplitButton.Background" Value="Transparent" />
-            <Setter Property="SplitButton.Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index 6f2e748..90014f5 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -40,24 +40,24 @@
             <Setter Property="Orientation" Value="Vertical" />
         </Style>
         <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Border.Width" Value="1" />
-            <Setter Property="Border.VerticalAlignment" Value="Stretch" />
-            <Setter Property="Border.HorizontalAlignment" Value="Left" />
+            <Setter Property="Width" Value="1" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
         </Style>
         <Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Border.Width" Value="1" />
-            <Setter Property="Border.VerticalAlignment" Value="Stretch" />
-            <Setter Property="Border.HorizontalAlignment" Value="Right" />
+            <Setter Property="Width" Value="1" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
         </Style>
         <Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Border.Height" Value="1" />
-            <Setter Property="Border.HorizontalAlignment" Value="Stretch" />
-            <Setter Property="Border.VerticalAlignment" Value="Bottom" />
+            <Setter Property="Height" Value="1" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
         </Style>
         <Style Selector="^[TabStripPlacement=Bottom] /template/ Border#PART_BorderSeparator">
-            <Setter Property="Border.Height" Value="1" />
-            <Setter Property="Border.HorizontalAlignment" Value="Stretch" />
-            <Setter Property="Border.VerticalAlignment" Value="Top" />
+            <Setter Property="Height" Value="1" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Top" />
         </Style>
         <!--
         <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
diff --git a/src/Semi.Avalonia/Controls/TabItem.axaml b/src/Semi.Avalonia/Controls/TabItem.axaml
index a9483b2..3e1c19b 100644
--- a/src/Semi.Avalonia/Controls/TabItem.axaml
+++ b/src/Semi.Avalonia/Controls/TabItem.axaml
@@ -50,24 +50,24 @@
         <!--  Selected state  -->
         <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderSelectedForeground}" />
-            <Setter Property="ContentPresenter.FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
+            <Setter Property="FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
         </Style>
 
         <Style Selector="^:not(:selected)">
             <Setter Property="Cursor" Value="Hand" />
             <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="ContentPresenter.Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_SelectedPipe">
-                <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_SelectedPipe">
-                <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
-            <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
         </Style>
 
         <!--  Selected Pressed state  -->
@@ -85,10 +85,10 @@
         <!--  TabStripPlacement States Group  -->
         <Style Selector="^[TabStripPlacement=Top]">
             <Style Selector="^ /template/Border#PART_SelectedPipe">
-                <Setter Property="Border.Height" Value="2" />
-                <Setter Property="Border.Margin" Value="0" />
-                <Setter Property="Border.HorizontalAlignment" Value="Stretch" />
-                <Setter Property="Border.VerticalAlignment" Value="Bottom" />
+                <Setter Property="Height" Value="2" />
+                <Setter Property="Margin" Value="0" />
+                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="VerticalAlignment" Value="Bottom" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Margin" Value="0,0,0,4" />
@@ -96,10 +96,10 @@
         </Style>
         <Style Selector="^[TabStripPlacement=Bottom]">
             <Style Selector="^ /template/Border#PART_SelectedPipe">
-                <Setter Property="Border.Height" Value="2" />
-                <Setter Property="Border.Margin" Value="0" />
-                <Setter Property="Border.HorizontalAlignment" Value="Stretch" />
-                <Setter Property="Border.VerticalAlignment" Value="Top" />
+                <Setter Property="Height" Value="2" />
+                <Setter Property="Margin" Value="0" />
+                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="VerticalAlignment" Value="Top" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Margin" Value="0,4,0,0" />
@@ -107,22 +107,22 @@
         </Style>
         <Style Selector="^[TabStripPlacement=Left]">
             <Style Selector="^/template/ Border#PART_SelectedPipe">
-                <Setter Property="Border.Width" Value="2" />
-                <Setter Property="Border.Margin" Value="0" />
-                <Setter Property="Border.HorizontalAlignment" Value="Left" />
-                <Setter Property="Border.VerticalAlignment" Value="Stretch" />
+                <Setter Property="Width" Value="2" />
+                <Setter Property="Margin" Value="0" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
+                <Setter Property="VerticalAlignment" Value="Stretch" />
             </Style>
             <Style Selector="^ /template/ Label#PART_ContentPresenter">
                 <Setter Property="Margin" Value="8,0,0,0" />
             </Style>
         </Style>
         <Style Selector="^[TabStripPlacement=Right]">
-            <Setter Property="TabItem.HorizontalContentAlignment" Value="Right" />
+            <Setter Property="HorizontalContentAlignment" Value="Right" />
             <Style Selector="^ /template/ Border#PART_SelectedPipe">
-                <Setter Property="Border.Width" Value="2" />
-                <Setter Property="Border.Margin" Value="0" />
-                <Setter Property="Border.HorizontalAlignment" Value="Right" />
-                <Setter Property="Border.VerticalAlignment" Value="Stretch" />
+                <Setter Property="Width" Value="2" />
+                <Setter Property="Margin" Value="0" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+                <Setter Property="VerticalAlignment" Value="Stretch" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Margin" Value="0,0,8,0" />
diff --git a/src/Semi.Avalonia/Controls/TabStrip.axaml b/src/Semi.Avalonia/Controls/TabStrip.axaml
index 0780bd8..fa5a9d1 100644
--- a/src/Semi.Avalonia/Controls/TabStrip.axaml
+++ b/src/Semi.Avalonia/Controls/TabStrip.axaml
@@ -75,24 +75,24 @@
         <!--  Selected state  -->
         <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderSelectedForeground}" />
-            <Setter Property="ContentPresenter.FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
+            <Setter Property="FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
         </Style>
 
         <Style Selector="^:not(:selected)">
             <Setter Property="Cursor" Value="Hand" />
             <Style Selector="^:pointerover /template/ Label#PART_ContentPresenter">
-                <Setter Property="Label.Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
+                <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_SelectedPipe">
-                <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_SelectedPipe">
-                <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
-            <Setter Property="Border.Background" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
         </Style>
 
         <!--  Selected Pressed state  -->
diff --git a/src/Semi.Avalonia/Controls/TextBlock.axaml b/src/Semi.Avalonia/Controls/TextBlock.axaml
index e750c3a..53cab3e 100644
--- a/src/Semi.Avalonia/Controls/TextBlock.axaml
+++ b/src/Semi.Avalonia/Controls/TextBlock.axaml
@@ -10,34 +10,34 @@
     <ControlTheme x:Key="{x:Type TextBlock}" TargetType="TextBlock">
         <!--<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />-->
         <Style Selector="^.Secondary">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
         </Style>
         <Style Selector="^.Quaternary">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
         </Style>
         <Style Selector="^.Mark">
-            <Setter Property="TextBlock.Background" Value="{DynamicResource TextBlockMarkBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBlockMarkBackground}" />
         </Style>
         <Style Selector="^.Underline">
-            <Setter Property="TextBlock.TextDecorations" Value="Underline" />
+            <Setter Property="TextDecorations" Value="Underline" />
         </Style>
         <Style Selector="^.Delete">
-            <Setter Property="TextBlock.TextDecorations" Value="StrikeThrough" />
+            <Setter Property="TextDecorations" Value="StrikeThrough" />
         </Style>
         <Style Selector="^.Underline.Delete">
-            <Setter Property="TextBlock.TextDecorations">
+            <Setter Property="TextDecorations">
                 <TextDecorationCollection>
                     <TextDecoration Location="Underline" />
                     <TextDecoration Location="Strikethrough" />
@@ -45,7 +45,7 @@
             </Setter>
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
     <ControlTheme
@@ -54,25 +54,25 @@
         TargetType="TextBlock">
         <Setter Property="TextBlock.FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
         <Style Selector="^.H1">
-            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH1FontSize}" />
         </Style>
         <Style Selector="^.H2">
-            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH2FontSize}" />
         </Style>
         <Style Selector="^.H3">
-            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH3FontSize}" />
         </Style>
         <Style Selector="^.H4">
-            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH4FontSize}" />
         </Style>
         <Style Selector="^.H5">
-            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH5FontSize}" />
         </Style>
         <Style Selector="^.H6">
-            <Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 0648541..368d5cb 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -41,7 +41,7 @@
                     </ControlTemplate>
                 </Setter>
                 <Style Selector="^:pointerover">
-                    <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonPointeroverForeground}" />
+                    <Setter Property="Foreground" Value="{DynamicResource TextBoxButtonPointeroverForeground}" />
                 </Style>
             </ControlTheme>
             <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
@@ -163,20 +163,20 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.Background" Value="{DynamicResource TextBoxPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
         </Style>
         <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
-            <Setter Property="Border.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
         </Style>
 
         <Style Selector="^:error">
@@ -185,30 +185,30 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                <Setter Property="Border.BorderBrush" Value="Transparent" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                <Setter Property="Border.BorderBrush" Value="Transparent" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^.clearButton, ^.ClearButton">
             <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="Button.IsVisible" Value="True" />
+                <Setter Property="IsVisible" Value="True" />
             </Style>
             <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="Button.IsVisible" Value="True" />
+                <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">
-                <Setter Property="ToggleButton.IsVisible" Value="True" />
+                <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
         <Style Selector="^.Large /template/ Border#PART_ContentPresenterBorder">
@@ -219,15 +219,15 @@
         </Style>
 
         <Style Selector="^.Bordered">
-            <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxBorderedDefaultBackground}" />
-            <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxBorderedDefaultBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxBorderedDefaultBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedDefaultBorderBrush}" />
             <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
-                <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:focus">
-                <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
-                <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
             </Style>
             <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
                 <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
@@ -240,16 +240,16 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
                 </Style>
                 <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                    <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
                 </Style>
             </Style>
         </Style>
@@ -333,20 +333,20 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.Background" Value="{DynamicResource TextBoxPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
         </Style>
         <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
-            <Setter Property="Border.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
         </Style>
 
         <Style Selector="^:error">
@@ -355,16 +355,16 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                <Setter Property="Border.BorderBrush" Value="Transparent" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                <Setter Property="Border.BorderBrush" Value="Transparent" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                <Setter Property="Border.BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Semi.Avalonia/Controls/ToggleButton.axaml b/src/Semi.Avalonia/Controls/ToggleButton.axaml
index ba755c6..3393064 100644
--- a/src/Semi.Avalonia/Controls/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleButton.axaml
@@ -58,203 +58,203 @@
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultPointeroverBackground}" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultPressedBackground}" />
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
         </Style>
 
         <Style Selector="^.Primary">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultPrimaryForeground}" />
         </Style>
         <Style Selector="^.Secondary">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultSecondaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultSecondaryForeground}" />
         </Style>
         <Style Selector="^.Tertiary">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultTertiaryForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultTertiaryForeground}" />
         </Style>
         <Style Selector="^.Success">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultSuccessForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultSuccessForeground}" />
         </Style>
         <Style Selector="^.Warning">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultWarningForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultWarningForeground}" />
         </Style>
         <Style Selector="^.Danger">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultDangerForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultDangerForeground}" />
         </Style>
 
         <Style Selector="^:checked">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonCheckedForeground}" />
-            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonCheckedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
             <Style Selector="^.Primary">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedBackground}" />
             </Style>
             <Style Selector="^.Secondary">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryCheckedBackground}" />
             </Style>
             <Style Selector="^.Tertiary">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonTertiaryCheckedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonTertiaryCheckedBackground}" />
             </Style>
             <Style Selector="^.Success">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSuccessCheckedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonSuccessCheckedBackground}" />
             </Style>
             <Style Selector="^.Warning">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonWarningCheckedBackground}" />
             </Style>
             <Style Selector="^.Danger">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonDangerCheckedBackground}" />
             </Style>
             <Style Selector="^:pointerover">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
                 <Style Selector="^.Primary">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Secondary">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPointeroverBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Tertiary">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonTertiaryCheckedPointeroverBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonTertiaryCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Success">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSuccessCheckedPointeroverBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonSuccessCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Warning">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedPointeroverBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonWarningCheckedPointeroverBackground}" />
                 </Style>
                 <Style Selector="^.Danger">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedPointeroverBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonDangerCheckedPointeroverBackground}" />
                 </Style>
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
                 <Style Selector="^.Primary">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Secondary">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPressedBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Tertiary">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonTertiaryCheckedPressedBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonTertiaryCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Success">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSuccessCheckedPressedBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonSuccessCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Warning">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningCheckedPressedBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonWarningCheckedPressedBackground}" />
                 </Style>
                 <Style Selector="^.Danger">
-                    <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerCheckedPressedBackground}" />
+                    <Setter Property="Background" Value="{DynamicResource ToggleButtonDangerCheckedPressedBackground}" />
                 </Style>
             </Style>
             <Style Selector="^:disabled">
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDefaultDisabledBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:indeterminate">
-            <Setter Property="ToggleButton.BorderThickness" Value="1" />
-            <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
-            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
             <Style Selector="^.Primary">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Secondary">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBackground}" />
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Tertiary">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonTertiaryIndeterminateBackground}" />
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminateBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonTertiaryIndeterminateBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Success">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonSuccessIndeterminateBackground}" />
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminateBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonSuccessIndeterminateBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Warning">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonWarningIndeterminateBackground}" />
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminateBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonWarningIndeterminateBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^.Danger">
-                <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDangerIndeterminateBackground}" />
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminateBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleButtonDangerIndeterminateBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminateBorderBrush}" />
             </Style>
             <Style Selector="^:pointerover">
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
-                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
                 <Style Selector="^.Primary">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Secondary">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Tertiary">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Success">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSuccessIndeterminatePointeroverForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonSuccessIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Warning">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePointeroverForeground}" />
                 </Style>
                 <Style Selector="^.Danger">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePointeroverForeground}" />
                 </Style>
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
-                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
                 <Style Selector="^.Primary">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonPrimaryIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Secondary">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonSecondaryIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Tertiary">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonTertiaryIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Success">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminatePressedBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonSuccessIndeterminatePressedForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonSuccessIndeterminatePressedBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonSuccessIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Warning">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonWarningIndeterminatePressedForeground}" />
                 </Style>
                 <Style Selector="^.Danger">
-                    <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedBorderBrush}" />
-                    <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedForeground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedBorderBrush}" />
+                    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDangerIndeterminatePressedForeground}" />
                 </Style>
             </Style>
             <Style Selector="^:disabled">
-                <Setter Property="ToggleButton.BorderBrush" Value="{DynamicResource ToggleButtonIndeterminateDisabledBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonIndeterminateDisabledBorderBrush}" />
             </Style>
         </Style>
 
         <Style Selector="^:disabled">
-            <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ToggleButtonDefaultDisabledForeground}" />
-            <Setter Property="ToggleButton.Background" Value="{DynamicResource ToggleButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ToggleButtonDefaultDisabledForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleButtonDefaultDisabledBackground}" />
         </Style>
 
         <Style Selector="^.Large">
-            <Setter Property="ToggleButton.Padding" Value="{DynamicResource ButtonLargePadding}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="ToggleButton.Padding" Value="{DynamicResource ButtonSmallPadding}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
index 47e8744..e125555 100644
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -113,45 +113,45 @@
 
         <Style Selector="^:unchecked">
             <Style Selector="^ /template/ ContentPresenter#PART_OnContentPresenter">
-                <Setter Property="ContentPresenter.IsVisible" Value="False" />
+                <Setter Property="IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_OffContentPresenter">
-                <Setter Property="ContentPresenter.IsVisible" Value="True" />
+                <Setter Property="IsVisible" Value="True" />
             </Style>
             <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDefaultBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDefaultBackground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedPressedBackground}" />
             </Style>
             <Style Selector="^:disabled /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBackground}" />
-                <Setter Property="Border.BorderBrush" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBorderBrush}" />
-                <Setter Property="Border.BorderThickness" Value="1" />
+                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchContainerUnCheckedDisabledBorderBrush}" />
+                <Setter Property="BorderThickness" Value="1" />
             </Style>
         </Style>
 
         <Style Selector="^:checked">
             <Style Selector="^ /template/ ContentPresenter#PART_OnContentPresenter">
-                <Setter Property="ContentPresenter.IsVisible" Value="True" />
+                <Setter Property="IsVisible" Value="True" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_OffContentPresenter">
-                <Setter Property="ContentPresenter.IsVisible" Value="False" />
+                <Setter Property="IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedDefaultBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedDefaultBackground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedPressedBackground}" />
             </Style>
             <Style Selector="^:disabled /template/ Border#SwitchBackgroundBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource ToggleSwitchContainerCheckedDisabledBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerCheckedDisabledBackground}" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Semi.Avalonia/Controls/TreeView.axaml b/src/Semi.Avalonia/Controls/TreeView.axaml
index 4904225..45c12c0 100644
--- a/src/Semi.Avalonia/Controls/TreeView.axaml
+++ b/src/Semi.Avalonia/Controls/TreeView.axaml
@@ -85,10 +85,10 @@
         </Setter>
 
         <Style Selector="^:checked /template/ PathIcon#PART_ExpandIconPath">
-            <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^:pointerover /template/ PathIcon#PART_ExpandIconPath">
-            <Setter Property="PathIcon.Foreground" Value="{DynamicResource TreeViewItemIconHoverForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemIconHoverForeground}" />
         </Style>
     </ControlTheme>
 
@@ -173,8 +173,8 @@
         </Style>
 
         <Style Selector="^:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
-            <Setter Property="ToggleButton.Opacity" Value="0" />
-            <Setter Property="ToggleButton.IsHitTestVisible" Value="False" />
+            <Setter Property="Opacity" Value="0" />
+            <Setter Property="IsHitTestVisible" Value="False" />
         </Style>
 
     </ControlTheme>