diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Paths.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Paths.axaml
index 9e5b3a68..4355368b 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Paths.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Paths.axaml
@@ -136,16 +136,14 @@
         <Setter Property="RenderTransformOrigin"
                 Value="0.5, 0.5" />
         <Setter Property="RenderTransform">
-            <Setter.Value>
-                <TransformGroup>
-                    <ScaleTransform ScaleY="1"
-                                    ScaleX="-1" />
-                    <SkewTransform AngleY="0"
-                                   AngleX="0" />
-                    <RotateTransform Angle="0" />
-                    <TranslateTransform />
-                </TransformGroup>
-            </Setter.Value>
+            <TransformGroup>
+                <ScaleTransform ScaleY="1"
+                                ScaleX="-1" />
+                <SkewTransform AngleY="0"
+                               AngleX="0" />
+                <RotateTransform Angle="0" />
+                <TranslateTransform />
+            </TransformGroup>
         </Setter>
         <Setter Property="Data"
                 Value="{StaticResource LeftGeometry}" />
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Border.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Border.axaml
index 6a7b3264..8383f466 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Border.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Border.axaml
@@ -99,16 +99,14 @@
     <ControlTheme x:Key="BorderClip"
                   TargetType="Border">
         <Setter Property="Clip">
-            <Setter.Value>
-                <MultiBinding Converter="{StaticResource BorderClipConverter}">
-                    <Binding Path="Bounds.Width"
-                             RelativeSource="{RelativeSource Self}" />
-                    <Binding Path="Bounds.Height"
-                             RelativeSource="{RelativeSource Self}" />
-                    <Binding Path="CornerRadius"
-                             RelativeSource="{RelativeSource Self}" />
-                </MultiBinding>
-            </Setter.Value>
+            <MultiBinding Converter="{StaticResource BorderClipConverter}">
+                <Binding Path="Bounds.Width"
+                         RelativeSource="{RelativeSource Self}" />
+                <Binding Path="Bounds.Height"
+                         RelativeSource="{RelativeSource Self}" />
+                <Binding Path="CornerRadius"
+                         RelativeSource="{RelativeSource Self}" />
+            </MultiBinding>
         </Setter>
     </ControlTheme>
 
@@ -116,14 +114,12 @@
                   BasedOn="{StaticResource BorderCircular}"
                   TargetType="Border">
         <Setter Property="Clip">
-            <Setter.Value>
-                <MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
-                    <Binding Path="Bounds"
-                             RelativeSource="{RelativeSource Self}" />
-                    <Binding Path="CornerRadius"
-                             RelativeSource="{RelativeSource Self}" />
-                </MultiBinding>
-            </Setter.Value>
+            <MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
+                <Binding Path="Bounds"
+                         RelativeSource="{RelativeSource Self}" />
+                <Binding Path="CornerRadius"
+                         RelativeSource="{RelativeSource Self}" />
+            </MultiBinding>
         </Setter>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Calendar.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Calendar.axaml
index 01bc566a..c8034a51 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Calendar.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Calendar.axaml
@@ -67,29 +67,27 @@
         <Setter Property="VerticalContentAlignment"
                 Value="Center" />
         <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Panel>
-                        <Rectangle x:Name="TodayBackground"
-                                   Fill="{DynamicResource DangerBrush}"
-                                   RadiusX="16"
-                                   RadiusY="16"
-                                   IsVisible="False" />
-                        <Rectangle x:Name="SelectedBackground"
-                                   Fill="{DynamicResource PrimaryBrush}"
-                                   RadiusY="16"
-                                   RadiusX="16"
-                                   Opacity="0" />
-                        <ContentPresenter Name="PART_ContentPresenter"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          FontSize="{TemplateBinding FontSize}"
-                                          Foreground="{TemplateBinding Foreground}" />
-                    </Panel>
-                </ControlTemplate>
-            </Setter.Value>
+            <ControlTemplate>
+                <Panel>
+                    <Rectangle x:Name="TodayBackground"
+                               Fill="{DynamicResource DangerBrush}"
+                               RadiusX="16"
+                               RadiusY="16"
+                               IsVisible="False" />
+                    <Rectangle x:Name="SelectedBackground"
+                               Fill="{DynamicResource PrimaryBrush}"
+                               RadiusY="16"
+                               RadiusX="16"
+                               Opacity="0" />
+                    <ContentPresenter Name="PART_ContentPresenter"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      FontSize="{TemplateBinding FontSize}"
+                                      Foreground="{TemplateBinding Foreground}" />
+                </Panel>
+            </ControlTemplate>
         </Setter>
 
         <Style Selector="^:today">
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
index e3348906..35be852b 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
@@ -117,9 +117,7 @@
 
             <Style Selector="^ /template/ LayoutTransformControl">
                 <Setter Property="LayoutTransform">
-                    <Setter.Value>
-                        <RotateTransform Angle="-90" />
-                    </Setter.Value>
+                    <RotateTransform Angle="-90" />
                 </Setter>
             </Style>
 
@@ -360,23 +358,21 @@
                   BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
                   TargetType="ProgressBar">
         <Setter Property="Foreground">
-            <Setter.Value>
-                <DrawingBrush TileMode="Tile"
-                              SourceRect="0,0,20,32"
-                              DestinationRect="0,0,20,32"
-                              Stretch="None">
-                    <DrawingBrush.Transform>
-                        <RotateTransform Angle="20" />
-                    </DrawingBrush.Transform>
-                    <DrawingBrush.Drawing>
-                        <GeometryDrawing Brush="{StaticResource SuccessStripeBrush}">
-                            <GeometryDrawing.Geometry>
-                                <RectangleGeometry Rect="0,0,20,32" />
-                            </GeometryDrawing.Geometry>
-                        </GeometryDrawing>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-            </Setter.Value>
+            <DrawingBrush TileMode="Tile"
+                          SourceRect="0,0,20,32"
+                          DestinationRect="0,0,20,32"
+                          Stretch="None">
+                <DrawingBrush.Transform>
+                    <RotateTransform Angle="20" />
+                </DrawingBrush.Transform>
+                <DrawingBrush.Drawing>
+                    <GeometryDrawing Brush="{StaticResource SuccessStripeBrush}">
+                        <GeometryDrawing.Geometry>
+                            <RectangleGeometry Rect="0,0,20,32" />
+                        </GeometryDrawing.Geometry>
+                    </GeometryDrawing>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
         </Setter>
 
         <Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -417,23 +413,21 @@
                   BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
                   TargetType="ProgressBar">
         <Setter Property="Foreground">
-            <Setter.Value>
-                <DrawingBrush TileMode="Tile"
-                              SourceRect="0,0,20,32"
-                              DestinationRect="0,0,20,32"
-                              Stretch="None">
-                    <DrawingBrush.Transform>
-                        <RotateTransform Angle="20" />
-                    </DrawingBrush.Transform>
-                    <DrawingBrush.Drawing>
-                        <GeometryDrawing Brush="{StaticResource InfoStripeBrush}">
-                            <GeometryDrawing.Geometry>
-                                <RectangleGeometry Rect="0,0,20,32" />
-                            </GeometryDrawing.Geometry>
-                        </GeometryDrawing>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-            </Setter.Value>
+            <DrawingBrush TileMode="Tile"
+                          SourceRect="0,0,20,32"
+                          DestinationRect="0,0,20,32"
+                          Stretch="None">
+                <DrawingBrush.Transform>
+                    <RotateTransform Angle="20" />
+                </DrawingBrush.Transform>
+                <DrawingBrush.Drawing>
+                    <GeometryDrawing Brush="{StaticResource InfoStripeBrush}">
+                        <GeometryDrawing.Geometry>
+                            <RectangleGeometry Rect="0,0,20,32" />
+                        </GeometryDrawing.Geometry>
+                    </GeometryDrawing>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
         </Setter>
 
         <Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -474,23 +468,21 @@
                   BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
                   TargetType="ProgressBar">
         <Setter Property="Foreground">
-            <Setter.Value>
-                <DrawingBrush TileMode="Tile"
-                              SourceRect="0,0,20,32"
-                              DestinationRect="0,0,20,32"
-                              Stretch="None">
-                    <DrawingBrush.Transform>
-                        <RotateTransform Angle="20" />
-                    </DrawingBrush.Transform>
-                    <DrawingBrush.Drawing>
-                        <GeometryDrawing Brush="{StaticResource WarningStripeBrush}">
-                            <GeometryDrawing.Geometry>
-                                <RectangleGeometry Rect="0,0,20,32" />
-                            </GeometryDrawing.Geometry>
-                        </GeometryDrawing>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-            </Setter.Value>
+            <DrawingBrush TileMode="Tile"
+                          SourceRect="0,0,20,32"
+                          DestinationRect="0,0,20,32"
+                          Stretch="None">
+                <DrawingBrush.Transform>
+                    <RotateTransform Angle="20" />
+                </DrawingBrush.Transform>
+                <DrawingBrush.Drawing>
+                    <GeometryDrawing Brush="{StaticResource WarningStripeBrush}">
+                        <GeometryDrawing.Geometry>
+                            <RectangleGeometry Rect="0,0,20,32" />
+                        </GeometryDrawing.Geometry>
+                    </GeometryDrawing>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
         </Setter>
 
         <Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -531,23 +523,21 @@
                   BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
                   TargetType="ProgressBar">
         <Setter Property="Foreground">
-            <Setter.Value>
-                <DrawingBrush TileMode="Tile"
-                              SourceRect="0,0,20,32"
-                              DestinationRect="0,0,20,32"
-                              Stretch="None">
-                    <DrawingBrush.Transform>
-                        <RotateTransform Angle="20" />
-                    </DrawingBrush.Transform>
-                    <DrawingBrush.Drawing>
-                        <GeometryDrawing Brush="{StaticResource DangerStripeBrush}">
-                            <GeometryDrawing.Geometry>
-                                <RectangleGeometry Rect="0,0,20,32" />
-                            </GeometryDrawing.Geometry>
-                        </GeometryDrawing>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-            </Setter.Value>
+            <DrawingBrush TileMode="Tile"
+                          SourceRect="0,0,20,32"
+                          DestinationRect="0,0,20,32"
+                          Stretch="None">
+                <DrawingBrush.Transform>
+                    <RotateTransform Angle="20" />
+                </DrawingBrush.Transform>
+                <DrawingBrush.Drawing>
+                    <GeometryDrawing Brush="{StaticResource DangerStripeBrush}">
+                        <GeometryDrawing.Geometry>
+                            <RectangleGeometry Rect="0,0,20,32" />
+                        </GeometryDrawing.Geometry>
+                    </GeometryDrawing>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
         </Setter>
 
         <Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/TabControl.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/TabControl.axaml
index 57cf7619..8dd7be37 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/TabControl.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/TabControl.axaml
@@ -151,23 +151,19 @@
 
         <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
             <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <UniformGrid Rows="0"
-                                     Columns="1" />
-                    </ItemsPanelTemplate>
-                </Setter.Value>
+                <ItemsPanelTemplate>
+                    <UniformGrid Rows="0"
+                                 Columns="1" />
+                </ItemsPanelTemplate>
             </Setter>
         </Style>
 
         <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
             <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <UniformGrid Rows="1"
-                                     Columns="0" />
-                    </ItemsPanelTemplate>
-                </Setter.Value>
+                <ItemsPanelTemplate>
+                    <UniformGrid Rows="1"
+                                 Columns="0" />
+                </ItemsPanelTemplate>
             </Setter>
         </Style>
     </ControlTheme>
@@ -308,9 +304,7 @@
         <Setter Property="hc:TitleElement.Foreground"
                 Value="{DynamicResource PrimaryBrush}" />
         <Setter Property="hc:ItemsControlAttach.ItemsContainerThemeSelector">
-            <Setter.Value>
-                <tools:TabItemCapsuleThemeSelector />
-            </Setter.Value>
+            <tools:TabItemCapsuleThemeSelector />
         </Setter>
         <Setter Property="Template">
             <ControlTemplate>
@@ -366,27 +360,23 @@
 
         <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
             <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <UniformGrid Rows="0"
-                                     Columns="1"
-                                     HorizontalAlignment="Center"
-                                     VerticalAlignment="Center" />
-                    </ItemsPanelTemplate>
-                </Setter.Value>
+                <ItemsPanelTemplate>
+                    <UniformGrid Rows="0"
+                                 Columns="1"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center" />
+                </ItemsPanelTemplate>
             </Setter>
         </Style>
 
         <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
             <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <UniformGrid Rows="1"
-                                     Columns="0"
-                                     HorizontalAlignment="Center"
-                                     VerticalAlignment="Center" />
-                    </ItemsPanelTemplate>
-                </Setter.Value>
+                <ItemsPanelTemplate>
+                    <UniformGrid Rows="1"
+                                 Columns="0"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center" />
+                </ItemsPanelTemplate>
             </Setter>
         </Style>
     </ControlTheme>
@@ -413,27 +403,25 @@
         <Setter Property="Padding"
                 Value="2" />
         <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-                        <Panel>
-                            <Border x:Name="PART_Sliding"
-                                    CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
-                                    Width="0"
-                                    Height="0"
-                                    Effect="{StaticResource EffectShadow1}"
-                                    Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}"
-                                    HorizontalAlignment="Left"
-                                    VerticalAlignment="Top" />
-                            <ContentPresenter Content="{TemplateBinding Content}" />
-                        </Panel>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
+            <ControlTemplate>
+                <Border HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+                    <Panel>
+                        <Border x:Name="PART_Sliding"
+                                CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
+                                Width="0"
+                                Height="0"
+                                Effect="{StaticResource EffectShadow1}"
+                                Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top" />
+                        <ContentPresenter Content="{TemplateBinding Content}" />
+                    </Panel>
+                </Border>
+            </ControlTemplate>
         </Setter>
     </ControlTheme>
 
@@ -464,24 +452,22 @@
         <Setter Property="hc:BorderElement.CornerRadius"
                 Value="{StaticResource DefaultCornerRadius}" />
         <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border x:Name="rootBorder"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            BorderBrush="{TemplateBinding BorderBrush}">
-                        <ContentPresenter Name="PART_ContentPresenter"
-                                          Padding="{TemplateBinding Padding}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Content="{TemplateBinding Header}"
-                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                          CornerRadius="{TemplateBinding CornerRadius}"
-                                          RecognizesAccessKey="True" />
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
+            <ControlTemplate>
+                <Border x:Name="rootBorder"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Background="{TemplateBinding Background}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        BorderBrush="{TemplateBinding BorderBrush}">
+                    <ContentPresenter Name="PART_ContentPresenter"
+                                      Padding="{TemplateBinding Padding}"
+                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      Content="{TemplateBinding Header}"
+                                      ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                      CornerRadius="{TemplateBinding CornerRadius}"
+                                      RecognizesAccessKey="True" />
+                </Border>
+            </ControlTemplate>
         </Setter>
 
         <Style Selector="^:disabled">
@@ -519,31 +505,29 @@
         <Setter Property="hc:TitleElement.Foreground"
                 Value="{DynamicResource PrimaryTextBrush}" />
         <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <DockPanel>
-                        <hc:SlidingTabContainer x:Name="tabContainer"
-                                                Background="{TemplateBinding Background}">
-                            <ItemsPresenter Name="PART_ItemsPresenter"
-                                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center" />
-                        </hc:SlidingTabContainer>
-                        <Border Padding="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}">
-                            <ContentPresenter Name="PART_SelectedContentHost"
-                                              Margin="{TemplateBinding Padding}"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Content="{TemplateBinding SelectedContent}"
-                                              ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
-                        </Border>
-                    </DockPanel>
-                </ControlTemplate>
-            </Setter.Value>
+            <ControlTemplate>
+                <DockPanel>
+                    <hc:SlidingTabContainer x:Name="tabContainer"
+                                            Background="{TemplateBinding Background}">
+                        <ItemsPresenter Name="PART_ItemsPresenter"
+                                        ItemsPanel="{TemplateBinding ItemsPanel}"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Center" />
+                    </hc:SlidingTabContainer>
+                    <Border Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter Name="PART_SelectedContentHost"
+                                          Margin="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding SelectedContent}"
+                                          ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+                    </Border>
+                </DockPanel>
+            </ControlTemplate>
         </Setter>
 
         <Style Selector="^[TabStripPlacement=Top] /template/ hc|SlidingTabContainer#tabContainer">
@@ -576,21 +560,17 @@
 
         <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
             <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Vertical" />
-                    </ItemsPanelTemplate>
-                </Setter.Value>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Vertical" />
+                </ItemsPanelTemplate>
             </Setter>
         </Style>
 
         <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
             <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </Setter.Value>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal" />
+                </ItemsPanelTemplate>
             </Setter>
         </Style>
     </ControlTheme>