From afe3486e9f3ea7a493c7e66ca3e5b59682357dcb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Jul 2022 11:15:41 +0200
Subject: [PATCH] Remove trailing /template/ selectors.

---
 .../Controls/ButtonSpinner.xaml               | 12 +--
 .../Controls/CalendarDatePicker.xaml          | 12 +--
 .../Controls/CalendarDayButton.xaml           |  6 +-
 .../Controls/CheckBox.xaml                    | 88 +++++++++----------
 .../Controls/ComboBox.xaml                    | 50 +++++------
 .../Controls/Slider.xaml                      | 56 ++++++------
 .../Controls/TimePicker.xaml                  |  6 +-
 7 files changed, 113 insertions(+), 117 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index a5234f5771..f99f1040e5 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -87,20 +87,20 @@
         <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
       </Style>
 
-      <Style Selector="^:left /template/">
-        <Style Selector="^ StackPanel#PART_SpinnerPanel">
+      <Style Selector="^:left">
+        <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
           <Setter Property="Grid.Column" Value="0" />
         </Style>
-        <Style Selector="^ RepeatButton.ButtonSpinnerRepeatButton">
+        <Style Selector="^ /template/ RepeatButton.ButtonSpinnerRepeatButton">
           <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyRightThinknessConverter}}" />
         </Style>
       </Style>
 
-      <Style Selector="^:right /template/">
-        <Style Selector="^ StackPanel#PART_SpinnerPanel">
+      <Style Selector="^:right">
+        <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
           <Setter Property="Grid.Column" Value="2" />
         </Style>
-        <Style Selector="^ RepeatButton.ButtonSpinnerRepeatButton">
+        <Style Selector="^ /template/ RepeatButton.ButtonSpinnerRepeatButton">
           <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyLeftThinknessConverter}}" />
         </Style>
       </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index 83a254be56..eefd9e9b51 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -106,13 +106,13 @@
                       <Setter Property="BorderBrush" Value="Transparent"/>
                       <Setter Property="BorderThickness" Value="0" />
                     </Style>
-                    <Style Selector="TextBox#PART_TextBox:disabled /template/">
-                      <Style Selector="^ Border#PART_BorderElement">
+                    <Style Selector="TextBox#PART_TextBox:disabled">
+                      <Style Selector="^ /template/ Border#PART_BorderElement">
                         <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
                         <Setter Property="Background" Value="Transparent" />
                         <Setter Property="BorderBrush" Value="Transparent" />
                       </Style>
-                      <Style Selector="^ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
+                      <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
                         <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
                       </Style>
                     </Style>
@@ -152,13 +152,13 @@
       </Style>
 
       <!-- Disabled State -->
-      <Style Selector="^:disabled /template/">
-        <Style Selector="^ Border#Background">
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ Border#Background">
           <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
           <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
         </Style>
         
-        <Style Selector="^ Button#PART_Button">
+        <Style Selector="^ /template/ Button#PART_Button">
           <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
         </Style>
 
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
index b119dd1355..9f476d51bc 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -84,11 +84,11 @@
       </Style>
 
       <!-- WinUI calls this OutOfFocus -->
-      <Style Selector="^:inactive /template/">
-        <Style Selector="^ Border#Root">
+      <Style Selector="^:inactive">
+        <Style Selector="^ /template/ Border#Root">
           <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
         </Style>
-        <Style Selector="^ ContentControl#Content">
+        <Style Selector="^ /template/ ContentControl#Content">
           <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
         </Style>
       </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index 2eee425cb0..44e1afefa4 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -63,64 +63,64 @@
       </Setter>
 
       <!-- Unchecked PointerOver State -->
-      <Style Selector="^:pointerover /template/">
-        <Style Selector="^ ContentPresenter#ContentPresenter">
+      <Style Selector="^:pointerover">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
         </Style>
 
-        <Style Selector="^ Border#PART_Border">
+        <Style Selector="^ /template/ Border#PART_Border">
           <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
         </Style>
 
-        <Style Selector="^ Border#NormalRectangle">
+        <Style Selector="^ /template/ Border#NormalRectangle">
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
           <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
         </Style>
 
-        <Style Selector="^ Path#CheckGlyph">
+        <Style Selector="^ /template/ Path#CheckGlyph">
           <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
         </Style>
       </Style>
 
       <!-- Unchecked Pressed State -->
-      <Style Selector="^:pressed /template/">
-        <Style Selector="^ ContentPresenter#ContentPresenter">
+      <Style Selector="^:pressed">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
         </Style>
 
-        <Style Selector="^ Border#PART_Border">
+        <Style Selector="^ /template/ Border#PART_Border">
           <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
         </Style>
 
-        <Style Selector="^ Border#NormalRectangle">
+        <Style Selector="^ /template/ Border#NormalRectangle">
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
           <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
         </Style>
 
-        <Style Selector="^ Path#CheckGlyph">
+        <Style Selector="^ /template/ Path#CheckGlyph">
           <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
         </Style>
       </Style>
 
       <!-- Unchecked Disabled state -->
-      <Style Selector="^:disabled /template/">
-        <Style Selector="^ ContentPresenter#ContentPresenter">
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
         </Style>
 
-        <Style Selector="^ Border#PART_Border">
+        <Style Selector="^ /template/ Border#PART_Border">
           <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
         </Style>
 
-        <Style Selector="^ Border#NormalRectangle">
+        <Style Selector="^ /template/ Border#NormalRectangle">
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
           <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
         </Style>
 
-        <Style Selector="^ Path#CheckGlyph">
+        <Style Selector="^ /template/ Path#CheckGlyph">
           <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
         </Style>
       </Style>
@@ -145,64 +145,64 @@
         </Style>
 
         <!-- Checked PointerOver State -->
-        <Style Selector="^:pointerover /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:pointerover">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
           </Style>
         </Style>
 
         <!-- Checked Pressed State -->
-        <Style Selector="^:pressed /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:pressed">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
           </Style>
         </Style>
 
         <!-- Checked Disabled State -->
-        <Style Selector="^:disabled /template/">
+        <Style Selector="^:disabled">
           <Style Selector="^ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
           </Style>
         </Style>
@@ -227,64 +227,64 @@
         </Style>
 
         <!-- Indeterminate PointerOver State -->
-        <Style Selector="^:pointerover /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:pointerover">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
           </Style>
         </Style>
 
         <!-- Indeterminate Pressed State -->
-        <Style Selector="^:pressed /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:pressed">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
           </Style>
         </Style>
 
         <!-- Indeterminate Disabled State -->
-        <Style Selector="^:disabled /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:disabled">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
           </Style>
         </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 2dc7439001..8ef8388cf1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -144,17 +144,15 @@
       </Setter>
 
       <!--  Normal State  -->
-      <Style Selector="^ /template/">
-        <Style Selector="^ TextBlock#PlaceholderTextBlock">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
-        </Style>
-        <Style Selector="^ Border#HighlightBackground">
-          <Setter Property="IsVisible" Value="False" />
-        </Style>
-        <Style Selector="^ PathIcon#DropDownGlyph">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
-          <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-        </Style>
+      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
+      </Style>
+      <Style Selector="^ /template/ Border#HighlightBackground">
+        <Setter Property="IsVisible" Value="False" />
+      </Style>
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
+        <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
       </Style>
 
       <!--  PointerOver State  -->
@@ -175,51 +173,51 @@
       </Style>
 
       <!--  Focus Pressed State  -->
-      <Style Selector="^:focused:pressed /template/">
-        <Style Selector="^ ContentControl#ContentPresenter">
+      <Style Selector="^:focused:pressed">
+        <Style Selector="^ /template/ ContentControl#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
         </Style>
-        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
         </Style>
-        <Style Selector="^ PathIcon#DropDownGlyph">
+        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
         </Style>
       </Style>
 
       <!--  Focused State  -->
-      <Style Selector="^:focus-visible /template/">
-        <Style Selector="^ Border#HighlightBackground">
+      <Style Selector="^:focus-visible">
+        <Style Selector="^ /template/ Border#HighlightBackground">
           <Setter Property="IsVisible" Value="True" />
           <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
         </Style>
-        <Style Selector="^ ContentControl#ContentPresenter">
+        <Style Selector="^ /template/ ContentControl#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
         </Style>
-        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
         </Style>
-        <Style Selector="^ PathIcon#DropDownGlyph">
+        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
         </Style>
       </Style>
 
       <!--  Disabled State  -->
-      <Style Selector="^:disabled /template/">
-        <Style Selector="^ Border#Background">
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ Border#Background">
           <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
           <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
         </Style>
-        <Style Selector="^ ContentPresenter#HeaderContentPresenter">
+        <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
         </Style>
-        <Style Selector="^ ContentControl#ContentPresenter">
+        <Style Selector="^ /template/ ContentControl#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
         </Style>
-        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
         </Style>
-        <Style Selector="^ PathIcon#DropDownGlyph">
+        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
         </Style>
       </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index b468f7f4ad..c74878e8be 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -283,17 +283,15 @@
 
     <!--  Normal State  -->
 
-    <Style Selector="^ /template/">
-      <Style Selector="^Thumb.SliderThumbStyle">
-        <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
-      </Style>
-      <Style Selector="^Grid#SliderContainer">
-        <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
-      </Style>
-      <Style Selector="^TickBar">
-        <Setter Property="IsVisible" Value="False" />
-        <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-      </Style>
+    <Style Selector="^ /template/ Thumb.SliderThumbStyle">
+      <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+    </Style>
+    <Style Selector="^ /template/ Grid#SliderContainer">
+      <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
+    </Style>
+    <Style Selector="^/template/ TickBar">
+      <Setter Property="IsVisible" Value="False" />
+      <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
     </Style>
 
     <!--  TickBar Placement States  -->
@@ -316,70 +314,70 @@
 
     <!--  Disabled State  -->
 
-    <Style Selector="^:disabled /template/">
-      <Style Selector="^ContentPresenter#HeaderContentPresenter">
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
       </Style>
-      <Style Selector="^RepeatButton#PART_DecreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
       </Style>
 
-      <Style Selector="^RepeatButton#PART_IncreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
       </Style>
 
-      <Style Selector="^Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
         <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
       </Style>
 
-      <Style Selector="^TickBar">
+      <Style Selector="^ /template/ TickBar">
         <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
       </Style>
     </Style>
 
     <!--  PointerOver State  -->
-    <Style Selector="^:pointerover /template/">
-      <Style Selector="^Grid#SliderContainer">
+    <Style Selector="^:pointerover">
+      <Style Selector="^ /template/ Grid#SliderContainer">
         <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
       </Style>
-      <Style Selector="^RepeatButton#PART_IncreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
       </Style>
 
-      <Style Selector="^Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
           <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
       </Style>
 
-      <Style Selector="^Grid#SliderContainer">
+      <Style Selector="^ /template/ Grid#SliderContainer">
           <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
       </Style>
 
-      <Style Selector="^RepeatButton#PART_DecreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
           <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
       </Style>
     
     </Style>
 
     <!--  Pressed State  -->
-    <Style Selector="^:pressed /template/">
-      <Style Selector="^Grid#SliderContainer">
+    <Style Selector="^:pressed">
+      <Style Selector="^ /template/ Grid#SliderContainer">
         <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
       </Style>
-      <Style Selector="^RepeatButton#PART_DecreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
       </Style>
-      <Style Selector="^RepeatButton#PART_IncreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
       </Style>
 
-      <Style Selector="^Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
         <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
       </Style>
     </Style>
 
     <Style Selector="^:error">
       <Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-      <Style Selector="^/template/ Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
         <Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
       </Style>
     </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 69b2d32dda..dc09032a36 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -82,11 +82,11 @@
           <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}" />
         </Style>
       </Style>-->
-      <Style Selector="^:disabled /template/">
-        <Style Selector="^ ContentPresenter#HeaderContentPresenter">
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}" />
         </Style>
-        <Style Selector="^ Rectangle">
+        <Style Selector="^ /template/ Rectangle">
           <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}" />
         </Style>
       </Style>