diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
index 4cc5ffc779..829871253b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -69,7 +69,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
       </Style>
 
-      <Style Selector="^ /template/ ContentPresenter#Content">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
         <Setter Property="FontWeight" Value="{DynamicResource CalendarViewTodayFontWeight}" />
       </Style>
@@ -100,16 +100,16 @@
         <!-- These are probably set in code, but consistent -->
         <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
       </Style>
-      <Style Selector="^ /template/ ContentControl#Content">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
       </Style>
     </Style>
 
-    <Style Selector="^:blackout /template/ ContentControl#Content">
+    <Style Selector="^:blackout /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
     </Style>
 
-    <Style Selector="^:disabled /template/ ContentControl#Content">
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
     </Style>
   </ControlTheme>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
index 25b01cc5f8..6c419e4cc9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -84,7 +84,7 @@
       <Style Selector="^:pressed /template/ Border#Border">
         <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
       </Style>
-      <Style Selector="^ ContentControl#Content">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
         <Setter Property="FontWeight" Value="SemiBold" />
       </Style>
@@ -95,16 +95,16 @@
       <Style Selector="^ /template/ Border#Root">
         <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
       </Style>
-      <Style Selector="^ /template/ ContentControl#Content">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
       </Style>
     </Style>
 
-    <Style Selector="^:blackout /template/ ContentControl#Content">
+    <Style Selector="^:blackout /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
     </Style>
 
-    <Style Selector="^:disabled /template/ ContentControl#Content">
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
     </Style>
   </ControlTheme>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index 673a2b593c..ac3ebadbb8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -41,11 +41,11 @@
       </ControlTemplate>
     </Setter>
 
-    <Style Selector="^:pointerover /template/ ContentPresenter#Text">
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
       <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
     </Style>
-    <Style Selector="^:pressed /template/ ContentPresenter#Text">
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
     </Style>
     <Style Selector="^:disabled /template/ ContentPresenter">
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index a2a61b1b02..a068d6a43c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -72,7 +72,7 @@
 
     <!-- Unchecked PointerOver State -->
     <Style Selector="^:pointerover">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
       </Style>
 
@@ -93,7 +93,7 @@
 
     <!-- Unchecked Pressed State -->
     <Style Selector="^:pressed">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
       </Style>
 
@@ -114,7 +114,7 @@
 
     <!-- Unchecked Disabled state -->
     <Style Selector="^:disabled">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
       </Style>
 
@@ -153,7 +153,7 @@
 
       <!-- Checked PointerOver State -->
       <Style Selector="^:pointerover">
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
         </Style>
 
@@ -174,7 +174,7 @@
 
       <!-- Checked Pressed State -->
       <Style Selector="^:pressed">
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
         </Style>
 
@@ -195,7 +195,7 @@
 
       <!-- Checked Disabled State -->
       <Style Selector="^:disabled">
-        <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^ ContentPresenter#PART_ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
         </Style>
 
@@ -235,7 +235,7 @@
 
       <!-- Indeterminate PointerOver State -->
       <Style Selector="^:pointerover">
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
         </Style>
 
@@ -256,7 +256,7 @@
 
       <!-- Indeterminate Pressed State -->
       <Style Selector="^:pressed">
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
         </Style>
 
@@ -277,7 +277,7 @@
 
       <!-- Indeterminate Disabled State -->
       <Style Selector="^:disabled">
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
         </Style>
 
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
index 17c2f6c612..787d3e068a 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
@@ -63,7 +63,7 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
-    <Style Selector="^:inactive /template/ ContentPresenter#Content">
+    <Style Selector="^:inactive /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     </Style>
 
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml
index f499ef1258..b9fffc2327 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml
@@ -80,7 +80,7 @@
     <Style Selector="^:disabled /template/ Rectangle#Background">
       <Setter Property="IsVisible" Value="False" />
     </Style>
-    <Style Selector="^:disabled /template/ ContentControl#Content">
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Opacity" Value="0.3" />
     </Style>
 
@@ -92,10 +92,10 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
-    <Style Selector="^:inactive /template/ ContentControl#Content">
+    <Style Selector="^:inactive /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     </Style>
-    <Style Selector="^:today /template/ ContentControl#Content">
+    <Style Selector="^:today /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource ThemeControlLowBrush}" />
     </Style>