diff --git a/demo/Ursa.Demo/Ursa.Demo.csproj b/demo/Ursa.Demo/Ursa.Demo.csproj
index 660a5d6..7bbad0a 100644
--- a/demo/Ursa.Demo/Ursa.Demo.csproj
+++ b/demo/Ursa.Demo/Ursa.Demo.csproj
@@ -30,10 +30,4 @@
     <ItemGroup>
       <Folder Include="Models\" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="Semi.Avalonia">
-        <HintPath>Assets\Semi.Avalonia.dll</HintPath>
-      </Reference>
-    </ItemGroup>
 </Project>
diff --git a/src/Ursa.Themes.Semi/Controls/Banner.axaml b/src/Ursa.Themes.Semi/Controls/Banner.axaml
index ff2767a..e69fc97 100644
--- a/src/Ursa.Themes.Semi/Controls/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Banner.axaml
@@ -4,10 +4,10 @@
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner">
-        <Setter Property="u:Banner.BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
-        <Setter Property="u:Banner.BorderBrush" Value="{DynamicResource BannerBorderBrush}" />
-        <Setter Property="u:Banner.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="u:Banner.Template">
+        <Setter Property="BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BannerBorderBrush}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:Banner">
                 <Border
                     Name="PART_Container"
diff --git a/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
index 1851c5d..049157d 100644
--- a/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
@@ -56,13 +56,13 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="Margin" Value="0 0 4 0"></Setter>
+            <Setter Property="Margin" Value="0 0 4 0" />
         </Style>
         <Style Selector="^ /template/ ContentPresenter#Separator">
-            <Setter Property="Margin" Value="4 0"></Setter>
+            <Setter Property="Margin" Value="4 0" />
         </Style>
         <Style Selector="^[IsReadOnly=False]">
-            <Setter Property="Cursor" Value="Hand"></Setter>
+            <Setter Property="Cursor" Value="Hand" />
         </Style>
         <Style Selector="^:last">
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
diff --git a/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
index 06136d4..f2c197f 100644
--- a/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
@@ -16,13 +16,13 @@
         <Setter Property="Background" Value="{DynamicResource ButtonGroupDefaultBackground}" />
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="ClipToBounds" Value="True" />
-        <Setter Property="u:ButtonGroup.ItemContainerTheme" Value="{DynamicResource ButtonGroupItemTheme}" />
-        <Setter Property="u:ButtonGroup.ItemsPanel">
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource ButtonGroupItemTheme}" />
+        <Setter Property="ItemsPanel">
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" />
             </ItemsPanelTemplate>
         </Setter>
-        <Setter Property="u:ButtonGroup.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:ButtonGroup">
                 <Border
                     Background="{TemplateBinding Background}"
@@ -43,7 +43,7 @@
         <Setter Property="Padding" Value="{DynamicResource ButtonGroupDefaultPadding}" />
         <Setter Property="FontWeight" Value="{DynamicResource ButtonGroupDefaultFontWeight}" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Button.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="Button">
                 <DockPanel LastChildFill="True">
                     <Rectangle
diff --git a/src/Ursa.Themes.Semi/Controls/DisableContainer.axaml b/src/Ursa.Themes.Semi/Controls/DisableContainer.axaml
index f6bccba..c84f36e 100644
--- a/src/Ursa.Themes.Semi/Controls/DisableContainer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DisableContainer.axaml
@@ -7,7 +7,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DisableContainer">
                 <Panel>
-                    <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
+                    <ContentPresenter Content="{TemplateBinding Content}" />
                     <iri:PureRectangle Background="Transparent" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.IsEnabled, Converter={x:Static BoolConverters.Not}}" Cursor="No" ToolTip.Tip="{TemplateBinding DisabledTip}"/>
                 </Panel>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/Divider.axaml b/src/Ursa.Themes.Semi/Controls/Divider.axaml
index 2469b3b..9a8eda6 100644
--- a/src/Ursa.Themes.Semi/Controls/Divider.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Divider.axaml
@@ -9,28 +9,28 @@
     </Design.PreviewWith>
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="DividerLeftLine" TargetType="{x:Type Rectangle}">
-        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
-        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
-        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
+        <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
     <ControlTheme x:Key="DividerRightLine" TargetType="{x:Type Rectangle}">
-        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
-        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
-        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
+        <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
     <ControlTheme x:Key="DividerContentPresenter" TargetType="{x:Type ContentPresenter}">
-        <Setter Property="ContentPresenter.Content" Value="{TemplateBinding Content}" />
-        <Setter Property="ContentPresenter.Background" Value="{TemplateBinding Background}" />
-        <Setter Property="TextElement.Foreground" Value="{TemplateBinding Foreground}" />
-        <Setter Property="ContentPresenter.ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
-        <Setter Property="TextElement.FontFamily" Value="{TemplateBinding FontFamily}" />
-        <Setter Property="TextElement.FontWeight" Value="{TemplateBinding FontWeight}" />
-        <Setter Property="TextElement.FontSize" Value="{TemplateBinding FontSize}" />
-        <Setter Property="ContentPresenter.Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
+        <Setter Property="Content" Value="{TemplateBinding Content}" />
+        <Setter Property="Background" Value="{TemplateBinding Background}" />
+        <Setter Property="Foreground" Value="{TemplateBinding Foreground}" />
+        <Setter Property="ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
+        <Setter Property="FontFamily" Value="{TemplateBinding FontFamily}" />
+        <Setter Property="FontWeight" Value="{TemplateBinding FontWeight}" />
+        <Setter Property="FontSize" Value="{TemplateBinding FontSize}" />
+        <Setter Property="Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
@@ -123,4 +123,4 @@
             </Setter>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
index 9a9e949..79859b1 100644
--- a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
@@ -4,19 +4,19 @@
     xmlns:u="https://irihi.tech/ursa"
     xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa">
     <ControlTheme x:Key="{x:Type u:DualBadge}" TargetType="u:DualBadge">
-        <Setter Property="u:DualBadge.CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
-        <Setter Property="u:DualBadge.FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
-        <Setter Property="u:DualBadge.IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" />
-        <Setter Property="u:DualBadge.HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" />
-        <Setter Property="u:DualBadge.HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" />
-        <Setter Property="u:DualBadge.Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" />
-        <Setter Property="u:DualBadge.Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" />
-        <Setter Property="u:DualBadge.ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" />
-        <Setter Property="u:DualBadge.HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" />
-        <Setter Property="u:DualBadge.VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" />
-        <Setter Property="u:DualBadge.UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" />
-        <Setter Property="u:DualBadge.Padding" Value="{DynamicResource DualBadgeDefaultPadding}" />
-        <Setter Property="u:DualBadge.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
+        <Setter Property="FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
+        <Setter Property="IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" />
+        <Setter Property="HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" />
+        <Setter Property="HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" />
+        <Setter Property="Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" />
+        <Setter Property="ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" />
+        <Setter Property="HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" />
+        <Setter Property="VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" />
+        <Setter Property="UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" />
+        <Setter Property="Padding" Value="{DynamicResource DualBadgeDefaultPadding}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type u:DualBadge}">
                 <Border
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
diff --git a/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml b/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
index 163b6ee..c7f4153 100644
--- a/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
@@ -19,14 +19,14 @@
         <Style Selector="^[DisplayDescription=True] /template/ ComboBox">
             <Setter Property="ItemTemplate">
                 <DataTemplate x:DataType="u:EnumItemTuple">
-                    <TextBlock Text="{Binding DisplayName}"></TextBlock>
+                    <TextBlock Text="{Binding DisplayName}" />
                 </DataTemplate>
             </Setter>
         </Style>
         <Style Selector="^[DisplayDescription=False] /template/ ComboBox">
             <Setter Property="ItemTemplate">
                 <DataTemplate x:DataType="u:EnumItemTuple">
-                    <TextBlock Text="{Binding Value}"></TextBlock>
+                    <TextBlock Text="{Binding Value}" />
                 </DataTemplate>
             </Setter>
         </Style>
diff --git a/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml b/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
index 636a707..3dfbe75 100644
--- a/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
+++ b/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
@@ -43,8 +43,8 @@
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
         <Setter Property="ContextFlyout" Value="{DynamicResource IPv4BoxMenuFlyout}" />
-        <Setter Property="FocusAdorner" Value="{x:Null}"></Setter>
-        <Setter Property="u:IPv4Box.Template">
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:IPv4Box">
                 <Border
                     Name="PART_Border"
diff --git a/src/Ursa.Themes.Semi/Controls/IconButton.axaml b/src/Ursa.Themes.Semi/Controls/IconButton.axaml
index e2706ab..42ea23a 100644
--- a/src/Ursa.Themes.Semi/Controls/IconButton.axaml
+++ b/src/Ursa.Themes.Semi/Controls/IconButton.axaml
@@ -109,7 +109,7 @@
         </Style>
         
         <Style Selector="^:empty[IsLoading=False] /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Margin" Value="0"></Setter>
+            <Setter Property="Margin" Value="0" />
         </Style>
 
         <Style Selector="^:right">
diff --git a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
index c8865d5..62d013d 100644
--- a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
@@ -12,7 +12,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
         <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
-        <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="8 0" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:KeyGestureInput">
diff --git a/src/Ursa.Themes.Semi/Controls/Loading.axaml b/src/Ursa.Themes.Semi/Controls/Loading.axaml
index be8337c..db54627 100644
--- a/src/Ursa.Themes.Semi/Controls/Loading.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Loading.axaml
@@ -7,7 +7,7 @@
     <!--  Add Resources Here  -->
     <converters:BrushToColorConverter x:Key="BrushToColorConverter" />
     <ControlTheme x:Key="{x:Type u:LoadingIcon}" TargetType="u:LoadingIcon">
-        <Setter Property="IsLoading" Value="True"></Setter>
+        <Setter Property="IsLoading" Value="True" />
         <Setter Property="Foreground" Value="{DynamicResource LoadingIconForeground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:LoadingIcon">
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 481096a..a9cf981 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -155,7 +155,7 @@
     <ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl">
         <Setter Property="CornerRadius" Value="12" />
         <Setter Property="Padding" Value="48 24" />
-        <Setter Property="u:DialogControlBase.CanDragMove" Value="True"></Setter>
+        <Setter Property="u:DialogControlBase.CanDragMove" Value="True" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:MessageBoxControl">
                 <Border
diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index d5ec4cd..aacc0c7 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
@@ -11,7 +11,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="MaxDropdownHeight" Value="300" />
-        <Setter Property="MaxSelectionBoxHeight" Value="270"></Setter>
+        <Setter Property="MaxSelectionBoxHeight" Value="270" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Padding" Value="12 4" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
index 1d83c3d..273c5f3 100644
--- a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
@@ -19,11 +19,10 @@
                         HorizontalAlignment="Stretch"
                         HorizontalScrollBarVisibility="Disabled"
                         AllowAutoHide="True"
-                        
                         VerticalScrollBarVisibility="Auto">
                         <ScrollViewer.Styles>
                             <Style Selector="ScrollViewer /template/ ScrollBar">
-                                <Setter Property="Opacity" Value="0"></Setter>
+                                <Setter Property="Opacity" Value="0" />
                             </Style>
                             <Style Selector="ScrollViewer:pointerover">
                                 <Style Selector="^ /template/ ScrollBar#PART_HorizontalScrollBar">
@@ -40,11 +39,11 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:not(:horizontal-collapsed)">
-            <Setter Property="Width" Value="{Binding $self.ExpandWidth}"></Setter>
+            <Setter Property="Width" Value="{Binding $self.ExpandWidth}" />
         </Style>
         <Style Selector="^:horizontal-collapsed">
             <Setter Property="Width" Value="{Binding $self.CollapseWidth}" />
-            <Setter Property="Grid.IsSharedSizeScope" Value="False"></Setter>
+            <Setter Property="Grid.IsSharedSizeScope" Value="False" />
         </Style>
     </ControlTheme>
 
@@ -150,10 +149,10 @@
         </Setter>
         <Setter Property="Template" Value="{StaticResource DefaultNavMenuItemTemplate}" />
         <Style Selector="^:selected">
-            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
                 <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
@@ -176,9 +175,10 @@
         <Style Selector="^:horizontal-collapsed:first-level">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Style Selector="^ /template/ Border#PART_Border">
-                <Setter Property="ToolTip.Tip" >
+                <Setter Property="ToolTip.Tip">
                     <Template>
-                        <ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}" ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}"></ContentPresenter>
+                        <ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}"
+                                          ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}" />
                     </Template>
                 </Setter>
                 <Setter Property="ToolTip.ShowDelay" Value="0" />
@@ -208,7 +208,7 @@
             </Style>
         </Style>
         <Style Selector="^:horizontal-collapsed:first-level">
-            <Setter Property="Grid.IsSharedSizeScope" Value="True"></Setter>
+            <Setter Property="Grid.IsSharedSizeScope" Value="True" />
         </Style>
         <Style Selector="^[IsSeparator=True]">
             <Setter Property="Template">
@@ -224,11 +224,11 @@
                             Content="{TemplateBinding Header}"
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             Foreground="{DynamicResource TextBlockQuaternaryForeground}"
-                            IsVisible="{TemplateBinding Header,
-                                                        Converter={x:Static ObjectConverters.IsNotNull}}">
+                            IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}">
                             <ContentPresenter.Styles>
                                 <Style Selector="TextBlock">
-                                    <Setter Property="FontSize" Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
+                                    <Setter Property="FontSize"
+                                            Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
                                 </Style>
                             </ContentPresenter.Styles>
                         </ContentPresenter>
@@ -254,4 +254,4 @@
         </Style>
     </ControlTheme>
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Pagination.axaml b/src/Ursa.Themes.Semi/Controls/Pagination.axaml
index 6b2eeca..558bede 100644
--- a/src/Ursa.Themes.Semi/Controls/Pagination.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Pagination.axaml
@@ -52,7 +52,7 @@
     </ControlTheme>
 
     <ControlTheme x:Key="TinyPagination" TargetType="{x:Type u:Pagination}">
-        <Setter Property="DisplayCurrentPageInQuickJumper" Value="True"></Setter>
+        <Setter Property="DisplayCurrentPageInQuickJumper" Value="True" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:Pagination">
                 <StackPanel Orientation="Horizontal">
diff --git a/src/Ursa.Themes.Semi/Controls/PinCode.axaml b/src/Ursa.Themes.Semi/Controls/PinCode.axaml
index 5fcb719..e7b0066 100644
--- a/src/Ursa.Themes.Semi/Controls/PinCode.axaml
+++ b/src/Ursa.Themes.Semi/Controls/PinCode.axaml
@@ -11,7 +11,7 @@
         <Setter Property="Width" Value="{DynamicResource TextBoxDefaultHeight}" />
         <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}"></Setter>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
         <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Template">
diff --git a/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml b/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
index dc205d0..e0859d3 100644
--- a/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
@@ -6,7 +6,7 @@
     <ControlTheme x:Key="{x:Type u:ScrollToButton}" TargetType="u:ScrollToButton">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Margin" Value="0, 0, 16, 16" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ScrollToButton">
@@ -36,13 +36,13 @@
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
         <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(90deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(180deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
         </Style>
         <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(270deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(270deg)" />
         </Style>
     </ControlTheme>
     
@@ -50,7 +50,7 @@
     <ControlTheme x:Key="PrimaryScrollToButton" TargetType="u:ScrollToButton">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Margin" Value="0, 0, 16, 16" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ScrollToButton">
@@ -80,13 +80,13 @@
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
         <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(90deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(180deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
         </Style>
         <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(270deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(270deg)" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/SelectionList.axaml b/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
index e41ca89..b647d58 100644
--- a/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
+++ b/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
@@ -14,7 +14,7 @@
                     Theme="{DynamicResource CardBorder}" />
             </Template>
         </Setter>
-        <Setter Property="ListBox.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:SelectionList">
                 <Border
                     Name="border"
diff --git a/src/Ursa.Themes.Semi/Controls/Skeleton.axaml b/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
index f515183..e36451d 100644
--- a/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
@@ -30,14 +30,11 @@
                             Classes.Active="{Binding Path= IsActive, RelativeSource={RelativeSource TemplatedParent}}"
                             IsHitTestVisible="{TemplateBinding IsLoading}"
                             Background="{DynamicResource SkeletonDefaultBackground}"
-                            IsVisible="{TemplateBinding IsLoading}">
-                        </iri:PureRectangle>
+                            IsVisible="{TemplateBinding IsLoading}" />
                         <iri:PureRectangle
                             x:Name="PART_ActiveBorder"
                             IsHitTestVisible="{TemplateBinding IsLoading}"
-                            IsVisible="{TemplateBinding IsLoading}"
-                            >
-                        </iri:PureRectangle>
+                            IsVisible="{TemplateBinding IsLoading}" />
                     </Panel>
                 </Border>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/TagInput.axaml b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
index 40ef851..e3a8732 100644
--- a/src/Ursa.Themes.Semi/Controls/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
@@ -49,7 +49,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:empty /template/ TextBlock#PART_Watermark">
-            <Setter Property="IsVisible" Value="True"></Setter>
+            <Setter Property="IsVisible" Value="True" />
         </Style>
         <Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
diff --git a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
index 228b4cb..7968a38 100644
--- a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
@@ -20,16 +20,16 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:dark /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}" />
         </Style>
         <Style Selector="^:light /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}" />
         </Style>
         <Style Selector="^ /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/TimeBox.axaml b/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
index 0eed466..d19e56e 100644
--- a/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
@@ -150,7 +150,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:focus-within">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled">
             <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
diff --git a/src/Ursa.Themes.Semi/Controls/TimePicker.axaml b/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
index 61661c2..411df8e 100644
--- a/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
@@ -133,8 +133,7 @@
                                 InnerRightContent="{TemplateBinding InnerRightContent}"
                                 IsReadOnly="{TemplateBinding IsReadonly}"
                                 Theme="{DynamicResource LooklessTextBox}"
-                                Watermark="{TemplateBinding Watermark}">
-                            </TextBox>
+                                Watermark="{TemplateBinding Watermark}" />
                             <Button
                                 Name="ClearButton"
                                 Grid.Column="1"
diff --git a/src/Ursa.Themes.Semi/Controls/Timeline.axaml b/src/Ursa.Themes.Semi/Controls/Timeline.axaml
index b82087f..0d68e5c 100644
--- a/src/Ursa.Themes.Semi/Controls/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Timeline.axaml
@@ -34,7 +34,7 @@
     <ControlTheme x:Key="{x:Type u:TimelineItem}" TargetType="u:TimelineItem">
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="u:TimelineItem.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:TimelineItem">
                 <Grid
                     Name="PART_RootGrid"
@@ -148,7 +148,7 @@
                 <Setter Property="Grid.Column" Value="2" />
                 <Setter Property="TextAlignment" Value="Left" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
         </Style>
         <Style Selector="^:all-right">
@@ -169,7 +169,7 @@
                 <Setter Property="Grid.Column" Value="0" />
                 <Setter Property="TextAlignment" Value="Right" />
                 <Setter Property="HorizontalAlignment" Value="Right" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
         </Style>
         <Style Selector="^:separate">
@@ -184,7 +184,7 @@
                 <Setter Property="Grid.Column" Value="2" />
                 <Setter Property="HorizontalContentAlignment" Value="Left" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_Time">
                 <Setter Property="Grid.Row" Value="0" />
diff --git a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
index e5211dc..f690e66 100644
--- a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
@@ -269,7 +269,7 @@
         <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" />
         </Style>
-        
+
         <!--  Pressed state  -->
         <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemPressedBackground}" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
index f5ac324..a6ba2d4 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ClosableTagBackground" Opacity="0.15" Color="#888D92" />
-    <SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA"/>
-    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="White"/>
-</ResourceDictionary>
+    <SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="White" />
+</ResourceDictionary>
\ No newline at end of file