Cleanup attached properties

src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs

@@ -33,7 +33,7 @@ namespace Avalonia.Controls
         /// Identifies the FontFamily dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
-            TextBlock.FontFamilyProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontFamilyProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font name.
@@ -48,7 +48,7 @@ namespace Avalonia.Controls
         /// Identifies the FontSize dependency property.
         /// </summary>
         public static readonly AttachedProperty<double> FontSizeProperty =
-            TextBlock.FontSizeProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontSizeProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font size.
@@ -65,7 +65,7 @@ namespace Avalonia.Controls
         /// Identifies the FontStyle dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontStyle> FontStyleProperty =
-            TextBlock.FontStyleProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontStyleProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font style.
@@ -80,7 +80,7 @@ namespace Avalonia.Controls
         /// Identifies the FontWeight dependency property.
         /// </summary>
         public static readonly AttachedProperty<FontWeight> FontWeightProperty =
-            TextBlock.FontWeightProperty.AddOwner<DataGridTextColumn>();
+            TextElement.FontWeightProperty.AddOwner<DataGridTextColumn>();
 
         /// <summary>
         /// Gets or sets the font weight or thickness.
@@ -91,6 +91,21 @@ namespace Avalonia.Controls
             set => SetValue(FontWeightProperty, value);
         }
 
+        /// <summary>
+        /// Identifies the FontStretch dependency property.
+        /// </summary>
+        public static readonly AttachedProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<DataGridTextColumn>();
+
+        /// <summary>
+        /// Gets or sets the font weight or thickness.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get => GetValue(FontStretchProperty);
+            set => SetValue(FontStretchProperty, value);
+        }
+
         /// <summary>
         /// Identifies the Foreground dependency property.
         /// </summary>

src/Avalonia.Controls/Control.cs

@@ -68,42 +68,6 @@ namespace Avalonia.Controls
         public static readonly AttachedProperty<FlowDirection> FlowDirectionProperty =
             AvaloniaProperty.RegisterAttached<Control, Control, FlowDirection>(nameof(FlowDirection), inherits: true);
 
-        /// <summary>
-        /// Defines the <see cref="FontFamily"/> property.
-        /// </summary>
-        public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
-            TextElement.FontFamilyProperty.AddOwner<Control>();
-
-        /// <summary>
-        /// Defines the <see cref="FontSize"/> property.
-        /// </summary>
-        public static readonly AttachedProperty<double> FontSizeProperty =
-            TextElement.FontSizeProperty.AddOwner<Control>();
-
-        /// <summary>
-        /// Defines the <see cref="FontStyle"/> property.
-        /// </summary>
-        public static readonly AttachedProperty<FontStyle> FontStyleProperty =
-            TextElement.FontStyleProperty.AddOwner<Control>();
-
-        /// <summary>
-        /// Defines the <see cref="FontWeight"/> property.
-        /// </summary>
-        public static readonly AttachedProperty<FontWeight> FontWeightProperty =
-            TextElement.FontWeightProperty.AddOwner<Control>();
-
-        /// <summary>
-        /// Defines the <see cref="FontStretch"/> property.
-        /// </summary>
-        public static readonly AttachedProperty<FontStretch> FontStretchProperty =
-            TextElement.FontStretchProperty.AddOwner<Control>();
-
-        /// <summary>
-        /// Defines the <see cref="Foreground"/> property.
-        /// </summary>
-        public static readonly AttachedProperty<IBrush?> ForegroundProperty =
-            TextElement.ForegroundProperty.AddOwner<Control>();
-
         private DataTemplates? _dataTemplates;
         private IControl? _focusAdorner;
         private AutomationPeer? _automationPeer;
@@ -162,60 +126,6 @@ namespace Avalonia.Controls
             set => SetValue(FlowDirectionProperty, value);
         }
 
-        /// <summary>
-        /// Gets or sets the font family.
-        /// </summary>
-        public FontFamily FontFamily
-        {
-            get { return GetValue(FontFamilyProperty); }
-            set { SetValue(FontFamilyProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the font size.
-        /// </summary>
-        public double FontSize
-        {
-            get { return GetValue(FontSizeProperty); }
-            set { SetValue(FontSizeProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the font style.
-        /// </summary>
-        public FontStyle FontStyle
-        {
-            get { return GetValue(FontStyleProperty); }
-            set { SetValue(FontStyleProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the font weight.
-        /// </summary>
-        public FontWeight FontWeight
-        {
-            get { return GetValue(FontWeightProperty); }
-            set { SetValue(FontWeightProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the font stretch.
-        /// </summary>
-        public FontStretch FontStretch
-        {
-            get { return GetValue(FontStretchProperty); }
-            set { SetValue(FontStretchProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a brush used to paint the text.
-        /// </summary>
-        public IBrush? Foreground
-        {
-            get { return GetValue(ForegroundProperty); }
-            set { SetValue(ForegroundProperty, value); }
-        }
-
         /// <summary>
         /// Occurs when the user has completed a context input gesture, such as a right-click.
         /// </summary>

src/Avalonia.Controls/Presenters/TextPresenter.cs

@@ -8,6 +8,7 @@ using Avalonia.Utilities;
 using Avalonia.VisualTree;
 using Avalonia.Layout;
 using Avalonia.Media.Immutable;
+using Avalonia.Controls.Documents;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -116,6 +117,60 @@ namespace Avalonia.Controls.Presenters
             set => SetAndRaise(TextProperty, ref _text, value);
         }
 
+        /// <summary>
+        /// Gets or sets the font family.
+        /// </summary>
+        public FontFamily FontFamily
+        {
+            get => TextElement.GetFontFamily(this);
+            set => TextElement.SetFontFamily(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font size.
+        /// </summary>
+        public double FontSize
+        {
+            get => TextElement.GetFontSize(this);
+            set => TextElement.SetFontSize(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font style.
+        /// </summary>
+        public FontStyle FontStyle
+        {
+            get => TextElement.GetFontStyle(this);
+            set => TextElement.SetFontStyle(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font weight.
+        /// </summary>
+        public FontWeight FontWeight
+        {
+            get => TextElement.GetFontWeight(this);
+            set => TextElement.SetFontWeight(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the font stretch.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get => TextElement.GetFontStretch(this);
+            set => TextElement.SetFontStretch(this, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a brush used to paint the text.
+        /// </summary>
+        public IBrush? Foreground
+        {
+            get => TextElement.GetForeground(this);
+            set => TextElement.SetForeground(this, value);
+        }
+
         /// <summary>
         /// Gets or sets the control's text wrapping mode.
         /// </summary>

src/Avalonia.Controls/Primitives/TemplatedControl.cs

@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Templates;
 using Avalonia.Interactivity;
 using Avalonia.Logging;
@@ -37,6 +38,42 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
             Border.CornerRadiusProperty.AddOwner<TemplatedControl>();
 
+        /// <summary>
+        /// Defines the <see cref="FontFamily"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
+            TextElement.FontFamilyProperty.AddOwner<TemplatedControl>();
+
+        /// <summary>
+        /// Defines the <see cref="FontSize"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> FontSizeProperty =
+            TextElement.FontSizeProperty.AddOwner<TemplatedControl>();
+
+        /// <summary>
+        /// Defines the <see cref="FontStyle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStyle> FontStyleProperty =
+            TextElement.FontStyleProperty.AddOwner<TemplatedControl>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontWeight> FontWeightProperty =
+            TextElement.FontWeightProperty.AddOwner<TemplatedControl>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<TemplatedControl>();
+
+        /// <summary>
+        /// Defines the <see cref="Foreground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> ForegroundProperty =
+            TextElement.ForegroundProperty.AddOwner<TemplatedControl>();
+
         /// <summary>
         /// Defines the <see cref="Padding"/> property.
         /// </summary>
@@ -119,6 +156,60 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(CornerRadiusProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the font family used to draw the control's text.
+        /// </summary>
+        public FontFamily FontFamily
+        {
+            get { return GetValue(FontFamilyProperty); }
+            set { SetValue(FontFamilyProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the size of the control's text in points.
+        /// </summary>
+        public double FontSize
+        {
+            get { return GetValue(FontSizeProperty); }
+            set { SetValue(FontSizeProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font style used to draw the control's text.
+        /// </summary>
+        public FontStyle FontStyle
+        {
+            get { return GetValue(FontStyleProperty); }
+            set { SetValue(FontStyleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font weight used to draw the control's text.
+        /// </summary>
+        public FontWeight FontWeight
+        {
+            get { return GetValue(FontWeightProperty); }
+            set { SetValue(FontWeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font stretch used to draw the control's text.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get { return GetValue(FontStretchProperty); }
+            set { SetValue(FontStretchProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the brush used to draw the control's text and other foreground elements.
+        /// </summary>
+        public IBrush? Foreground
+        {
+            get { return GetValue(ForegroundProperty); }
+            set { SetValue(ForegroundProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the padding placed between the border of the control and its content.
         /// </summary>

src/Avalonia.Controls/TextBlock.cs

@@ -28,6 +28,42 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Thickness> PaddingProperty =
             Decorator.PaddingProperty.AddOwner<TextBlock>();
 
+        /// <summary>
+        /// Defines the <see cref="FontFamily"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
+            TextElement.FontFamilyProperty.AddOwner<TextBlock>();
+
+        /// <summary>
+        /// Defines the <see cref="FontSize"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> FontSizeProperty =
+            TextElement.FontSizeProperty.AddOwner<TextBlock>();
+
+        /// <summary>
+        /// Defines the <see cref="FontStyle"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStyle> FontStyleProperty =
+            TextElement.FontStyleProperty.AddOwner<TextBlock>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontWeight> FontWeightProperty =
+            TextElement.FontWeightProperty.AddOwner<TextBlock>();
+
+        /// <summary>
+        /// Defines the <see cref="FontWeight"/> property.
+        /// </summary>
+        public static readonly StyledProperty<FontStretch> FontStretchProperty =
+            TextElement.FontStretchProperty.AddOwner<TextBlock>();
+
+        /// <summary>
+        /// Defines the <see cref="Foreground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> ForegroundProperty =
+            TextElement.ForegroundProperty.AddOwner<TextBlock>();
+
         /// <summary>
         /// DependencyProperty for <see cref="BaselineOffset" /> property.
         /// </summary>
@@ -174,6 +210,60 @@ namespace Avalonia.Controls
         [Content]
         public InlineCollection Inlines { get; }
 
+        /// <summary>
+        /// Gets or sets the font family used to draw the control's text.
+        /// </summary>
+        public FontFamily FontFamily
+        {
+            get { return GetValue(FontFamilyProperty); }
+            set { SetValue(FontFamilyProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the size of the control's text in points.
+        /// </summary>
+        public double FontSize
+        {
+            get { return GetValue(FontSizeProperty); }
+            set { SetValue(FontSizeProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font style used to draw the control's text.
+        /// </summary>
+        public FontStyle FontStyle
+        {
+            get { return GetValue(FontStyleProperty); }
+            set { SetValue(FontStyleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font weight used to draw the control's text.
+        /// </summary>
+        public FontWeight FontWeight
+        {
+            get { return GetValue(FontWeightProperty); }
+            set { SetValue(FontWeightProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the font stretch used to draw the control's text.
+        /// </summary>
+        public FontStretch FontStretch
+        {
+            get { return GetValue(FontStretchProperty); }
+            set { SetValue(FontStretchProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the brush used to draw the control's text and other foreground elements.
+        /// </summary>
+        public IBrush? Foreground
+        {
+            get { return GetValue(ForegroundProperty); }
+            set { SetValue(ForegroundProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the height of each line of content.
         /// </summary>

src/Avalonia.Themes.Default/Controls/Button.xaml

@@ -18,7 +18,7 @@
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
                           RecognizesAccessKey="True"
-                          Foreground="{TemplateBinding Foreground}"
+                          TextElement.Foreground="{TemplateBinding Foreground}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
       </ControlTemplate>

src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml

@@ -4,7 +4,7 @@
     <Setter Property="MaxHeight" Value="30" />
     <Setter Property="Template">
       <ControlTemplate>
-        <StackPanel Spacing="2" VerticalAlignment="Stretch" FontSize="10" Orientation="Horizontal">
+        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
           <StackPanel.Styles>
             <Style Selector="Panel">
               <Setter Property="Width" Value="45" />

src/Avalonia.Themes.Default/Controls/CheckBox.xaml

@@ -37,7 +37,7 @@
             </Panel>
           </Border>
           <ContentPresenter Name="PART_ContentPresenter"
-                            Foreground="{TemplateBinding Foreground}"
+                            TextElement.Foreground="{TemplateBinding Foreground}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
                             Content="{TemplateBinding Content}"
                             Margin="{TemplateBinding Padding}"

src/Avalonia.Themes.Default/Controls/DatePicker.xaml

@@ -58,7 +58,7 @@
                   BorderBrush="{DynamicResource ThemeControlTransparentBrush}"
                   BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
                   Content="{TemplateBinding Content}"
-                  Foreground="{DynamicResource ThemeForegroundBrush}"
+                  TextElement.Foreground="{DynamicResource ThemeForegroundBrush}"
                   ContentTemplate="{TemplateBinding ContentTemplate}"
                   Padding="{TemplateBinding Padding}"
                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -151,7 +151,7 @@
                                   BorderThickness="{TemplateBinding BorderThickness}"
                                   CornerRadius="{TemplateBinding CornerRadius}"
                                   Content="{TemplateBinding Content}"
-                                  Foreground="{TemplateBinding Foreground}"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="Stretch"
                                   VerticalContentAlignment="Stretch"/>
               </ControlTemplate>

src/Avalonia.Themes.Default/Controls/RepeatButton.xaml

@@ -24,7 +24,7 @@
                                   ContentTemplate="{TemplateBinding ContentTemplate}"
                                   Content="{TemplateBinding Content}"
                                   Padding="{TemplateBinding Padding}"
-                                  Foreground="{TemplateBinding Foreground}"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
             </ControlTemplate>

src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml

@@ -3,7 +3,7 @@
     <Setter Property="MaxHeight" Value="30" />
     <Setter Property="Template">
       <ControlTemplate>
-        <StackPanel Spacing="2" VerticalAlignment="Stretch" FontSize="10" Orientation="Horizontal">
+        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
           <StackPanel.Styles>
             <Style Selector="Panel">
               <Setter Property="Width" Value="45" />

src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml

@@ -53,7 +53,7 @@
                               Grid.Column="0"
                               Grid.ColumnSpan="2"
                               IsVisible="False"
-                              FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}"
+                              TextElement.FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}"
                               Margin="{DynamicResource ComboBoxTopHeaderMargin}"
                               VerticalAlignment="Top" />
             <Border x:Name="Background"

src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml

@@ -25,7 +25,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
-                          Foreground="{TemplateBinding Foreground}"
+                          TextElement.Foreground="{TemplateBinding Foreground}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"

src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml

@@ -70,7 +70,7 @@
                   BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
                   BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
                   Content="{TemplateBinding Content}"
-                  Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
+                  TextElement.Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
                   ContentTemplate="{TemplateBinding ContentTemplate}"
                   Padding="{TemplateBinding Padding}"
                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -165,7 +165,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     Content="{TemplateBinding Content}"
-                                    Foreground="{TemplateBinding Foreground}"
+                                    TextElement.Foreground="{TemplateBinding Foreground}"
                                     HorizontalContentAlignment="Stretch"
                                     VerticalContentAlignment="Stretch"
                                     CornerRadius="{TemplateBinding CornerRadius}"/>

src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml

@@ -49,7 +49,7 @@
             <ContentPresenter Name="PART_ContentPresenter"
                               Content="{TemplateBinding Content}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Foreground="{TemplateBinding Foreground}"
+                              TextElement.Foreground="{TemplateBinding Foreground}"
                               Margin="{TemplateBinding Padding}"
                               RecognizesAccessKey="True"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"

src/Avalonia.Themes.Fluent/Controls/Slider.xaml

@@ -45,7 +45,7 @@
         <DataValidationErrors>
           <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}"
+              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextElement.Foreground="{DynamicResource SliderHeaderForeground}"
               Margin="{DynamicResource SliderTopHeaderMargin}" />
               <Grid x:Name="SliderContainer" Grid.Row="1">
                 <Grid.Styles>
@@ -107,7 +107,7 @@
         <DataValidationErrors>
           <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}"
+              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextElement.Foreground="{DynamicResource SliderHeaderForeground}"
               Margin="{DynamicResource SliderTopHeaderMargin}" />
               <Grid x:Name="SliderContainer" Grid.Row="1">
                 <Grid.Styles>

src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml

@@ -51,13 +51,13 @@
                    ContentTemplate="{TemplateBinding HeaderTemplate}"
                    Margin="{DynamicResource TimePickerTopHeaderMargin}"
                    MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                   Foreground="{DynamicResource TimePickerHeaderForeground}"
+                   TextElement.Foreground="{DynamicResource TimePickerHeaderForeground}"
                    HorizontalAlignment="Stretch"
                    VerticalAlignment="Top" />
 
             <Button x:Name="FlyoutButton"
                     Grid.Row="1"
-                    Foreground="{TemplateBinding Foreground}"
+                    TextElement.Foreground="{TemplateBinding Foreground}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -77,7 +77,7 @@
                                   BorderThickness="{TemplateBinding BorderThickness}"
                                   CornerRadius="{TemplateBinding CornerRadius}"
                                   Content="{TemplateBinding Content}"
-                                  Foreground="{TemplateBinding Foreground}"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
                                   HorizontalContentAlignment="Stretch"
                                   VerticalContentAlignment="Stretch" />
                 </ControlTemplate>