From a96197c8b22cc07d7963b967471a3fcc82ed7a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Thu, 18 Dec 2025 11:49:47 +0100
Subject: [PATCH 01/11] Added WatermarkForeground property

---
 .../AutoCompleteBox.Properties.cs               | 17 +++++++++++++++++
 .../CalendarDatePicker.Properties.cs            | 15 +++++++++++++++
 .../NumericUpDown/NumericUpDown.cs              | 17 +++++++++++++++++
 src/Avalonia.Controls/TextBox.cs                | 17 +++++++++++++++++
 .../Controls/AutoCompleteBox.xaml               |  1 +
 .../Controls/CalendarDatePicker.xaml            |  1 +
 .../Controls/NumericUpDown.xaml                 |  1 +
 .../Controls/TextBox.xaml                       | 17 ++++++-----------
 .../Controls/AutoCompleteBox.xaml               |  1 +
 .../Controls/CalendarDatePicker.xaml            |  3 ++-
 .../Controls/NumericUpDown.xaml                 |  1 +
 .../Controls/TextBox.xaml                       |  4 +++-
 12 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
index a667087c374..e6e99fe35dd 100644
--- a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
@@ -27,6 +27,13 @@ public partial class AutoCompleteBox
         public static readonly StyledProperty<string?> WatermarkProperty =
             TextBox.WatermarkProperty.AddOwner<AutoCompleteBox>();
 
+        /// <summary>
+        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty =
+            TextBox.WatermarkForegroundProperty.AddOwner<AutoCompleteBox>();
+
+
         /// <summary>
         /// Identifies the <see cref="MinimumPrefixLength" /> property.
         /// </summary>
@@ -416,6 +423,16 @@ public string? Watermark
             set => SetValue(WatermarkProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the brush used for the foreground color of the watermark text.
+        /// </summary>
+        public Media.IBrush? WatermarkForeground
+        {
+            get => GetValue(WatermarkForegroundProperty);
+            set => SetValue(WatermarkForegroundProperty, value);
+        }
+
+
         /// <summary>
         /// Gets or sets the custom method that uses user-entered text to filter
         /// the items specified by the <see cref="ItemsSource" />
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
index 1454b4ab6cc..0240e6c3a9c 100644
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
@@ -92,6 +92,13 @@ public partial class CalendarDatePicker
         public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
             TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
 
+        /// <summary>
+        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty =
+            TextBox.WatermarkForegroundProperty.AddOwner<CalendarDatePicker>();
+
+
         /// <summary>
         /// Defines the <see cref="HorizontalContentAlignment"/> property.
         /// </summary>
@@ -268,6 +275,14 @@ public bool UseFloatingWatermark
             set => SetValue(UseFloatingWatermarkProperty, value);
         }
 
+        /// <inheritdoc cref="TextBox.WatermarkForeground"/>
+        public Media.IBrush? WatermarkForeground
+        {
+            get => GetValue(WatermarkForegroundProperty);
+            set => SetValue(WatermarkForegroundProperty, value);
+        }
+
+
         /// <summary>
         /// Gets or sets the horizontal alignment of the content within the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 188497d230a..62c69165d4a 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -114,6 +114,13 @@ public class NumericUpDown : TemplatedControl
         public static readonly StyledProperty<string?> WatermarkProperty =
             AvaloniaProperty.Register<NumericUpDown, string?>(nameof(Watermark));
 
+        /// <summary>
+        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty =
+            TextBox.WatermarkForegroundProperty.AddOwner<NumericUpDown>();
+
+
         /// <summary>
         /// Defines the <see cref="HorizontalContentAlignment"/> property.
         /// </summary>
@@ -300,6 +307,16 @@ public string? Watermark
             set => SetValue(WatermarkProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the brush used for the foreground color of the watermark text.
+        /// </summary>
+        public Media.IBrush? WatermarkForeground
+        {
+            get => GetValue(WatermarkForegroundProperty);
+            set => SetValue(WatermarkForegroundProperty, value);
+        }
+
+
         /// <summary>
         /// Gets or sets the horizontal alignment of the content within the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index b5017226766..7bf000fd012 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -192,6 +192,13 @@ public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.I
         public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
             AvaloniaProperty.Register<TextBox, bool>(nameof(UseFloatingWatermark));
 
+        /// <summary>
+        /// Defines the <see cref="WatermarkForeground"/> property
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> WatermarkForegroundProperty =
+            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(WatermarkForeground));
+
+
         /// <summary>
         /// Defines the <see cref="NewLine"/> property
         /// </summary>
@@ -681,6 +688,16 @@ public bool UseFloatingWatermark
             set => SetValue(UseFloatingWatermarkProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the brush used for the foreground color of the watermark text.
+        /// </summary>
+        public IBrush? WatermarkForeground
+        {
+            get => GetValue(WatermarkForegroundProperty);
+            set => SetValue(WatermarkForegroundProperty, value);
+        }
+
+
         /// <summary>
         /// Gets or sets custom content that is positioned on the left side of the text layout box
         /// </summary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
index 3196d262a17..f0879e3288b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -35,6 +35,7 @@
           <Grid Name="PART_LayoutRoot">
             <TextBox Name="PART_TextBox"
                      Watermark="{TemplateBinding Watermark}"
+                     WatermarkForeground="{TemplateBinding WatermarkForeground}"
                      Width="{TemplateBinding Width}"
                      Foreground="{TemplateBinding Foreground}"
                      Background="{TemplateBinding Background}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index ce580764d70..663ae9a998a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -93,6 +93,7 @@
                        Margin="{TemplateBinding BorderThickness}"
                        Padding="{TemplateBinding Padding}"
                        Watermark="{TemplateBinding Watermark}"
+                       WatermarkForeground="{TemplateBinding WatermarkForeground}"
                        UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index 22b6ef045c4..b9acbc35cd7 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -82,6 +82,7 @@
                      MinWidth="0"
                      Foreground="{TemplateBinding Foreground}"
                      Watermark="{TemplateBinding Watermark}"
+                     WatermarkForeground="{TemplateBinding WatermarkForeground}"
                      IsReadOnly="{TemplateBinding IsReadOnly}"
                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index f9608885d46..e07c07ffd37 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -99,6 +99,7 @@
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
+    <Setter Property="WatermarkForeground" Value="{DynamicResource TextControlPlaceholderForeground}" />
     <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
@@ -133,10 +134,11 @@
                            Grid.ColumnSpan="1"
                            Margin="{TemplateBinding Padding}">
                   <TextBlock Name="PART_FloatingWatermark"
-                             Foreground="{DynamicResource SystemAccentColor}"
+                             Foreground="{TemplateBinding WatermarkForeground}"
                              IsVisible="False"
                              Text="{TemplateBinding Watermark}"
                              DockPanel.Dock="Top" />
+
                   <ScrollViewer Name="PART_ScrollViewer"
                                 HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                                 VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
@@ -145,6 +147,7 @@
                                 BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}">
                     <Panel>
                       <TextBlock Name="PART_Watermark"
+                              Foreground="{TemplateBinding WatermarkForeground}"
                               Opacity="{DynamicResource TextControlPlaceholderOpacity}"
                               Text="{TemplateBinding Watermark}"
                               TextAlignment="{TemplateBinding TextAlignment}"
@@ -158,6 +161,7 @@
                           </MultiBinding>
                         </TextBlock.IsVisible>
                       </TextBlock>
+
                       <TextPresenter Name="PART_TextPresenter"
                                     Text="{TemplateBinding Text, Mode=TwoWay}"
                                     CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
@@ -203,9 +207,6 @@
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
       </Style>
 
-      <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ /template/ TextBlock#PART_FloatingWatermark">
-        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
-      </Style>
     </Style>
 
     <!-- PointerOver State-->
@@ -217,19 +218,12 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
       </Style>
 
-      <Style Selector="^ /template/ TextBlock#PART_Watermark">
-        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
-      </Style>
     </Style>
 
     <!-- Focused State -->
     <Style Selector="^:focus">
       <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
 
-      <Style Selector="^ /template/ TextBlock#PART_Watermark">
-        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
-      </Style>
-
       <Style Selector="^ /template/ Border#PART_BorderElement">
         <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
@@ -249,6 +243,7 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
+
     <Style Selector="^.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
       <Setter Property="InnerRightContent">
         <Template>
diff --git a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
index 10b48a12f64..8cc09b8f56a 100644
--- a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
@@ -20,6 +20,7 @@
                    ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                    Watermark="{TemplateBinding Watermark}"
+                   WatermarkForeground="{TemplateBinding WatermarkForeground}"
                    MaxLength="{TemplateBinding MaxLength}"                   
                    InnerLeftContent="{TemplateBinding InnerLeftContent}"
                    InnerRightContent="{TemplateBinding InnerRightContent}"
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
index dc696b21dce..081d7be3f00 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
@@ -102,7 +102,8 @@
                    CornerRadius="{TemplateBinding CornerRadius}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                    UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                   Watermark="{TemplateBinding Watermark}" />
+                   Watermark="{TemplateBinding Watermark}"
+                   WatermarkForeground="{TemplateBinding WatermarkForeground}" />
 
           <Button Name="PART_Button"
                   Grid.Column="1"
diff --git a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
index 78510f6557a..da453a5d2ca 100644
--- a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
@@ -38,6 +38,7 @@
                      TextAlignment="{TemplateBinding TextAlignment}"
                      TextWrapping="NoWrap"
                      Watermark="{TemplateBinding Watermark}"
+                     WatermarkForeground="{TemplateBinding WatermarkForeground}"
                      InnerLeftContent="{Binding InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}}"
                      InnerRightContent="{Binding InnerRightContent, RelativeSource={RelativeSource TemplatedParent}}"/>
           </ButtonSpinner>
diff --git a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
index c3416c0440e..2848ad53d54 100644
--- a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -85,6 +85,7 @@
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="WatermarkForeground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
     <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
     <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}" />
@@ -105,7 +106,7 @@
             <TextBlock Name="floatingWatermark"
                        DockPanel.Dock="Top"
                        FontSize="{DynamicResource FontSizeSmall}"
-                       Foreground="{DynamicResource ThemeAccentBrush}"
+                       Foreground="{TemplateBinding WatermarkForeground}"
                        Text="{TemplateBinding Watermark}">
               <TextBlock.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
@@ -134,6 +135,7 @@
                               VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                   <Panel>
                     <TextBlock Name="watermark"
+                               Foreground="{TemplateBinding WatermarkForeground}"
                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"   
                                Opacity="{DynamicResource TextControlPlaceholderOpacity}"

From 814a8ee1f1aae84a2777d9ff69df3a33d2410483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Thu, 18 Dec 2025 11:50:01 +0100
Subject: [PATCH 02/11] Added samples

---
 samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml    | 4 ++++
 samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml | 5 +++++
 samples/ControlCatalog/Pages/NumericUpDownPage.xaml      | 8 ++++++++
 samples/ControlCatalog/Pages/TextBoxPage.xaml            | 7 +++++++
 4 files changed, 24 insertions(+)

diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index b682ebf51de..db5d9bbdfd5 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -42,6 +42,10 @@
         <TextBlock Text="Watermark" />
         <AutoCompleteBox Watermark="Hello World" />
       </StackPanel>
+      <StackPanel>
+        <TextBlock Text="Watermark with custom color" />
+        <AutoCompleteBox Watermark="Search here..." WatermarkForeground="Green" />
+      </StackPanel>
       <StackPanel>
         <TextBlock Text="Disabled" />
         <AutoCompleteBox IsEnabled="False" />
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 7a22c0ddabd..649a3098ad3 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -37,6 +37,11 @@
                     Name="DatePicker5"
                     Watermark="Floating Watermark"
                     UseFloatingWatermark="True"/>
+
+        <TextBlock Text="Watermark with custom color"/>
+        <CalendarDatePicker Margin="0,0,0,8"
+                    Watermark="Select a date"
+                    WatermarkForeground="Purple"/>
                 
         <TextBlock Text="Disabled"/>
         <CalendarDatePicker IsEnabled="False"/>
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index b01b4a93bcc..91716640664 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -114,6 +114,14 @@
       </StackPanel>
     </WrapPanel>
 
+    <StackPanel Orientation="Vertical" Margin="10">
+      <Label FontSize="14" FontWeight="Bold" Target="WatermarkForegroundUpDown"
+             Content="Watermark with custom foreground color:"/>
+      <NumericUpDown x:Name="WatermarkForegroundUpDown"
+                     Watermark="Enter amount"
+                     WatermarkForeground="Orange"/>
+    </StackPanel>
+
     <StackPanel Margin="10">
       <Label FontSize="14" FontWeight="Bold" Target="InnerContent"
              Content="Inner Contents"/>
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index e2230e3cb64..2891e77ebd4 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -23,6 +23,13 @@
                  Watermark="Floating Watermark"
                  UseFloatingWatermark="True"
                  Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
+        <TextBox Width="200"
+                 Watermark="Custom Watermark Color"
+                 WatermarkForeground="Red"/>
+        <TextBox Width="200"
+                 Watermark="Floating Watermark Color"
+                 UseFloatingWatermark="True"
+                 WatermarkForeground="Purple"/>
         <MaskedTextBox Width="200" ResetOnSpace="False"  Mask="(LLL) 999-0000"/>
         
         <TextBox Width="200" Text="Validation Error">

From 4a89d81418696852cdc29bd4f0d3edaa0a2f3cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Thu, 18 Dec 2025 11:50:13 +0100
Subject: [PATCH 03/11] Added unit tests

---
 .../AutoCompleteBoxTests.cs                   | 13 +++++
 .../CalendarDatePickerTests.cs                | 13 +++++
 .../NumericUpDownTests.cs                     | 13 +++++
 .../TextBoxTests.cs                           | 55 +++++++++++++++++++
 4 files changed, 94 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
index 271d38f6a70..0afbe0378d1 100644
--- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -1275,5 +1275,18 @@ public TestContextMenu()
                 IsOpen = true;
             }
         }
+
+        [Fact]
+        public void WatermarkForeground_Can_Be_Set()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var control = CreateControl();
+                control.Watermark = "Search...";
+                control.WatermarkForeground = Media.Brushes.Green;
+
+                Assert.Equal(Media.Brushes.Green, control.WatermarkForeground);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
index 9e720c66c8a..7d752a84484 100644
--- a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
@@ -178,5 +178,18 @@ private static void RaiseTextEvent(TextBox textBox, string text)
             });
         }
 
+        [Fact]
+        public void WatermarkForeground_Can_Be_Set()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var control = CreateControl();
+                control.Watermark = "Select date";
+                control.WatermarkForeground = Media.Brushes.Purple;
+
+                Assert.Equal(Media.Brushes.Purple, control.WatermarkForeground);
+            }
+        }
+
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
index 42e58f4d8d5..dc2d7d4eac6 100644
--- a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
@@ -190,5 +190,18 @@ public void TabIndex_Should_Be_Synchronized_With_Inner_TextBox()
                 Assert.Equal(10, textbox.TabIndex);
             });
         }
+
+        [Fact]
+        public void WatermarkForeground_Can_Be_Set()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var control = CreateControl();
+                control.Watermark = "Enter value";
+                control.WatermarkForeground = Media.Brushes.Red;
+
+                Assert.Equal(Media.Brushes.Red, control.WatermarkForeground);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 42e1033b6dc..fc5d9b65fb0 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -2130,6 +2130,7 @@ public void Losing_Focus_Should_Not_Reset_Selection()
         }
 
         [Fact]
+<<<<<<< Updated upstream
         public void Backspace_Should_Delete_CRLFNewline_Character_At_Once()
         {
             using var _ = UnitTestApplication.Start(Services);
@@ -2146,6 +2147,60 @@ public void Backspace_Should_Delete_CRLFNewline_Character_At_Once()
             // (FirstSecond)
 
             Assert.Equal("FirstSecond", target.Text);
+=======
+        public void WatermarkForeground_Can_Be_Set()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Watermark = "Enter text",
+                    WatermarkForeground = Brushes.Red
+                };
+
+                target.ApplyTemplate();
+
+                Assert.Equal(Brushes.Red, target.WatermarkForeground);
+            }
+        }
+
+        [Fact]
+        public void WatermarkForeground_Defaults_To_Null()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Watermark = "Enter text"
+                };
+
+                target.ApplyTemplate();
+
+                Assert.Null(target.WatermarkForeground);
+            }
+        }
+
+        [Fact]
+        public void WatermarkForeground_Can_Be_Set_To_Null()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Watermark = "Enter text",
+                    WatermarkForeground = Brushes.Blue
+                };
+
+                target.ApplyTemplate();
+                
+                target.WatermarkForeground = null;
+
+                Assert.Null(target.WatermarkForeground);
+            }
+>>>>>>> Stashed changes
         }
 
         private static TestServices FocusServices => TestServices.MockThreadingInterface.With(

From d1ae4154aba5751c3ed9821371d9ffd928719d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Thu, 18 Dec 2025 11:51:03 +0100
Subject: [PATCH 04/11] Added render tests

---
 .../Controls/TextBoxTests.cs                  | 122 ++++++++++++++++++
 ...atermark_With_Blue_Foreground.expected.png | Bin 0 -> 1388 bytes
 ...rmark_With_Default_Foreground.expected.png | Bin 0 -> 1851 bytes
 ...Watermark_With_Red_Foreground.expected.png | Bin 0 -> 1418 bytes
 4 files changed, 122 insertions(+)
 create mode 100644 tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
 create mode 100644 tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Blue_Foreground.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Default_Foreground.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Red_Foreground.expected.png

diff --git a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
new file mode 100644
index 00000000000..cad3286ddbc
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
@@ -0,0 +1,122 @@
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests.Controls
+#endif
+{
+    public class TextBoxTests : TestBase
+    {
+        public TextBoxTests()
+            : base(@"Controls\TextBox")
+        {
+        }
+
+        /// <summary>
+        /// Tests the visual appearance of a watermark text with custom foreground color.
+        /// This test uses a TextBlock directly to simulate what the watermark would look like,
+        /// since full TextBox template rendering requires application-level theme infrastructure.
+        /// </summary>
+        [Fact]
+        public async Task Watermark_With_Red_Foreground()
+        {
+            // Simulating the watermark appearance directly
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 50,
+                Child = new Border
+                {
+                    Background = Brushes.White,
+                    BorderBrush = Brushes.Gray,
+                    BorderThickness = new Thickness(1),
+                    Padding = new Thickness(4),
+                    Child = new TextBlock
+                    {
+                        FontFamily = TestFontFamily,
+                        FontSize = 12,
+                        Text = "Red watermark",
+                        Foreground = Brushes.Red,
+                        Opacity = 0.5,
+                        VerticalAlignment = VerticalAlignment.Center,
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        /// <summary>
+        /// Tests the visual appearance of a watermark text with blue foreground color.
+        /// </summary>
+        [Fact]
+        public async Task Watermark_With_Blue_Foreground()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 50,
+                Child = new Border
+                {
+                    Background = Brushes.White,
+                    BorderBrush = Brushes.Gray,
+                    BorderThickness = new Thickness(1),
+                    Padding = new Thickness(4),
+                    Child = new TextBlock
+                    {
+                        FontFamily = TestFontFamily,
+                        FontSize = 12,
+                        Text = "Blue watermark",
+                        Foreground = Brushes.Blue,
+                        Opacity = 0.5,
+                        VerticalAlignment = VerticalAlignment.Center,
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        /// <summary>
+        /// Tests the default watermark appearance (gray foreground).
+        /// </summary>
+        [Fact]
+        public async Task Watermark_With_Default_Foreground()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 50,
+                Child = new Border
+                {
+                    Background = Brushes.White,
+                    BorderBrush = Brushes.Gray,
+                    BorderThickness = new Thickness(1),
+                    Padding = new Thickness(4),
+                    Child = new TextBlock
+                    {
+                        FontFamily = TestFontFamily,
+                        FontSize = 12,
+                        Text = "Default watermark",
+                        Foreground = Brushes.Gray,
+                        Opacity = 0.5,
+                        VerticalAlignment = VerticalAlignment.Center,
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+    }
+}
diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Blue_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Blue_Foreground.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..791176db5a1b066830fe5b64a9089fa96915129f
GIT binary patch
literal 1388
zcmai!`#aMM0EgEhmfGB^CmQ8;Tq;TlHAmCJTJ9oNt}C(`rDP*aa>=8nLI`0!b!aYQ
zlXTkH$%K-|+&1_1#oShG87IeY{dUghdEU?aAH13Fu1*jYZ50p*1VK3?JvZIHi6vNR
z^R+x4k8esb#sTFG-dqA0n*joCH9#Q|-f>Uog~MoG5{xSWm~d*r9)#;FpMpG{V<|5i
z^ea0}rhiv?vq)#L&sghJH;c<F)OMz-gFU>FJA-!<O?X|Fn9jo;y?z8%mUU=^TzCV+
zujyC7j!pt=BT`}#bkt?5`mg0|82i3eSWirvx}~UZskxrW3Wau^rBVtD3wx0U-;`}h
z%i)4h0ZR{>!^+b@{!RW55DukOxAP{7Ezb@C07uX?^SXl-77mun+2Z0E=bt*fvy>pU
zg%QT({Ow=6$hilCB_YGoe@?=Qztse^v}L<rDz1#?0i1Mu*2K+QoE35ORQoxnZ;Ma(
zYPcYfzkg7lnTaWRJlH0l&s69tQjV7<cjv!3#WU3)#{hF4*am9a1(8U4!Eak+q}0oA
zCczcG9gAgu6EStc>>_JE540?8tq)U!a)ubSLF5>sfk89?#g7s?WebQiTf0hCALt_d
zwBq2O2e&PbkcS~S{;6wq#T#<QdmWV)8isFRei8iqxn%Ncc(M`t)tqdx>=}rOC*Ox=
zJ+I(sQ%dd2UT{l73FZlF$BFP9u;3k}=(yi%;5#<`a$P^E;gjq1Y)YkByo=Gw!$PVm
z1d(Llz#OWL=qdjJ+=y)*Zme7BE*+oo!szZv=Dnafh`zSo-Tt|E>S763Av@d0)lF5v
ziaOowtT-#CO(d*`=Q3(Po5|m2#b!^h_Skv`mqF^w#gd7u5h+9d;RI&DQ5bVxD0KH#
zuD>$)v&|6)*4D<eyx=(*cIn@Nd0P>{m1grtp!pUU3)+-(DV0RgG!E%(zJ)PDIbw<!
zKbm6)NroXb*=*k@U^QWB=8;Pf8cnlW6xZJ?DZ<g>P?<V=p`7nP9u=KG^w!i^nK06z
zSApw|Qa03Z3($p~SjL?@;KRPJvoy8^Ke8i`<xd=gxp@<9@j^MSNlPma=3C8fxx*hu
z$qjS&TUkk!lz-z-Gzlf?7bdfHWsQuM&iv@Pf!>ZK(tI0YKS<n<5$o(|GjofwfG6&-
z2pAxl9J^Kp573u9&UJZvTZ)gjqtg$1q^IGl^TOdhirO`-edd=^Zi*knSf{@<5`_d4
zGrDy{)q%v6*B6&2o$!A(S~KS)1M9(yBY(ahTN%1kzd#shRHfHP5<I-IYhrO^V)T#0
z*ek6c9%behIl~JIG^6$jHJi8)tY&5y{rVOtEV;^;CaZe+WZec8;2A@42P-K@c8v<~
zjigCabEaM^JK4wyjm8K16)-C2=lSJIcVgG9N?IM76A@$xBH<5QS;aOD@W6G)w2ul7
zWpw}`8Vq&o9+>B48<)gMY(8|*_rlg>90o2Fh<Qlj%_7Qalafj4^vaNp-HC&*uW{P?
z$|&ar>8kV9=g#MTRQJb>_nMxJ<tT}X>^AA`+s9KuMfTpl+>Hc%V{Y1!p6=j#S+t2=
zyNBeTiun=!eSRW;CVp;paIiLV?^D~*UA2`R3yv<<x-a?<=EObiSc=0B0`<heNZJZ=
zb=B(u%9Fh)bNZsU^B%HwJX3a;lhZyH6j5Vs8Pb2l5)PLfIlAis)mJ}>Vt6Rf3YE&+
zGc2O}*yRcc0Iqea5glfxTR@c4%QF;=GX9r4sqZ2lwr_Z-{fd>kdJc=5w1rDSFOROv
QHuDKWopD80I|QZt3#Bx+W&i*H

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Default_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Default_Foreground.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4bb92e09bde308262a7cb77d287addd52f5f971
GIT binary patch
literal 1851
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
Rh$x_j5GOkqR4wvm%AYY!e#rm;

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Red_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Red_Foreground.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa11ad246fcdd0159871f7da291cb5282c32bfbc
GIT binary patch
literal 1418
zcmai!X)xOf7{>pJBN0cbqD>qviq=XUJIM^$CQQ^(qFQCQ6xH3vY6(pxOdSnfXDg0S
z>WJ!2RlAXd3PshDM#K?xE7X;`*U>n3>xg50*qPl=yT6&=`+RvmKJ%tuAh@W*;4lCH
z)ZJY17Y|Z+pe<DS;2!g4d^!k4vXh$+^nf_%_h|s2<miTX^oc219veA-gme_L!e%XU
zZSzEba>9HCAy={utnK@>?1!B74EB=tV1AABNN7eyW_g?It9b#krsBAJMY+X#cE?9s
zmg}W~Kfk^jca?XCN=c}0+@6xZE*dVP&c;70BaTy3E`zlGA!onx`33dSh<Y0YEe)SE
zvW#NULM_ctSy`2qh2m$kYieq;!*#oz^o`dGV0ixh{}4Z|I=w-XE=pWoY^Z7);L_5Z
zEGL2I8{CT*_eAdHjqv9$uUB|E-*t$b>t(cax~*qjCSx(JEdRf23k&yVx@e3e(s!!m
z6(R8U$Dpw>oTul{PqSkM1CMl)ue?4i>{cACR_bL!TH+N7tfpEDbjzz$zHL5gVFBn`
ztr<zid%>CXed=9nYy!Yy;k>o9cbENx=Lo^K)MC~YhiX&f>+8vlvys5fK@JIs*@Zu6
z&v6eK-S&5+VFzUsG&CuuB?%n-4i<q{llGegFZxP9Se92pggr_DNa@V^;LgK=Q-X)M
z>n57o?a{?Om@+0d_8Wq^+yD+9WJ3l9%!2OvBl`M5NAwgZ@<jQ54#!h$=Ne@6XmvFJ
zg(h#;MV_#>21*<{ron|vlIp1VTWSqdu@ggeCw;6Bz{JDuMB8u?@P;?s9HyOZ1FP|4
zVw{Isb|IAi&gMG<jcSDwcwjU1!2?duLquy6b(DB?X>mJRP|Dy_fDueW_Y^yD=IyVw
z#1iA5GUg;_vTo?;ESaECE753lttW+-VdB(=a4f?TFTSb+HBq?7fh-LN3Q&w*C;REu
z>*%fb78R@NV}$X^$*mpq*<Dj}@~{LFx6N-_ofCV&EA!;M@b!8xF9`A~I3;yhFcb3R
z%O8=uBu`IVpdp8P28&RZEo^P=p^$o<c=>b#@75=ai++%$5y*qA+YFJ&mJR`$1EqWw
zUa2sG80B*rR7r?p6r@4fxZK>r7!?(dgnKH!LE;~KcIA6K6ylMA!9L;Sz<`q;wAJ+Y
zg%BEpu~J=<EyensSJiH+`!FGy51n@)UDB3)A@(YgYQru|m!qPZ<>qGK{{8?XL!O}*
zhcA;sL|rs>gpa<KZXm5802g*T@)P)if0uDOd>_QhJ>2`!+@0{ns}ooxy&ZU8B&@3P
zc>EY%W{G8zH%0E!R*+PvMMy;k@hE}C>K0!qW*MrFo0*xdP$ufOVXYnR7%sQOUYWdR
z8YxG)6t=bXNlw@q?+`Vc42Iqs#jF7H%QL*_#ZAqT;ZBDa9aD+Qot>bwanjJf5!L2I
z63Zwxd9GWu<~4&cY;jwZ%`r~e<%ywnb$N6zcW_JGwY5E~GxVq4WIOuuXN~=6PJT=`
zUjTmTr_e!HpvtZwuKjTCK00Z$As{aMmnu+}fdWM~+rE)+Im*lh>)Z3U8sB%CZj5<n
zW^D4z8Nc};4|a9Oek(;70VzN#p~5F!l_O1yH>JgS?Fr(tnX?l+SS*v2FX|db+T@52
zX{6TOq{CKBdVD8s9GE1$s8?CTNI7C$k-)r>(=|FtX?l1Ham+@Ijb1s+mRO&2sZ98c
zOGz23ETYj`!v%r{5^pLejk~7m_Kc{gBDhhE!EUIa*oRW{{hqW)nzWsrl_t=6tHKi9
xEm=r<_qEfSTH60-K}%T3jLahK-w1bBA$y$IObcD{^@HaMxH%K>)lR`le*vd7oEQKA

literal 0
HcmV?d00001


From 4d14e053f471415c40402edbe33962073d7f2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Thu, 18 Dec 2025 12:03:07 +0100
Subject: [PATCH 05/11] Fix merge issues

---
 tests/Avalonia.Controls.UnitTests/TextBoxTests.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index fc5d9b65fb0..68e495ff903 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -2130,7 +2130,6 @@ public void Losing_Focus_Should_Not_Reset_Selection()
         }
 
         [Fact]
-<<<<<<< Updated upstream
         public void Backspace_Should_Delete_CRLFNewline_Character_At_Once()
         {
             using var _ = UnitTestApplication.Start(Services);
@@ -2147,7 +2146,9 @@ public void Backspace_Should_Delete_CRLFNewline_Character_At_Once()
             // (FirstSecond)
 
             Assert.Equal("FirstSecond", target.Text);
-=======
+        }
+
+        [Fact]
         public void WatermarkForeground_Can_Be_Set()
         {
             using (UnitTestApplication.Start(Services))
@@ -2200,7 +2201,6 @@ public void WatermarkForeground_Can_Be_Set_To_Null()
 
                 Assert.Null(target.WatermarkForeground);
             }
->>>>>>> Stashed changes
         }
 
         private static TestServices FocusServices => TestServices.MockThreadingInterface.With(

From 5e210c74a89079957edec097833c47fea2e451b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Thu, 18 Dec 2025 12:47:23 +0100
Subject: [PATCH 06/11] Updated render tests

---
 .../Controls/TextBoxTests.cs                  | 122 ++++++++++--------
 ...atermark_With_Blue_Foreground.expected.png | Bin 1388 -> 1423 bytes
 ...rmark_With_Default_Foreground.expected.png | Bin 1851 -> 1884 bytes
 ...Watermark_With_Red_Foreground.expected.png | Bin 1418 -> 1452 bytes
 4 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
index cad3286ddbc..85cec975e36 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
@@ -1,5 +1,7 @@
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Xunit;
@@ -17,35 +19,65 @@ public TextBoxTests()
         {
         }
 
-        /// <summary>
-        /// Tests the visual appearance of a watermark text with custom foreground color.
-        /// This test uses a TextBlock directly to simulate what the watermark would look like,
-        /// since full TextBox template rendering requires application-level theme infrastructure.
-        /// </summary>
+        private static IControlTemplate CreateTextBoxTemplate()
+        {
+            return new FuncControlTemplate<TextBox>((textBox, scope) =>
+            {
+                var border = new Border
+                {
+                    Background = textBox.Background,
+                    BorderBrush = Brushes.Gray,
+                    BorderThickness = new Thickness(1),
+                    Padding = new Thickness(4),
+                };
+
+                var panel = new Panel();
+
+                var watermark = new TextBlock
+                {
+                    Name = "PART_Watermark",
+                    [!TextBlock.TextProperty] = textBox[!TextBox.WatermarkProperty],
+                    [!TextBlock.ForegroundProperty] = textBox[!TextBox.WatermarkForegroundProperty],
+                    FontFamily = textBox.FontFamily,
+                    FontSize = textBox.FontSize,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Opacity = 0.5,
+                }.RegisterInNameScope(scope);
+
+                var presenter = new TextPresenter
+                {
+                    Name = "PART_TextPresenter",
+                    [!TextPresenter.TextProperty] = textBox[!TextBox.TextProperty],
+                    [!TextPresenter.CaretIndexProperty] = textBox[!TextBox.CaretIndexProperty],
+                    FontFamily = textBox.FontFamily,
+                    FontSize = textBox.FontSize,
+                }.RegisterInNameScope(scope);
+
+                panel.Children.Add(watermark);
+                panel.Children.Add(presenter);
+                border.Child = panel;
+
+                return border;
+            });
+        }
+
         [Fact]
         public async Task Watermark_With_Red_Foreground()
         {
-            // Simulating the watermark appearance directly
-            Decorator target = new Decorator
+            var target = new Border
             {
                 Padding = new Thickness(8),
                 Width = 200,
                 Height = 50,
-                Child = new Border
+                Background = Brushes.White,
+                Child = new TextBox
                 {
+                    Template = CreateTextBoxTemplate(),
+                    FontFamily = TestFontFamily,
+                    FontSize = 12,
                     Background = Brushes.White,
-                    BorderBrush = Brushes.Gray,
-                    BorderThickness = new Thickness(1),
-                    Padding = new Thickness(4),
-                    Child = new TextBlock
-                    {
-                        FontFamily = TestFontFamily,
-                        FontSize = 12,
-                        Text = "Red watermark",
-                        Foreground = Brushes.Red,
-                        Opacity = 0.5,
-                        VerticalAlignment = VerticalAlignment.Center,
-                    }
+                    Watermark = "Red watermark",
+                    WatermarkForeground = Brushes.Red,
                 }
             };
 
@@ -53,32 +85,23 @@ public async Task Watermark_With_Red_Foreground()
             CompareImages();
         }
 
-        /// <summary>
-        /// Tests the visual appearance of a watermark text with blue foreground color.
-        /// </summary>
         [Fact]
         public async Task Watermark_With_Blue_Foreground()
         {
-            Decorator target = new Decorator
+            var target = new Border
             {
                 Padding = new Thickness(8),
                 Width = 200,
                 Height = 50,
-                Child = new Border
+                Background = Brushes.White,
+                Child = new TextBox
                 {
+                    Template = CreateTextBoxTemplate(),
+                    FontFamily = TestFontFamily,
+                    FontSize = 12,
                     Background = Brushes.White,
-                    BorderBrush = Brushes.Gray,
-                    BorderThickness = new Thickness(1),
-                    Padding = new Thickness(4),
-                    Child = new TextBlock
-                    {
-                        FontFamily = TestFontFamily,
-                        FontSize = 12,
-                        Text = "Blue watermark",
-                        Foreground = Brushes.Blue,
-                        Opacity = 0.5,
-                        VerticalAlignment = VerticalAlignment.Center,
-                    }
+                    Watermark = "Blue watermark",
+                    WatermarkForeground = Brushes.Blue,
                 }
             };
 
@@ -86,32 +109,23 @@ public async Task Watermark_With_Blue_Foreground()
             CompareImages();
         }
 
-        /// <summary>
-        /// Tests the default watermark appearance (gray foreground).
-        /// </summary>
         [Fact]
         public async Task Watermark_With_Default_Foreground()
         {
-            Decorator target = new Decorator
+            var target = new Border
             {
                 Padding = new Thickness(8),
                 Width = 200,
                 Height = 50,
-                Child = new Border
+                Background = Brushes.White,
+                Child = new TextBox
                 {
+                    Template = CreateTextBoxTemplate(),
+                    FontFamily = TestFontFamily,
+                    FontSize = 12,
                     Background = Brushes.White,
-                    BorderBrush = Brushes.Gray,
-                    BorderThickness = new Thickness(1),
-                    Padding = new Thickness(4),
-                    Child = new TextBlock
-                    {
-                        FontFamily = TestFontFamily,
-                        FontSize = 12,
-                        Text = "Default watermark",
-                        Foreground = Brushes.Gray,
-                        Opacity = 0.5,
-                        VerticalAlignment = VerticalAlignment.Center,
-                    }
+                    Watermark = "Default watermark",
+                    WatermarkForeground = Brushes.Gray,
                 }
             };
 
diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Blue_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Blue_Foreground.expected.png
index 791176db5a1b066830fe5b64a9089fa96915129f..b0c2e6a9e3ed6bda273f54a257548322f04d9962 100644
GIT binary patch
delta 1388
zcmaKsdpr{e0LMMgTgc<`&Lef|au}MSvD9#0mq(&i@`yRFSvF>(GO}rEBzY{3#6)E#
zB5hiXOF}lOF^^AqwT<cKv8zAs^SRIcale1RzwaNve|}5KMJhM!v7S%}_+<Ls<*7;U
zlMz2M`KyDodxsc`DU5-UCrj0ukUw++B0Ry40mGQmZF$`(1Z}1HI>Fsv!_yQJpc!!G
z)GXP@js?G?TH|BHVz2hmxqBn*Dj(@#O>VIB*zs<5%`wX{%X>x_P?dSO!U4Cp(zq?w
zEmJdfFAYrvOB@cHs|8_zmCR<U<usFT?_O167MVz#iMYY+f&%4*9hy?{33D^a@qE>t
zpIRY?{}TW0`RCxAEY`r&>Br18)F)G-_YGFL8O4-g#Nz5km7Lx(!UfT7|C}rIBuV$7
z%}kp_<EAiq?@|u6%556Uwo4cO;E<3b5HzTw(3#@3)k|F>Bn`EjU|jL(M0Al7Db&Sf
zcvz}2!~-n7wn6_(NHsd!D>KolClJ&*aW2lFlBRQ93RD3NT8*>`V{dPALw}Z+_Y~9K
z{%D|9Q|P%xvPM@%Oo)E=pT6mQnR@}D?drORQraDDq&8N130NcQ7FYV#t>-VUewkI$
z)&ZMJQ7B)gWxsB>AP>#XbNGoL!`>4W-*-fYF#4{OTWqpG06+`8tZkcbej%!NoH9Ie
zzV*qI2`Ry*BLXoI@8g$e;`Wlj6mnN0Cc4-hiAYT#RQR|^4m(Yzs0|D(xsVzh8=z>I
z3F4ARWDN-$<XysWt83Hw&|?xV5$jaCwa--=J7tUmPojb0Pvz3mRzxz=_bF{iAdoxl
zVZ996^`Mc$%iMui0Gua*;yD(QFu`v<5{RUdPPMM5^GC<PQI@0cCWGws+m@G?{e$FF
z=O=bJVFrqEaqu2%<JXVhCGqb)s~a5b#drW5vGlP<Bq=z>rwSSY_N~wl|L~Xz?7v_S
zVB>l++9?^8_z&^pv?3NO_b?1Db2>D(1{G48wzh^a=u=T%>UguiEAt}sX=cYz`N#-Y
zlwiFF)6MU@NtDjpCE4?KfYg#|1wzZ6ras?T9XF=&@(=ucEn#v8?s%ZTn8yJ)Azopd
zk+zt9BvTz7k&60NI77I}D-AVQqimMn;jYI!C7;hskjq8#Oto{=4B%_(c?!;cF;*aq
z^20N1w1utsJ}A(PudRdc#;k;AxCI6t4A>OIn@eIrt#bMeod(U}m)93bhFE%SqENhj
z<7Q;fFqQgMX-3%l5SF`GQIX5SUd|pe5iJ|QRC}wZ0P%@=+naj<WAnO4j!=7^a^@9|
z6ON|X-gT`A?aXJ~ybBVG$RTDDoVx=t{bigUmkXw4O*Lm(S|-D;`Mju|Hzg{riNc0p
zu*7yWuYagbi(Jnvt|6aGf&~!q4~B*u?p>oJHvyGPaA$0A3CR?N!aBG!wJfwB&DC0z
zD?rTXMXz7AFbRa|Nh^In5Pv2a3T-toR8W78H=r-1+OF?I$min;R(_mFo7gmT(?MDq
z>+|Om4B!fni43W08k|?e<CEqKT`uuFI|bQeqKJrK_iqCSSUjvNu_QXmXDRje`|!nd
zHk;ZVUyA1hVS~my1j0O%syoV)?evb+acS1T((j`XUh=b;d<HMhT%%>K3sk-l6wD#*
zw@cmn1uE0!L@;vJT|KZ{D?j~=Jy6^oJ1RtH)Qd7@Ws$z6J3DWx?0)0FTJx$+^kaqm
zsx|$f72|3!R$u&a)zzvH(}}2?A(qu2wk~km4~7^<{m-R*=ijjsM$cOUIUa3YweTqs
kg)2N}S%UlT{ruCFNC(KivtaajZApC#^q4QC+5K$J-)eQYu>b%7

delta 1353
zcmaKs`#aMM0EZQ^lDSn+X;W^;rJ|Hjb2JHSArY~1FR~e>WFudbNFJFAA%ykRp}CAr
z(rL4utWeUJ+vdK$m|?}1adOU2r+zx`^SsaVdH;b=j{58-@*%(o<&5-6cq|bPp?Ls|
zD+L({O5t{-#|z)WeE6Z%=Z%I{9cEL%ZF)6NW3o=z!fRT@6_r|B(zGF7KF(W0wh_#D
zoz|F+{p~&ecxIMuSd>C|4a2YPQw|@Q09S@(1OPhXzCrsZxof6=ua#Gmfyo;xhSq@Y
zYBDnn+If;fE-EVOaW?v@W=~v<6od(w2GCq)zK-)>r2i4=R7UYUYo^lrWFH7}1kKYg
z+nEuO5QTyzE}3@w0q3102W!m@(=QgNf9WLU?Fo^F4$1yLiXg174Qy@8K79cwsfy)+
zoD4_i`1Ko{C2{QJyHl=T=O6L4u)#_J0l~c%X6B@^5W7S^L%Fk9Em4-zRq*N<&s>KT
z2hMthH&W8iiA1t<{u`sCW#0bNNginR@Nm{w5knusDz@eGlon;|h6pVvXOLbOOo}5I
z8O4H7+z7ryK8HN9p|cFo%+W{s??^y=8rV2LOd8U_@{e7qFIiL2-@-SwQZalZ%kz+@
zPo)!=BU4P!FJ|TQ<xi9tIMO|6*3(Lk9=Xi1{28}23~!mVa+rX~g$Ukg6d(3q4tm3)
zU99gTHh%P&nn|s)NOU(@x?e=m)Ib7`jf}y%sP2mI;I(-65YSY=)KxY%?Tyjjp2B-Z
zbrOAH-&X(BGkLz0tDK$f>*1*>V8$G8aZ{NQQ^%85BlGBWpDYw_v*NR-mb>lGgp_ME
zREVYHm!nb#10wN^z=JS`L?}G%r`B+3;76Ma7NVzzV|pWU?>J<9110t%kSojP4?_#A
zFjmw_w=#f2B<q@ncC_5Un4nxR#q{qj@dHHTP^x^U_anHRv@rd^Js6Fq+RTd^?v@r~
zsR^h|_)aM28<<Z)7Yx2OH&w$AHyTu8dt%g#bvy(0VMi9Rr}p@=?!gyE*WrdY2QdQ(
zqcBe&f;~>Cz&7vLkq`5$VYS}k51|ysdAk7{8=0!wdj5E`P?~XWB3obHL~rdVh@I{4
zX<r~p+K{`I#C;esd~=(HXN(mhd9zhuKhf;am1;zwq4Z&%`|F!BT%rSww%02o9aobd
ziRf0*t7Y!8ypVcb{1C=G{<(=D#G6^rY#XchB&WVSzcAs7`?JZGF)Qs~4VfSQ19&^S
zG<cz54&UFTNo$D4d-;T~h{e&#vETQHUt+(1keOHPhA1r5joBsCZRTo(>t;sKuC9Z^
zQmXx^^6KZ0R_#!MXX41GA*yQ8og)HV6LG@al3~DRrI@&)(YPT0LVA@%!mm)h6~AIr
z%64i=Mv^p;Nxx&uD>v#u`mX{m=^vDx%IiT;G!W+5)i2>?o0cX>?cTT3cEVQV96B}(
zjJr?d%^)kN6VeIU)Y71x!;!r&uW;IW%gJX28Jd!sQ)lx&Xa``%dd!c;b5z9yR-5eR
z&BJL*#g0CH+_fY_Q*Qc!?yiu#S=8~Z+XfXMOZZWJz5b#A25xp47#OIF-uc)*Y-?Rr
z`<#ort^TvVy}1dG+ZPgW17HIoD4M$Dyu9q4gF3^Sm%Dy8*mBpIJ(elI&B=W?8XQ$?
zYaQBm%^HD_9yqu)hvH`lkd5~R*`U&R+lNFnUxz#a9>lUIo6r#!`h^4qt>TWd$(>(y
s`ZfOBx6<B3-G8^{rS<c+w6$}YTwooSj9wgBl`H)V>V$`LjZ<*yKhIdTLjV8(

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Default_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Default_Foreground.expected.png
index b4bb92e09bde308262a7cb77d287addd52f5f971..5957ca66760cca816a82916d12277a58fe07eb8e 100644
GIT binary patch
literal 1884
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
WA(+f{WK$U!mk_MGuNxC{HSaf%T%7~}

delta 1821
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

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Red_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Red_Foreground.expected.png
index aa11ad246fcdd0159871f7da291cb5282c32bfbc..eb12e520220cd6114160969c9986228e5336f408 100644
GIT binary patch
delta 1418
zcmZ|PX)v1!0LJmeTcSl&opr@Vm8GsCT4!n*vPu=LsI)S|Xa|WVm8jxvR@EIx9YY(m
zt2d&wt|;l{jB9o4h+qk+s|mKQ2D>}6ANpbU`SzRne}2;CD&=ylK?270lz;5KWj@bS
zg`_Pb?x_EYEym2oVQowZmZqI>4V}-jI!g~S;NU6H4WrJNK6Un*lD|fp8h^y?yoxJE
zMI}sk6<c`4tt2m8NLy))od3d3ieRkVaI&qlU+d%2782$X!m$?Jwa4U;hdydQmOEJ7
zt8!2Ykam5KhAM%UK4@3@e~l+L$`}|JSox);0^X$#SH^WwdQ>=a)x4InHmu_LPyc=X
zJ%zyPqPloCW9S@L7XZ-iDMRNv8=t}|9!MFP!;DSnC7RSfpI(lVCQg=;57!5NY8zY`
z<I(Thg3M}{b}vUg8yilZ0h)YVEIH|O9#xg>#jZ9hf7U&3EI<$z8?Zl^2FZkmLY|+8
z3j3hJZBiNPlpsIlfdR-dEJPp#)`YP2h^R2m^z<$c(Y+x;Q>=Wjos8W%g_<ZW3zUpQ
zqWsc$7p0+|+&s4eF$q{5hlm$ceS&%tK!n3ovqXZfnrwx#g4bfVwm82%#E}9y?@~CA
zyf{5YXqs)#9bhw_lcCOeo7~bKvv_kmPS38S?4lXP(K%5Z*K(<pc3Bo%C*$G8j9)f2
zMF(m5`0s1v=SoOjDyRFcJV@q6SFhqwDDt)qNq1mU@t$K(U-C*{;#Xtm>?{yU6OBC~
zdzTZ2e}|qag)o^*BQY_!;NX7I{5&oo@bHMUou-EeB!n;;=%}06zG*d(EXV1T<>A`k
zEeSnQg&!yv+3n5B%A;`nUH9z9y#f=7ZR~cwUq$p+iKJ_=vNBVcnzlcYpOqDPr{H1q
zi6ga2f>A4KdZ8Nr8&yUMoEc(O1<@6>Hec7>Sxirl6>__v>&r9sbm-JO*xL2HyvC(v
zX{SU1e{;x?s>v$ip-AwTXFLJ3OZ#r8jJ692K5X{Z7EM6`O*E^CP;U!T6D?f7PDeQ*
zYQlO1%_yS4$kz{8no!7Okn_8_*24fKDTy=qYovWHuQ%Es^oMk0Q}Wf^UDa~lyHZ;=
zW2uRmw3@LC-VtB;axY_=8Y3gVQH*m-G@bMy_Ly)(z!%45ljGy3uwGtEBfY(JN*3dG
z+ZxJROa!;DeMa>Z!GaN5J#5fL%7SL*tf<Ii8TxmK7J;8V>8~PG;VEuv2g?*aFwnj-
z*t6${!MrC%L=&^QmbeEM6`Xwen!R-s(=45n2Fc7v&(b@(duFs-TeL^m>L+4zhVFY7
zE$Ix;N*y?G^QRP-hBOAebpou~g=~&KH9UITufvC-0}%PsvVJ~z(S^`4w_W*ZDsW>R
zvLON-9dQkDHi!^=yIA)qlA=RWXgDC6q*#NW=b;m?>u9>!DIHv{{OQ>--qz77R<>VZ
zro5BBf54duXG^6`NilPS*3_h(rK#0K3J4Iel9oRb4k-hbSg7_%sqrQP=~h7-vR3JR
zzi=ig^qgw+rbP__hG;bpo?91$;`b8!hF@QzlJ|68)#Q+Fyv1PtIPS>wWEGK8!Eqvf
z5Q*Q3V}wH7Yts~4M@Jn*#a82UWqZQel`7vWKk^KYh_~L%yr3=bo)yrj3zj<l&d9JZ
zC=3p<B|;3nEd<BwDlNR3cB<8w%li6-HYYUVc~j+KSq$%;kvH-REBB7>?7ZP+W?ki-
z9@b~P7;1PNzHk4B*%Alm4LKW-m3@mDaDR80t?cHOJh5)Om>bx;H5rn|4LOjSN|!>0
zl;2F%Fw#TH{5SD`pToAk-72UW7FalYO$k|7@Cf^Vu^6Fsh!g5-6#EJC_b_hWuGN4G
H{+GW1c;A`E

delta 1383
zcmajddo&XY0LSrd9>Wj`-OVV3axIU}b`HC39P)_iA?}Tk&TXz@B-@;@Mi)^wjL2is
zJxMj&$OtW$H8YQ)n~~STa6OvGEsuHJ&i&`!ziyv%zW@FH{Jnr=LFgwauHNph0p!x9
zv60gU2nWH-Y}NwTF<<<d6BQ_oxJZZFJNM~34|y2FcT;z@f|}+K8d;Uu6>VNG=Y)vb
z%0oVt6*g=1jt`D3uk!<+Ph3j6#Jfo%rqncTO(|a$4;PbWlAo00$4TiIfcpQ+-K%<f
zMrSmp!GQv!X1b@2EFoFcNL%Zpc6Mduk?u3}+S*!rv{AR4iTPTgmb>82|KvUmnO-Nz
z7NlOD4kT?|P+3`Sj+@Z$HTK!F+hU)JCg{`WS1SEIZn?zH_A=Tz-S#t{lZoh7R`5SF
z%4_WW{B3y`m2p7!7E)0e0d0Q>92>*>`Th2oo+uo6V3>CC)qYX8>R^ppFB8m9Rw=Zb
z;ujiKRBQg&a?r*GU}U#yCLQkuWz+UZx9l+~02T{-R^MP}DL8x<7k*uvysA1>myz7i
z5Z^Qt3%EAOAppob(5LKK?mn{{!LAf4W>7IfMG?sSR8aU^tr(QHtluJhAyD?-wxS9w
z>QM_p$mFNPJNJi93GZXCSm+tFCzSM{%bA$OA8^)6I21I<1`iBah208<_4NY}7^@JK
z6y;tn$4}zq6=wEeWhDfOir=b_J#23eD0S(W1{EzzYvPixYd4Z4ZVU=!`|emD0G+IL
zGr@rigEqeA<}#fe8(B>sC`rEB^db$xTZf<Ex-}}L(9jl*d-pg!_hGHgq*46A#f7Z|
zVHra}1dO0lx~JHo@;ATN;Y-bb&6<@S&$()7xM+byE+?Q+b$&!%mW5jz%(WbYKlid8
z*i7Ue0_5nr5CJ6=)LMLyaf6}pT5oX)!~`u$PD^X;pv~-9TE`Dd!AV<!=9O8AFSIIO
z$%|fV@b?EJE`icBhK2HoM_>Mm-68n-VM9$hq~jQvx?+BFa~Fv)<|Hep8+q41+MEjl
zFOGok<=kM1#f~&Epe0l$(BzegV(@VR7l2i`I7T5QQ-h7o%PS&lYWk+!)(i}j{L-_d
z+~px*58&`U+>wC+H)D-f%RlEMs0_w(O(|W52|5iiXs&-hA)Skyb0M5JP<+AnsuJp=
zF36VR;#!o}R-pd=5HnMrsXs@cP=Li<R2^7=iM~-NwJ`)6bu9KH=uB{z`CaH9kd?Qe
z()--n2lvIl6R<#dGw`lhR9)@+@FBF^7Q>9+5c|klfijUkE&~z9BZijf*nF>=W2!T5
zWo5NYoT%T@YVGhrbGfC?>hY_Vu}Y+8QCnM|^stlpHeRn8KJ><nybPFIlJgQ4HuOe@
zJ6)c2Oi|Q3JAo&YWRZO%kQNGoMKQ}ro9z~_`peO#eD4LtEaQk%zC@$GKA-0A1L7xL
zUfs1jPJ4Vd-ifyKNp~-SQ$X$(2tm(-R61xXB*jJ8<)2U8L8Wdqh9uEnR0DJ1Dn!Lh
z`+9-xC^HXa;w;!~de>>WK6W-cYlCOa_#*)E^;<WcH`7Hi;6j8NGMX~!r5<ZpvLP$U
zZ%>hw%TG>hV=zoYfw*fJ;gBoYr<+lKji$A1(Gxi7;KC%hi+j~|&D3MYRdLL#xm}}^
z#OC`)Vc$7uvr)?@*;4yco>eKIu<7YTRmD_lYqU_<NZ?K7W^z{{-cRtVn!>9kXw14M
zlD#jZAm|Za+H4T+;h{Ex%3l$c8f_{f?si{3rl)W4tqS>35pso1=6{K{SHQcR#B3WQ
R$rZp?-X1vj8n^J&zX61An$G|L


From 4cf16d73e4a598216496b8554b7d65d8a479c28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Fri, 30 Jan 2026 13:21:35 +0100
Subject: [PATCH 07/11] Standardize watermark foreground naming

---
 samples/BindingDemo/MainWindow.xaml           |  36 ++++----
 .../Pages/AutoCompleteBoxPage.xaml            |   8 +-
 .../Pages/CalendarDatePickerPage.xaml         |  12 +--
 .../ControlCatalog/Pages/ClipboardPage.xaml   |   2 +-
 samples/ControlCatalog/Pages/DialogsPage.xaml |   8 +-
 .../Pages/NumericUpDownPage.xaml              |  20 ++---
 samples/ControlCatalog/Pages/TextBoxPage.xaml |  26 +++---
 samples/ControlCatalog/Pages/ThemePage.axaml  |   4 +-
 .../Controls/SignUpView.xaml                  |  12 +--
 .../Pages/ScreensPage.axaml                   |  14 +--
 .../Pages/WindowDecorationsPage.axaml         |   2 +-
 .../IntegrationTestApp/Pages/WindowPage.axaml |   2 +-
 samples/SafeAreaDemo/Views/MainView.xaml      |   2 +-
 samples/SingleProjectSandbox/MainView.axaml   |   8 +-
 .../AutoCompleteBox.Properties.cs             |  58 +++++++++---
 .../CalendarDatePicker.Properties.cs          |  68 +++++++++++---
 .../CalendarDatePicker/CalendarDatePicker.cs  |  16 ++--
 .../NumericUpDown/NumericUpDown.cs            |  54 ++++++++---
 src/Avalonia.Controls/TextBox.cs              |  84 ++++++++++++++----
 .../Controls/AutoCompleteBox.xaml             |   4 +-
 .../Controls/CalendarDatePicker.xaml          |   8 +-
 .../Controls/ComboBox.xaml                    |   2 +-
 .../Controls/ManagedFileChooser.xaml          |   2 +-
 .../Controls/NumericUpDown.xaml               |   8 +-
 .../Controls/TextBox.xaml                     |  24 ++---
 .../Strings/InvariantResources.xaml           |   2 +-
 .../Controls/AutoCompleteBox.xaml             |   4 +-
 .../Controls/CalendarDatePicker.xaml          |   6 +-
 .../Controls/ManagedFileChooser.xaml          |   2 +-
 .../Controls/NumericUpDown.xaml               |   4 +-
 .../Controls/TextBox.xaml                     |  18 ++--
 .../AutoCompleteBoxTests.cs                   |   8 +-
 .../CalendarDatePickerTests.cs                |   8 +-
 .../NumericUpDownTests.cs                     |   8 +-
 .../TextBoxTests.cs                           |  26 +++---
 .../Views/AttachedProps.xml                   |   4 +-
 .../Views/ControlWithoutWindow.xml            |   4 +-
 .../Views/DataTemplates.xml                   |   8 +-
 .../Views/FieldModifier.xml                   |  16 ++--
 .../Views/NamedControl.xml                    |   4 +-
 .../Views/NamedControls.xml                   |   8 +-
 .../Views/NoNamedControls.xml                 |   4 +-
 .../Views/SignUpView.xml                      |  12 +--
 .../Views/xNamedControl.xml                   |   4 +-
 .../Views/xNamedControls.xml                  |   8 +-
 .../Data/BindingTests.cs                      |   4 +-
 .../Controls/TextBoxTests.cs                  |  32 +++----
 ...ceholder_With_Blue_Foreground.expected.png | Bin 0 -> 1645 bytes
 ...older_With_Default_Foreground.expected.png | Bin 0 -> 2059 bytes
 ...aceholder_With_Red_Foreground.expected.png | Bin 0 -> 1587 bytes
 ...atermark_With_Blue_Foreground.expected.png | Bin 1423 -> 0 bytes
 ...rmark_With_Default_Foreground.expected.png | Bin 1884 -> 0 bytes
 ...Watermark_With_Red_Foreground.expected.png | Bin 1452 -> 0 bytes
 53 files changed, 414 insertions(+), 264 deletions(-)
 create mode 100644 tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Blue_Foreground.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Default_Foreground.expected.png
 create mode 100644 tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Red_Foreground.expected.png
 delete mode 100644 tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Blue_Foreground.expected.png
 delete mode 100644 tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Default_Foreground.expected.png
 delete mode 100644 tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Red_Foreground.expected.png

diff --git a/samples/BindingDemo/MainWindow.xaml b/samples/BindingDemo/MainWindow.xaml
index 9d68c8da8a6..d0a938ea836 100644
--- a/samples/BindingDemo/MainWindow.xaml
+++ b/samples/BindingDemo/MainWindow.xaml
@@ -20,22 +20,22 @@
         <StackPanel Orientation="Horizontal">
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Simple Bindings"/>
-            <TextBox Watermark="Two Way" UseFloatingWatermark="True" Text="{Binding Path=StringValue}" Name="first"/>
-            <TextBox Watermark="Two Way (LostFocus)" UseFloatingWatermark="True" Text="{Binding Path=StringValue, UpdateSourceTrigger=LostFocus}"/>
-            <TextBox Watermark="One Way" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
-            <TextBox Watermark="One Time" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
+            <TextBox Placeholder="Two Way" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue}" Name="first"/>
+            <TextBox Placeholder="Two Way (LostFocus)" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, UpdateSourceTrigger=LostFocus}"/>
+            <TextBox Placeholder="One Way" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
+            <TextBox Placeholder="One Time" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
             <!-- Removed due to #2983: reinstate when that's fixed.
-              <TextBox Watermark="One Way to Source" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneWayToSource}"/>
+              <TextBox Placeholder="One Way to Source" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneWayToSource}"/>
             -->
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Collection Bindings"/>
-            <TextBox Watermark="Items[1].Value" UseFloatingWatermark="True" Text="{Binding Path=Items[1].Value}"/>
+            <TextBox Placeholder="Items[1].Value" UseFloatingPlaceholder="True" Text="{Binding Path=Items[1].Value}"/>
             <Button Command="{Binding ShuffleItems}">Shuffle</Button>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Negated Bindings"/>
-            <TextBox Watermark="Boolean String" UseFloatingWatermark="True" Text="{Binding Path=BooleanString}"/>
+            <TextBox Placeholder="Boolean String" UseFloatingPlaceholder="True" Text="{Binding Path=BooleanString}"/>
             <CheckBox IsChecked="{Binding !BooleanString}">!BooleanString</CheckBox>
             <CheckBox IsChecked="{Binding !!BooleanString}">!!BooleanString</CheckBox>
           </StackPanel>
@@ -43,24 +43,24 @@
         <StackPanel Orientation="Horizontal">
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
             <TextBlock FontSize="16" Text="Numeric Bindings"/>
-            <TextBox Watermark="Double" UseFloatingWatermark="True" Text="{Binding Path=DoubleValue, Mode=TwoWay}"/>
+            <TextBox Placeholder="Double" UseFloatingPlaceholder="True" Text="{Binding Path=DoubleValue, Mode=TwoWay}"/>
             <TextBlock Text="{Binding Path=DoubleValue}"/>
             <ProgressBar Maximum="10" Value="{Binding DoubleValue}"/>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
             <TextBlock FontSize="16" Text="Binding Sources"/>
-            <TextBox Watermark="Value of first TextBox" UseFloatingWatermark="True" 
+            <TextBox Placeholder="Value of first TextBox" UseFloatingPlaceholder="True" 
                      Text="{Binding #first.Text, Mode=TwoWay}"/>
-            <TextBox Watermark="Value of SharedItem.StringValue" UseFloatingWatermark="True"
+            <TextBox Placeholder="Value of SharedItem.StringValue" UseFloatingPlaceholder="True"
                      Text="{Binding Value, Source={StaticResource SharedItem}, Mode=TwoWay, DataType={x:Type vm:MainWindowViewModel+TestItem, x:TypeArguments=x:String}}"/>
-            <TextBox Watermark="Value of SharedItem.StringValue (duplicate)" UseFloatingWatermark="True"
+            <TextBox Placeholder="Value of SharedItem.StringValue (duplicate)" UseFloatingPlaceholder="True"
                      Text="{Binding Value, Source={StaticResource SharedItem}, Mode=TwoWay, DataType={x:Type vm:MainWindowViewModel+TestItem, x:TypeArguments=x:String}}"/>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
             <TextBlock FontSize="16" Text="Scheduler"/>
-            <TextBox Watermark="Background Thread" Text="{Binding CurrentTime, Mode=OneWay}"/>
+            <TextBox Placeholder="Background Thread" Text="{Binding CurrentTime, Mode=OneWay}"/>
             <TextBlock FontSize="16" Text="Stream Operator"/>
-            <TextBox Watermark="StreamOperator" Text="{CompiledBinding CurrentTimeObservable^, Mode=OneWay}"/>
+            <TextBox Placeholder="StreamOperator" Text="{CompiledBinding CurrentTimeObservable^, Mode=OneWay}"/>
           </StackPanel>
         </StackPanel>
       </StackPanel>
@@ -93,17 +93,17 @@
       <StackPanel Orientation="Horizontal">
         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding ExceptionDataValidation}">
           <TextBlock FontSize="16" Text="Exception Validation"/>
-          <TextBox Watermark="Less Than 10" UseFloatingWatermark="True" Text="{Binding Path=LessThan10}"/>
+          <TextBox Placeholder="Less Than 10" UseFloatingPlaceholder="True" Text="{Binding Path=LessThan10}"/>
         </StackPanel>
         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding IndeiDataValidation}">
           <TextBlock FontSize="16" Text="INotifyDataErrorInfo Validation"/>
-          <TextBox Watermark="Maximum" UseFloatingWatermark="True" Text="{Binding Path=Maximum}"/>
-          <TextBox Watermark="Value" UseFloatingWatermark="True" Text="{Binding Path=Value}"/>
+          <TextBox Placeholder="Maximum" UseFloatingPlaceholder="True" Text="{Binding Path=Maximum}"/>
+          <TextBox Placeholder="Value" UseFloatingPlaceholder="True" Text="{Binding Path=Value}"/>
         </StackPanel>
         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding DataAnnotationsValidation}">
           <TextBlock FontSize="16" Text="Data Annotations Validation"/>
-          <TextBox Watermark="Phone #" UseFloatingWatermark="True" Text="{Binding PhoneNumber}"/>
-          <TextBox Watermark="Less Than 10" UseFloatingWatermark="True" Text="{Binding Path=LessThan10}"/>
+          <TextBox Placeholder="Phone #" UseFloatingPlaceholder="True" Text="{Binding PhoneNumber}"/>
+          <TextBox Placeholder="Less Than 10" UseFloatingPlaceholder="True" Text="{Binding Path=LessThan10}"/>
         </StackPanel>
       </StackPanel>
     </TabItem>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index db5d9bbdfd5..487b638a1f8 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -39,12 +39,12 @@
         <AutoCompleteBox MaxDropDownHeight="60" />
       </StackPanel>
       <StackPanel>
-        <TextBlock Text="Watermark" />
-        <AutoCompleteBox Watermark="Hello World" />
+        <TextBlock Text="Placeholder" />
+        <AutoCompleteBox Placeholder="Hello World" />
       </StackPanel>
       <StackPanel>
-        <TextBlock Text="Watermark with custom color" />
-        <AutoCompleteBox Watermark="Search here..." WatermarkForeground="Green" />
+        <TextBlock Text="Placeholder with custom color" />
+        <AutoCompleteBox Placeholder="Search here..." PlaceholderForeground="Green" />
       </StackPanel>
       <StackPanel>
         <TextBlock Text="Disabled" />
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 649a3098ad3..c6b7e3910d0 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -32,16 +32,16 @@
                     Margin="0,0,0,8"/>
 
         <CalendarDatePicker Margin="0,0,0,8"
-                    Watermark="Watermark"/>
+                    Placeholder="Placeholder"/>
         <CalendarDatePicker Margin="0,0,0,8"
                     Name="DatePicker5"
-                    Watermark="Floating Watermark"
-                    UseFloatingWatermark="True"/>
+                    Placeholder="Floating Placeholder"
+                    UseFloatingPlaceholder="True"/>
 
-        <TextBlock Text="Watermark with custom color"/>
+        <TextBlock Text="Placeholder with custom color"/>
         <CalendarDatePicker Margin="0,0,0,8"
-                    Watermark="Select a date"
-                    WatermarkForeground="Purple"/>
+                    Placeholder="Select a date"
+                    PlaceholderForeground="Purple"/>
                 
         <TextBlock Text="Disabled"/>
         <CalendarDatePicker IsEnabled="False"/>
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 80b3f4d1ed2..99bc527abf8 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -21,7 +21,7 @@
     <TextBox x:Name="ClipboardContent"
              MinHeight="100"
              AcceptsReturn="True"
-             Watermark="Text to copy of file names per line" />
+             Placeholder="Text to copy of file names per line" />
     <Viewbox Width="420" Height="360">
       <Image x:Name="ClipboardImage"
       />
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 7320c1f3d76..9b93ece1b56 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -61,14 +61,14 @@
     
     <Expander Header="Launcher dialogs">
       <StackPanel Spacing="4">
-        <TextBox Name="UriToLaunch" Watermark="Uri to launch" Text="https://avaloniaui.net/" />
+        <TextBox Name="UriToLaunch" Placeholder="Uri to launch" Text="https://avaloniaui.net/" />
         <Button Name="LaunchUri">Launch Uri</Button>
         <Button Name="LaunchFile">Launch File</Button>
         <TextBlock Name="LaunchStatus" />
       </StackPanel>
     </Expander>
 
-    <AutoCompleteBox x:Name="CurrentFolderBox" Watermark="Write full path/uri or well known folder name">
+    <AutoCompleteBox x:Name="CurrentFolderBox" Placeholder="Write full path/uri or well known folder name">
       <AutoCompleteBox.ItemsSource>
         <generic:List x:TypeArguments="storage:WellKnownFolder">
           <storage:WellKnownFolder>Desktop</storage:WellKnownFolder>
@@ -87,10 +87,10 @@
                Text="Last picker results:" />
     <ItemsControl x:Name="PickerLastResults" />
 
-    <TextBox Name="BookmarkContainer" Watermark="Bookmark" />
+    <TextBox Name="BookmarkContainer" Placeholder="Bookmark" />
     <TextBox Name="OpenedFileContent"
              MaxLines="10"
-             Watermark="Picked file content" />
+             Placeholder="Picked file content" />
 
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index 91716640664..fbce9ec3e14 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -48,8 +48,8 @@
         <ComboBox x:Name="CultureSelector" Grid.Row="2" Grid.Column="1" ItemsSource="{Binding Cultures}"
                   VerticalAlignment="Center" Margin="2"/>
 
-        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">Watermark:</TextBlock>
-        <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #upDown.Watermark}" VerticalAlignment="Center" Margin="2" />
+        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">Placeholder:</TextBlock>
+        <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #upDown.Placeholder}" VerticalAlignment="Center" Margin="2" />
 
         <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">Text:</TextBlock>
         <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding #upDown.Text}" VerticalAlignment="Center" Margin="2" />
@@ -81,21 +81,21 @@
         <NumericUpDown Name="upDown" Minimum="0" Maximum="10" Increment="0.5"
                        NumberFormat="{Binding #CultureSelector.SelectedItem, Converter={x:Static pages:NumericUpDownPage.CultureConverter}}"
                        VerticalAlignment="Center" Value="{Binding DecimalValue}"
-                       Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+                       Placeholder="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
       </StackPanel>
 
       <StackPanel Orientation="Vertical" Margin="10">
         <Label Target="DoubleUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of double NumericUpDown:</Label>
         <NumericUpDown Name="DoubleUpDown" Minimum="0" Maximum="10" Increment="0.5"
                        VerticalAlignment="Center" Value="{Binding DoubleValue}"
-                       Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+                       Placeholder="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
       </StackPanel>
       
       <StackPanel Orientation="Vertical" Margin="10">
         <Label Target="ValidationUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">NumericUpDown with Validation Errors:</Label>
         <NumericUpDown x:Name="ValidationUpDown" Minimum="0" Maximum="10" Increment="0.5"
                        VerticalAlignment="Center"
-                       Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}">
+                       Placeholder="Enter text" FormatString="{Binding SelectedFormat.Value}">
           <DataValidationErrors.Error>
             <sys:Exception /> 
           </DataValidationErrors.Error>
@@ -115,11 +115,11 @@
     </WrapPanel>
 
     <StackPanel Orientation="Vertical" Margin="10">
-      <Label FontSize="14" FontWeight="Bold" Target="WatermarkForegroundUpDown"
-             Content="Watermark with custom foreground color:"/>
-      <NumericUpDown x:Name="WatermarkForegroundUpDown"
-                     Watermark="Enter amount"
-                     WatermarkForeground="Orange"/>
+      <Label FontSize="14" FontWeight="Bold" Target="PlaceholderForegroundUpDown"
+             Content="Placeholder with custom foreground color:"/>
+      <NumericUpDown x:Name="PlaceholderForegroundUpDown"
+                     Placeholder="Enter amount"
+                     PlaceholderForeground="Orange"/>
     </StackPanel>
 
     <StackPanel Margin="10">
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index 2891e77ebd4..bb2bb39f1d0 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -17,19 +17,19 @@
             </Flyout>
           </TextBox.ContextFlyout>
         </TextBox>
-        <TextBox Width="200" Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
-        <TextBox Width="200" Watermark="Numeric with watermark" TextInputOptions.ContentType="Number" />
+        <TextBox Width="200" Placeholder="ReadOnly" IsReadOnly="True" Text="This is read only"/>
+        <TextBox Width="200" Placeholder="Numeric with placeholder" TextInputOptions.ContentType="Number" />
         <TextBox Width="200"
-                 Watermark="Floating Watermark"
-                 UseFloatingWatermark="True"
+                 Placeholder="Floating Placeholder"
+                 UseFloatingPlaceholder="True"
                  Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
         <TextBox Width="200"
-                 Watermark="Custom Watermark Color"
-                 WatermarkForeground="Red"/>
+                 Placeholder="Custom Placeholder Color"
+                 PlaceholderForeground="Red"/>
         <TextBox Width="200"
-                 Watermark="Floating Watermark Color"
-                 UseFloatingWatermark="True"
-                 WatermarkForeground="Purple"/>
+                 Placeholder="Floating Placeholder Color"
+                 UseFloatingPlaceholder="True"
+                 PlaceholderForeground="Purple"/>
         <MaskedTextBox Width="200" ResetOnSpace="False"  Mask="(LLL) 999-0000"/>
         
         <TextBox Width="200" Text="Validation Error">
@@ -39,13 +39,13 @@
         </TextBox>
 
         <TextBox Width="200"
-                 Watermark="Password Box"
+                 Placeholder="Password Box"
                  Classes="revealPasswordButton"
                  TextInputOptions.ContentType="Password"
-                 UseFloatingWatermark="True"
+                 UseFloatingPlaceholder="True"
                  PasswordChar="*"
                  Text="Password" />
-        <TextBox Width="200" Watermark="Suggestions are hidden" TextInputOptions.ShowSuggestions="False" />
+        <TextBox Width="200" Placeholder="Suggestions are hidden" TextInputOptions.ShowSuggestions="False" />
         <TextBox Width="200" Text="Left aligned text" TextAlignment="Left" AcceptsTab="True" />
         <TextBox Width="200" Text="Center aligned text" TextAlignment="Center" />
         <TextBox Width="200" Text="Right aligned text" TextAlignment="Right" />
@@ -61,7 +61,7 @@
         <TextBox AcceptsReturn="True" Width="200" Height="125"
                  Text="Multiline TextBox with no TextWrapping.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
 
-        <TextBox Classes="clearButton" Text="Clear Content" Width="200" FontWeight="Normal" FontStyle="Normal" Watermark="Watermark" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+        <TextBox Classes="clearButton" Text="Clear Content" Width="200" FontWeight="Normal" FontStyle="Normal" Placeholder="Placeholder" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
         <TextBox Text="IME small font" Width="200"
          FontFamily="Comic Sans MS"
          FontSize="10"
diff --git a/samples/ControlCatalog/Pages/ThemePage.axaml b/samples/ControlCatalog/Pages/ThemePage.axaml
index 2d948c44a09..db6025ea4af 100644
--- a/samples/ControlCatalog/Pages/ThemePage.axaml
+++ b/samples/ControlCatalog/Pages/ThemePage.axaml
@@ -70,8 +70,8 @@
         </ComboBox>
         <TextBlock Grid.Column="0" Grid.Row="2" Text="Username:" VerticalAlignment="Center" />
         <TextBlock Grid.Column="0" Grid.Row="4" Text="Password:" VerticalAlignment="Center" />
-        <TextBox Grid.Column="1" Grid.Row="2" Watermark="Input here" HorizontalAlignment="Stretch" />
-        <TextBox Grid.Column="1" Grid.Row="4" Watermark="Input here" HorizontalAlignment="Stretch" />
+        <TextBox Grid.Column="1" Grid.Row="2" Placeholder="Input here" HorizontalAlignment="Stretch" />
+        <TextBox Grid.Column="1" Grid.Row="4" Placeholder="Input here" HorizontalAlignment="Stretch" />
         <Button Grid.Column="1" Grid.Row="6" Content="Login" HorizontalAlignment="Stretch" />
       </Grid>
     </Border>
diff --git a/samples/Generators.Sandbox/Controls/SignUpView.xaml b/samples/Generators.Sandbox/Controls/SignUpView.xaml
index b256d7a31cd..3004bb7a15e 100644
--- a/samples/Generators.Sandbox/Controls/SignUpView.xaml
+++ b/samples/Generators.Sandbox/Controls/SignUpView.xaml
@@ -17,8 +17,8 @@
         <controls:CustomTextBox Margin="0 10 0 0"
                  x:Name="UserNameTextBox"
                  Text="{Binding UserName}"
-                 Watermark="Please, enter user name..."
-                 UseFloatingWatermark="True" />
+                 Placeholder="Please, enter user name..."
+                 UseFloatingPlaceholder="True" />
         <TextBlock x:Name="UserNameValidation"
                    Text="{Binding UserNameValidation}"
                    Foreground="Green"
@@ -26,8 +26,8 @@
         <TextBox Margin="0 10 0 0"
                  x:Name="PasswordTextBox"
                  Text="{Binding Password}"
-                 Watermark="Please, enter your password..."
-                 UseFloatingWatermark="True"
+                 Placeholder="Please, enter your password..."
+                 UseFloatingPlaceholder="True"
                  PasswordChar="*" />
         <TextBlock x:Name="PasswordValidation"
                    Text="{Binding PasswordValidation}"
@@ -36,8 +36,8 @@
         <TextBox Margin="0 10 0 0"
                  x:Name="ConfirmPasswordTextBox"
                  Text="{Binding ConfirmPassword}"
-                 Watermark="Please, confirm the password..."
-                 UseFloatingWatermark="True"
+                 Placeholder="Please, confirm the password..."
+                 UseFloatingPlaceholder="True"
                  PasswordChar="*" />
         <TextBlock x:Name="ConfirmPasswordValidation"
                    Text="{Binding ConfirmPasswordValidation}"
diff --git a/samples/IntegrationTestApp/Pages/ScreensPage.axaml b/samples/IntegrationTestApp/Pages/ScreensPage.axaml
index 2d95c4719a0..6b60763a9a9 100644
--- a/samples/IntegrationTestApp/Pages/ScreensPage.axaml
+++ b/samples/IntegrationTestApp/Pages/ScreensPage.axaml
@@ -8,12 +8,12 @@
     <Button Name="ScreenRefresh"
             Content="Refresh"
             Click="ScreenRefresh_Click"/>
-    <TextBox Name="ScreenName" Watermark="DisplayName" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenHandle" Watermark="Handle" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenScaling" Watermark="Scaling" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenBounds" Watermark="Bounds" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenWorkArea" Watermark="WorkArea" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenOrientation" Watermark="Orientation" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenSameReference" Watermark="Is same reference" UseFloatingWatermark="true" />
+    <TextBox Name="ScreenName" Placeholder="DisplayName" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenHandle" Placeholder="Handle" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenScaling" Placeholder="Scaling" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenBounds" Placeholder="Bounds" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenWorkArea" Placeholder="WorkArea" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenOrientation" Placeholder="Orientation" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenSameReference" Placeholder="Is same reference" UseFloatingPlaceholder="true" />
   </StackPanel>
 </UserControl>
diff --git a/samples/IntegrationTestApp/Pages/WindowDecorationsPage.axaml b/samples/IntegrationTestApp/Pages/WindowDecorationsPage.axaml
index d6b418952a9..52c17629e6b 100644
--- a/samples/IntegrationTestApp/Pages/WindowDecorationsPage.axaml
+++ b/samples/IntegrationTestApp/Pages/WindowDecorationsPage.axaml
@@ -10,7 +10,7 @@
     <CheckBox Name="WindowPreferSystemChrome" Content="Prefer SystemChrome" />
     <CheckBox Name="WindowMacThickSystemChrome" Content="Mac Thick SystemChrome" />
     <CheckBox Name="WindowShowTitleAreaControl" Content="Show Title Area Control" />
-    <TextBox Name="WindowTitleBarHeightHint" Text="-1" Watermark="In dips" />
+    <TextBox Name="WindowTitleBarHeightHint" Text="-1" Placeholder="In dips" />
     <Button Name="ApplyWindowDecorations"
             Content="Apply decorations on this Window"
             Click="ApplyWindowDecorations_Click"/>
diff --git a/samples/IntegrationTestApp/Pages/WindowPage.axaml b/samples/IntegrationTestApp/Pages/WindowPage.axaml
index 60900a47789..7789eee1c88 100644
--- a/samples/IntegrationTestApp/Pages/WindowPage.axaml
+++ b/samples/IntegrationTestApp/Pages/WindowPage.axaml
@@ -6,7 +6,7 @@
              x:Class="IntegrationTestApp.Pages.WindowPage">
   <Grid ColumnDefinitions="*,8,*">
     <StackPanel Grid.Column="0">
-      <TextBox Name="ShowWindowSize" Watermark="Window Size"/>
+      <TextBox Name="ShowWindowSize" Placeholder="Window Size"/>
       <ComboBox Name="ShowWindowMode" SelectedIndex="0">
         <ComboBoxItem>NonOwned</ComboBoxItem>
         <ComboBoxItem>Owned</ComboBoxItem>
diff --git a/samples/SafeAreaDemo/Views/MainView.xaml b/samples/SafeAreaDemo/Views/MainView.xaml
index 85163e7dadb..565cded1396 100644
--- a/samples/SafeAreaDemo/Views/MainView.xaml
+++ b/samples/SafeAreaDemo/Views/MainView.xaml
@@ -47,7 +47,7 @@
                         <CheckBox IsChecked="{Binding UseSafeArea}" IsEnabled="{Binding !AutoSafeAreaPadding}">Use Safe Area</CheckBox>
                         <CheckBox IsChecked="{Binding AutoSafeAreaPadding}">Automatic Paddings</CheckBox>
                         <CheckBox IsChecked="{Binding HideSystemBars}">Hide System Bars</CheckBox>
-                        <TextBox Width="200" Watermark="Tap to Show Keyboard"/>
+                        <TextBox Width="200" Placeholder="Tap to Show Keyboard"/>
                     </StackPanel>
                 </Grid>
             </DockPanel>
diff --git a/samples/SingleProjectSandbox/MainView.axaml b/samples/SingleProjectSandbox/MainView.axaml
index e1764b07953..787bcd6c9d9 100644
--- a/samples/SingleProjectSandbox/MainView.axaml
+++ b/samples/SingleProjectSandbox/MainView.axaml
@@ -5,10 +5,10 @@
              x:DataType="local:MainView">
   <StackPanel Margin="100 50" Spacing="50">
     <TextBlock Text="Login" Foreground="White" />
-    <TextBox TextInputOptions.Multiline="True" AcceptsReturn="True" Watermark="Text" Height="200" TextWrapping="Wrap"/>
-    <TextBox Watermark="Username" TextInputOptions.ContentType="Email" TextInputOptions.ReturnKeyType="Done" />
-    <TextBox Watermark="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
-    <TextBox Watermark="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" TextInputOptions.ReturnKeyType="Next" />
+    <TextBox TextInputOptions.Multiline="True" AcceptsReturn="True" Placeholder="Text" Height="200" TextWrapping="Wrap"/>
+    <TextBox Placeholder="Username" TextInputOptions.ContentType="Email" TextInputOptions.ReturnKeyType="Done" />
+    <TextBox Placeholder="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
+    <TextBox Placeholder="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" TextInputOptions.ReturnKeyType="Next" />
     <Button Content="Login" Command="{Binding ButtonCommand}" />
   </StackPanel>
 </UserControl>
diff --git a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
index 2e5ef48b28c..efe78044b15 100644
--- a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
@@ -24,15 +24,29 @@ public partial class AutoCompleteBox
                 defaultValue: 0,
                 defaultBindingMode: BindingMode.TwoWay));
 
-        public static readonly StyledProperty<string?> WatermarkProperty =
-            TextBox.WatermarkProperty.AddOwner<AutoCompleteBox>();
+        /// <summary>
+        /// Defines the <see cref="Placeholder"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string?> PlaceholderProperty =
+            TextBox.PlaceholderProperty.AddOwner<AutoCompleteBox>();
 
         /// <summary>
-        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// Defines the <see cref="Watermark"/> property.
         /// </summary>
-        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty =
-            TextBox.WatermarkForegroundProperty.AddOwner<AutoCompleteBox>();
+        [Obsolete("Use PlaceholderProperty instead.", false)]
+        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderProperty;
 
+        /// <summary>
+        /// Defines the <see cref="PlaceholderForeground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Media.IBrush?> PlaceholderForegroundProperty =
+            TextBox.PlaceholderForegroundProperty.AddOwner<AutoCompleteBox>();
+
+        /// <summary>
+        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// </summary>
+        [Obsolete("Use PlaceholderForegroundProperty instead.", false)]
+        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty = PlaceholderForegroundProperty;
 
         /// <summary>
         /// Identifies the <see cref="MinimumPrefixLength" /> property.
@@ -417,21 +431,43 @@ public AutoCompleteFilterMode FilterMode
             set => SetValue(FilterModeProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the placeholder or descriptive text that is displayed even if the text is not yet set.
+        /// </summary>
+        public string? Placeholder
+        {
+            get => GetValue(PlaceholderProperty);
+            set => SetValue(PlaceholderProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the placeholder or descriptive text that is displayed even if the text is not yet set.
+        /// </summary>
+        [Obsolete("Use Placeholder instead.", false)]
         public string? Watermark
         {
-            get => GetValue(WatermarkProperty);
-            set => SetValue(WatermarkProperty, value);
+            get => Placeholder;
+            set => Placeholder = value;
         }
 
         /// <summary>
-        /// Gets or sets the brush used for the foreground color of the watermark text.
+        /// Gets or sets the brush used for the foreground color of the placeholder text.
         /// </summary>
-        public Media.IBrush? WatermarkForeground
+        public Media.IBrush? PlaceholderForeground
         {
-            get => GetValue(WatermarkForegroundProperty);
-            set => SetValue(WatermarkForegroundProperty, value);
+            get => GetValue(PlaceholderForegroundProperty);
+            set => SetValue(PlaceholderForegroundProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the brush used for the foreground color of the placeholder text.
+        /// </summary>
+        [Obsolete("Use PlaceholderForeground instead.", false)]
+        public Media.IBrush? WatermarkForeground
+        {
+            get => PlaceholderForeground;
+            set => PlaceholderForeground = value;
+        }
 
         /// <summary>
         /// Gets or sets the custom method that uses user-entered text to filter
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
index 0240e6c3a9c..4fc0741f553 100644
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
@@ -80,24 +80,41 @@ public partial class CalendarDatePicker
         public static readonly StyledProperty<string?> TextProperty =
             AvaloniaProperty.Register<CalendarDatePicker, string?>(nameof(Text));
 
+        /// <summary>
+        /// Defines the <see cref="Placeholder"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string?> PlaceholderProperty =
+            TextBox.PlaceholderProperty.AddOwner<CalendarDatePicker>();
+
         /// <summary>
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
-        public static readonly StyledProperty<string?> WatermarkProperty =
-            TextBox.WatermarkProperty.AddOwner<CalendarDatePicker>();
+        [Obsolete("Use PlaceholderProperty instead.", false)]
+        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderProperty;
+
+        /// <summary>
+        /// Defines the <see cref="UseFloatingPlaceholder"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> UseFloatingPlaceholderProperty =
+            TextBox.UseFloatingPlaceholderProperty.AddOwner<CalendarDatePicker>();
 
         /// <summary>
         /// Defines the <see cref="UseFloatingWatermark"/> property.
         /// </summary>
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
-            TextBox.UseFloatingWatermarkProperty.AddOwner<CalendarDatePicker>();
+        [Obsolete("Use UseFloatingPlaceholderProperty instead.", false)]
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderProperty;
 
         /// <summary>
-        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// Defines the <see cref="PlaceholderForeground"/> property.
         /// </summary>
-        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty =
-            TextBox.WatermarkForegroundProperty.AddOwner<CalendarDatePicker>();
+        public static readonly StyledProperty<Media.IBrush?> PlaceholderForegroundProperty =
+            TextBox.PlaceholderForegroundProperty.AddOwner<CalendarDatePicker>();
 
+        /// <summary>
+        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// </summary>
+        [Obsolete("Use PlaceholderForegroundProperty instead.", false)]
+        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty = PlaceholderForegroundProperty;
 
         /// <summary>
         /// Defines the <see cref="HorizontalContentAlignment"/> property.
@@ -261,28 +278,51 @@ public string? Text
             set => SetValue(TextProperty, value);
         }
 
+        /// <inheritdoc cref="TextBox.Placeholder"/>
+        public string? Placeholder
+        {
+            get => GetValue(PlaceholderProperty);
+            set => SetValue(PlaceholderProperty, value);
+        }
+
         /// <inheritdoc cref="TextBox.Watermark"/>
+        [Obsolete("Use Placeholder instead.", false)]
         public string? Watermark
         {
-            get => GetValue(WatermarkProperty);
-            set => SetValue(WatermarkProperty, value);
+            get => Placeholder;
+            set => Placeholder = value;
+        }
+
+        /// <inheritdoc cref="TextBox.UseFloatingPlaceholder"/>
+        public bool UseFloatingPlaceholder
+        {
+            get => GetValue(UseFloatingPlaceholderProperty);
+            set => SetValue(UseFloatingPlaceholderProperty, value);
         }
 
         /// <inheritdoc cref="TextBox.UseFloatingWatermark"/>
+        [Obsolete("Use UseFloatingPlaceholder instead.", false)]
         public bool UseFloatingWatermark
         {
-            get => GetValue(UseFloatingWatermarkProperty);
-            set => SetValue(UseFloatingWatermarkProperty, value);
+            get => UseFloatingPlaceholder;
+            set => UseFloatingPlaceholder = value;
+        }
+
+        /// <inheritdoc cref="TextBox.PlaceholderForeground"/>
+        public Media.IBrush? PlaceholderForeground
+        {
+            get => GetValue(PlaceholderForegroundProperty);
+            set => SetValue(PlaceholderForegroundProperty, value);
         }
 
         /// <inheritdoc cref="TextBox.WatermarkForeground"/>
+        [Obsolete("Use PlaceholderForeground instead.", false)]
         public Media.IBrush? WatermarkForeground
         {
-            get => GetValue(WatermarkForegroundProperty);
-            set => SetValue(WatermarkForegroundProperty, value);
+            get => PlaceholderForeground;
+            set => PlaceholderForeground = value;
         }
 
-
         /// <summary>
         /// Gets or sets the horizontal alignment of the content within the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
index e3ce49ac962..75fb72d7234 100644
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
@@ -881,38 +881,38 @@ private void SetWaterMarkText()
             {
                 SetCurrentValue(TextProperty, String.Empty);
                 
-                if (string.IsNullOrEmpty(Watermark) && !UseFloatingWatermark)
+                if (string.IsNullOrEmpty(Placeholder) && !UseFloatingPlaceholder)
                 {
                     DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
                     _defaultText = string.Empty;
-                    var watermarkFormat = "<{0}>";
-                    string watermarkText;
+                    var placeholderFormat = "<{0}>";
+                    string placeholderText;
 
                     switch (SelectedDateFormat)
                     {
                         case CalendarDatePickerFormat.Custom:
                             {
-                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, CustomDateFormatString);
+                                placeholderText = string.Format(CultureInfo.CurrentCulture, placeholderFormat, CustomDateFormatString);
                                 break;
                             }
                         case CalendarDatePickerFormat.Long:
                             {
-                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.LongDatePattern.ToString());
+                                placeholderText = string.Format(CultureInfo.CurrentCulture, placeholderFormat, dtfi.LongDatePattern.ToString());
                                 break;
                             }
                         case CalendarDatePickerFormat.Short:
                         default:
                             {
-                                watermarkText = string.Format(CultureInfo.CurrentCulture, watermarkFormat, dtfi.ShortDatePattern.ToString());
+                                placeholderText = string.Format(CultureInfo.CurrentCulture, placeholderFormat, dtfi.ShortDatePattern.ToString());
                                 break;
                             }
                     }
 
-                    _textBox.Watermark = watermarkText;
+                    _textBox.Placeholder = placeholderText;
                 }
                 else
                 {
-                    _textBox.ClearValue(TextBox.WatermarkProperty);
+                    _textBox.ClearValue(TextBox.PlaceholderProperty);
                 }
             }
         }
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 62c69165d4a..0b46087e8f5 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -108,18 +108,29 @@ public class NumericUpDown : TemplatedControl
             AvaloniaProperty.Register<NumericUpDown, decimal?>(nameof(Value), coerce: (s,v) => ((NumericUpDown)s).OnCoerceValue(v),
                 defaultBindingMode: BindingMode.TwoWay, enableDataValidation: true);
 
+        /// <summary>
+        /// Defines the <see cref="Placeholder"/> property.
+        /// </summary>
+        public static readonly StyledProperty<string?> PlaceholderProperty =
+            AvaloniaProperty.Register<NumericUpDown, string?>(nameof(Placeholder));
+
         /// <summary>
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
-        public static readonly StyledProperty<string?> WatermarkProperty =
-            AvaloniaProperty.Register<NumericUpDown, string?>(nameof(Watermark));
+        [Obsolete("Use PlaceholderProperty instead.", false)]
+        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderProperty;
 
         /// <summary>
-        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// Defines the <see cref="PlaceholderForeground"/> property.
         /// </summary>
-        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty =
-            TextBox.WatermarkForegroundProperty.AddOwner<NumericUpDown>();
+        public static readonly StyledProperty<Media.IBrush?> PlaceholderForegroundProperty =
+            TextBox.PlaceholderForegroundProperty.AddOwner<NumericUpDown>();
 
+        /// <summary>
+        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// </summary>
+        [Obsolete("Use PlaceholderForegroundProperty instead.", false)]
+        public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty = PlaceholderForegroundProperty;
 
         /// <summary>
         /// Defines the <see cref="HorizontalContentAlignment"/> property.
@@ -299,23 +310,42 @@ public decimal? Value
         }
 
         /// <summary>
-        /// Gets or sets the object to use as a watermark if the <see cref="Value"/> is null.
+        /// Gets or sets the object to use as a placeholder if the <see cref="Value"/> is null.
+        /// </summary>
+        public string? Placeholder
+        {
+            get => GetValue(PlaceholderProperty);
+            set => SetValue(PlaceholderProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the object to use as a placeholder if the <see cref="Value"/> is null.
         /// </summary>
+        [Obsolete("Use Placeholder instead.", false)]
         public string? Watermark
         {
-            get => GetValue(WatermarkProperty);
-            set => SetValue(WatermarkProperty, value);
+            get => Placeholder;
+            set => Placeholder = value;
         }
 
         /// <summary>
-        /// Gets or sets the brush used for the foreground color of the watermark text.
+        /// Gets or sets the brush used for the foreground color of the placeholder text.
         /// </summary>
-        public Media.IBrush? WatermarkForeground
+        public Media.IBrush? PlaceholderForeground
         {
-            get => GetValue(WatermarkForegroundProperty);
-            set => SetValue(WatermarkForegroundProperty, value);
+            get => GetValue(PlaceholderForegroundProperty);
+            set => SetValue(PlaceholderForegroundProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the brush used for the foreground color of the placeholder text.
+        /// </summary>
+        [Obsolete("Use PlaceholderForeground instead.", false)]
+        public Media.IBrush? WatermarkForeground
+        {
+            get => PlaceholderForeground;
+            set => PlaceholderForeground = value;
+        }
 
         /// <summary>
         /// Gets or sets the horizontal alignment of the content within the control.
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 7bf000fd012..bb2864b24c0 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -181,23 +181,40 @@ public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.I
             TextBlock.LineHeightProperty.AddOwner<TextBox>(new(defaultValue: double.NaN));
 
         /// <summary>
-        /// Defines the <see cref="Watermark"/> property
+        /// Defines the <see cref="Placeholder"/> property.
         /// </summary>
-        public static readonly StyledProperty<string?> WatermarkProperty =
-            AvaloniaProperty.Register<TextBox, string?>(nameof(Watermark));
+        public static readonly StyledProperty<string?> PlaceholderProperty =
+            AvaloniaProperty.Register<TextBox, string?>(nameof(Placeholder));
 
         /// <summary>
-        /// Defines the <see cref="UseFloatingWatermark"/> property
+        /// Defines the <see cref="Watermark"/> property.
         /// </summary>
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty =
-            AvaloniaProperty.Register<TextBox, bool>(nameof(UseFloatingWatermark));
+        [Obsolete("Use PlaceholderProperty instead.", false)]
+        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderProperty;
 
         /// <summary>
-        /// Defines the <see cref="WatermarkForeground"/> property
+        /// Defines the <see cref="UseFloatingPlaceholder"/> property.
         /// </summary>
-        public static readonly StyledProperty<IBrush?> WatermarkForegroundProperty =
-            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(WatermarkForeground));
+        public static readonly StyledProperty<bool> UseFloatingPlaceholderProperty =
+            AvaloniaProperty.Register<TextBox, bool>(nameof(UseFloatingPlaceholder));
 
+        /// <summary>
+        /// Defines the <see cref="UseFloatingWatermark"/> property.
+        /// </summary>
+        [Obsolete("Use UseFloatingPlaceholderProperty instead.", false)]
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderProperty;
+
+        /// <summary>
+        /// Defines the <see cref="PlaceholderForeground"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush?> PlaceholderForegroundProperty =
+            AvaloniaProperty.Register<TextBox, IBrush?>(nameof(PlaceholderForeground));
+
+        /// <summary>
+        /// Defines the <see cref="WatermarkForeground"/> property.
+        /// </summary>
+        [Obsolete("Use PlaceholderForegroundProperty instead.", false)]
+        public static readonly StyledProperty<IBrush?> WatermarkForegroundProperty = PlaceholderForegroundProperty;
 
         /// <summary>
         /// Defines the <see cref="NewLine"/> property
@@ -672,31 +689,62 @@ public TextAlignment TextAlignment
         /// Gets or sets the placeholder or descriptive text that is displayed even if the <see cref="Text"/>
         /// property is not yet set.
         /// </summary>
+        public string? Placeholder
+        {
+            get => GetValue(PlaceholderProperty);
+            set => SetValue(PlaceholderProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the placeholder or descriptive text that is displayed even if the <see cref="Text"/>
+        /// property is not yet set.
+        /// </summary>
+        [Obsolete("Use Placeholder instead.", false)]
         public string? Watermark
         {
-            get => GetValue(WatermarkProperty);
-            set => SetValue(WatermarkProperty, value);
+            get => Placeholder;
+            set => Placeholder = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the <see cref="Placeholder"/> will still be shown above the
+        /// <see cref="Text"/> even after a text value is set.
+        /// </summary>
+        public bool UseFloatingPlaceholder
+        {
+            get => GetValue(UseFloatingPlaceholderProperty);
+            set => SetValue(UseFloatingPlaceholderProperty, value);
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the <see cref="Watermark"/> will still be shown above the
+        /// Gets or sets a value indicating whether the <see cref="Placeholder"/> will still be shown above the
         /// <see cref="Text"/> even after a text value is set.
         /// </summary>
+        [Obsolete("Use UseFloatingPlaceholder instead.", false)]
         public bool UseFloatingWatermark
         {
-            get => GetValue(UseFloatingWatermarkProperty);
-            set => SetValue(UseFloatingWatermarkProperty, value);
+            get => UseFloatingPlaceholder;
+            set => UseFloatingPlaceholder = value;
         }
 
         /// <summary>
-        /// Gets or sets the brush used for the foreground color of the watermark text.
+        /// Gets or sets the brush used for the foreground color of the placeholder text.
         /// </summary>
-        public IBrush? WatermarkForeground
+        public IBrush? PlaceholderForeground
         {
-            get => GetValue(WatermarkForegroundProperty);
-            set => SetValue(WatermarkForegroundProperty, value);
+            get => GetValue(PlaceholderForegroundProperty);
+            set => SetValue(PlaceholderForegroundProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the brush used for the foreground color of the placeholder text.
+        /// </summary>
+        [Obsolete("Use PlaceholderForeground instead.", false)]
+        public IBrush? WatermarkForeground
+        {
+            get => PlaceholderForeground;
+            set => PlaceholderForeground = value;
+        }
 
         /// <summary>
         /// Gets or sets custom content that is positioned on the left side of the text layout box
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
index fe7cd13114f..a05590b49fb 100644
--- a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -34,8 +34,8 @@
         <ControlTemplate>
           <Grid Name="PART_LayoutRoot">
             <TextBox Name="PART_TextBox"
-                     Watermark="{TemplateBinding Watermark}"
-                     WatermarkForeground="{TemplateBinding WatermarkForeground}"
+                     Placeholder="{TemplateBinding Placeholder}"
+                     PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
                      Width="{TemplateBinding Width}"
                      Foreground="{TemplateBinding Foreground}"
                      Background="{TemplateBinding Background}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index 663ae9a998a..cbed2ffd476 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -92,9 +92,9 @@
                        CornerRadius="{TemplateBinding CornerRadius}"
                        Margin="{TemplateBinding BorderThickness}"
                        Padding="{TemplateBinding Padding}"
-                       Watermark="{TemplateBinding Watermark}"
-                       WatermarkForeground="{TemplateBinding WatermarkForeground}"
-                       UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                       Placeholder="{TemplateBinding Placeholder}"
+                       PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
+                       UseFloatingPlaceholder="{TemplateBinding UseFloatingPlaceholder}"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -113,7 +113,7 @@
                       <Setter Property="Background" Value="Transparent" />
                       <Setter Property="BorderBrush" Value="Transparent" />
                     </Style>
-                    <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
+                    <Style Selector="^ /template/ TextBlock#PART_Placeholder, ^ TextBlock#PART_FloatingPlaceholder">
                       <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
                     </Style>
                   </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index bcba6464611..6263d738d59 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -126,7 +126,7 @@
                      Foreground="{TemplateBinding Foreground}"
                      Background="Transparent"
                      Text="{TemplateBinding Text, Mode=TwoWay}"
-                     Watermark="{TemplateBinding PlaceholderText}"
+                     Placeholder="{TemplateBinding PlaceholderText}"
                      BorderThickness="0"
                      IsVisible="{TemplateBinding IsEditable}">
               <TextBox.Resources>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
index 598cec7ace3..c1dfe8d4a3d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
@@ -184,7 +184,7 @@
                       IsVisible="{Binding ShowFilters}"
                       ItemsSource="{Binding Filters}"
                       SelectedItem="{Binding SelectedFilter}" />
-                  <TextBox Text="{Binding FileName}" Watermark="{DynamicResource StringManagedFileChooserFileNameWatermark}" IsVisible="{Binding !SelectingFolder}" />
+                  <TextBox Text="{Binding FileName}" Placeholder="{DynamicResource StringManagedFileChooserFileNamePlaceholder}" IsVisible="{Binding !SelectingFolder}" />
                 </DockPanel>
                 <CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="{DynamicResource StringManagedFileChooserShowHiddenFilesText}" DockPanel.Dock="Left"/>
                 <UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1">
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index b9acbc35cd7..ff854b40a83 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -8,14 +8,14 @@
         <NumericUpDown Minimum="0"
                        Maximum="10"
                        Increment="0.5"
-                       Watermark="Enter text" />
+                       Placeholder="Enter text" />
         <NumericUpDown Minimum="0"
                        Maximum="10"
                        Increment="0.5"
                        VerticalContentAlignment="Center"
                        HorizontalContentAlignment="Center"
                        ButtonSpinnerLocation="Left"
-                       Watermark="Enter text" />
+                       Placeholder="Enter text" />
         <NumericUpDown ButtonSpinnerLocation="Left">
           <NumericUpDown.InnerLeftContent>
             <TextBlock Text="m"
@@ -81,8 +81,8 @@
                      Padding="{TemplateBinding Padding}"
                      MinWidth="0"
                      Foreground="{TemplateBinding Foreground}"
-                     Watermark="{TemplateBinding Watermark}"
-                     WatermarkForeground="{TemplateBinding WatermarkForeground}"
+                     Placeholder="{TemplateBinding Placeholder}"
+                     PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
                      IsReadOnly="{TemplateBinding IsReadOnly}"
                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index e07c07ffd37..d22af33beb5 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -9,9 +9,9 @@
         <TextBox Classes="clearButton">Clear</TextBox>
         <TextBox PasswordChar="*" Classes="revealPasswordButton">Reveal Password</TextBox>
         <TextBox PasswordChar="*" Classes="revealPasswordButton" RevealPassword="True">Password Revealed</TextBox>
-        <TextBox Watermark="Watermark"/>
-        <TextBox Watermark="Floating Watermark" UseFloatingWatermark="True"/>
-        <TextBox Watermark="Floating Watermark" UseFloatingWatermark="True">Content</TextBox>
+        <TextBox Placeholder="Placeholder"/>
+        <TextBox Placeholder="Floating Placeholder" UseFloatingPlaceholder="True"/>
+        <TextBox Placeholder="Floating Placeholder" UseFloatingPlaceholder="True">Content</TextBox>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
@@ -99,7 +99,7 @@
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
-    <Setter Property="WatermarkForeground" Value="{DynamicResource TextControlPlaceholderForeground}" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource TextControlPlaceholderForeground}" />
     <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
@@ -133,10 +133,10 @@
                            Grid.Column="1"
                            Grid.ColumnSpan="1"
                            Margin="{TemplateBinding Padding}">
-                  <TextBlock Name="PART_FloatingWatermark"
-                             Foreground="{TemplateBinding WatermarkForeground}"
+                  <TextBlock Name="PART_FloatingPlaceholder"
+                             Foreground="{TemplateBinding PlaceholderForeground}"
                              IsVisible="False"
-                             Text="{TemplateBinding Watermark}"
+                             Text="{TemplateBinding Placeholder}"
                              DockPanel.Dock="Top" />
 
                   <ScrollViewer Name="PART_ScrollViewer"
@@ -146,10 +146,10 @@
                                 AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                                 BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}">
                     <Panel>
-                      <TextBlock Name="PART_Watermark"
-                              Foreground="{TemplateBinding WatermarkForeground}"
+                      <TextBlock Name="PART_Placeholder"
+                              Foreground="{TemplateBinding PlaceholderForeground}"
                               Opacity="{DynamicResource TextControlPlaceholderOpacity}"
-                              Text="{TemplateBinding Watermark}"
+                              Text="{TemplateBinding Placeholder}"
                               TextAlignment="{TemplateBinding TextAlignment}"
                               TextWrapping="{TemplateBinding TextWrapping}"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -235,11 +235,11 @@
       <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
     </Style>
 
-    <Style Selector="^ /template/ TextBlock#PART_FloatingWatermark">
+    <Style Selector="^ /template/ TextBlock#PART_FloatingPlaceholder">
       <Setter Property="Cursor" Value="IBeam"/>
     </Style>
     
-    <Style Selector="^[UseFloatingWatermark=true]:not(:empty) /template/ TextBlock#PART_FloatingWatermark">
+    <Style Selector="^[UseFloatingPlaceholder=true]:not(:empty) /template/ TextBlock#PART_FloatingPlaceholder">
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
diff --git a/src/Avalonia.Themes.Fluent/Strings/InvariantResources.xaml b/src/Avalonia.Themes.Fluent/Strings/InvariantResources.xaml
index fa20725e214..2e7c1687e99 100644
--- a/src/Avalonia.Themes.Fluent/Strings/InvariantResources.xaml
+++ b/src/Avalonia.Themes.Fluent/Strings/InvariantResources.xaml
@@ -14,7 +14,7 @@
   <x:String x:Key="StringTextFlyoutCopyText">Copy</x:String>
   <x:String x:Key="StringTextFlyoutPasteText">Paste</x:String>
   <!-- ManagedFileChooser -->
-  <x:String x:Key="StringManagedFileChooserFileNameWatermark">File name</x:String>
+  <x:String x:Key="StringManagedFileChooserFileNamePlaceholder">File name</x:String>
   <x:String x:Key="StringManagedFileChooserShowHiddenFilesText">Show hidden files</x:String>
   <x:String x:Key="StringManagedFileChooserOkText">OK</x:String>
   <x:String x:Key="StringManagedFileChooserCancelText">Cancel</x:String>
diff --git a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
index b9590f0dc12..a8da9116747 100644
--- a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
@@ -19,8 +19,8 @@
                    CaretIndex="{TemplateBinding CaretIndex, Mode=TwoWay}"
                    ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   Watermark="{TemplateBinding Watermark}"
-                   WatermarkForeground="{TemplateBinding WatermarkForeground}"
+                   Placeholder="{TemplateBinding Placeholder}"
+                   PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
                    MaxLength="{TemplateBinding MaxLength}"                   
                    InnerLeftContent="{TemplateBinding InnerLeftContent}"
                    InnerRightContent="{TemplateBinding InnerRightContent}"
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
index 081d7be3f00..386728eca39 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
@@ -101,9 +101,9 @@
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                   Watermark="{TemplateBinding Watermark}"
-                   WatermarkForeground="{TemplateBinding WatermarkForeground}" />
+                   UseFloatingPlaceholder="{TemplateBinding UseFloatingPlaceholder}"
+                   Placeholder="{TemplateBinding Placeholder}"
+                   PlaceholderForeground="{TemplateBinding PlaceholderForeground}" />
 
           <Button Name="PART_Button"
                   Grid.Column="1"
diff --git a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
index ff4bf3ec658..3967ddccf96 100644
--- a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
@@ -115,7 +115,7 @@
             <TextBox DockPanel.Dock="Bottom"
                      IsVisible="{Binding !SelectingFolder}"
                      Text="{Binding FileName}"
-                     Watermark="{DynamicResource StringManagedFileChooserFileNameWatermark}" />
+                     Placeholder="{DynamicResource StringManagedFileChooserFileNamePlaceholder}" />
 
             <ListBox x:Name="PART_QuickLinks"
                      MaxWidth="200"
diff --git a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
index da453a5d2ca..0e1121c3f7b 100644
--- a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
@@ -37,8 +37,8 @@
                      Text="{TemplateBinding Text}"
                      TextAlignment="{TemplateBinding TextAlignment}"
                      TextWrapping="NoWrap"
-                     Watermark="{TemplateBinding Watermark}"
-                     WatermarkForeground="{TemplateBinding WatermarkForeground}"
+                     Placeholder="{TemplateBinding Placeholder}"
+                     PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
                      InnerLeftContent="{Binding InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}}"
                      InnerRightContent="{Binding InnerRightContent, RelativeSource={RelativeSource TemplatedParent}}"/>
           </ButtonSpinner>
diff --git a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
index 2848ad53d54..489ec176ad2 100644
--- a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -85,7 +85,7 @@
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="WatermarkForeground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
     <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
     <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}" />
@@ -103,14 +103,14 @@
                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
 
-            <TextBlock Name="floatingWatermark"
+            <TextBlock Name="floatingPlaceholder"
                        DockPanel.Dock="Top"
                        FontSize="{DynamicResource FontSizeSmall}"
-                       Foreground="{TemplateBinding WatermarkForeground}"
-                       Text="{TemplateBinding Watermark}">
+                       Foreground="{TemplateBinding PlaceholderForeground}"
+                       Text="{TemplateBinding Placeholder}">
               <TextBlock.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
-                  <Binding Path="UseFloatingWatermark"
+                  <Binding Path="UseFloatingPlaceholder"
                            RelativeSource="{RelativeSource TemplatedParent}" />
                   <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                            Path="Text"
@@ -134,12 +134,12 @@
                               IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
                               VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                   <Panel>
-                    <TextBlock Name="watermark"
-                               Foreground="{TemplateBinding WatermarkForeground}"
+                    <TextBlock Name="placeholder"
+                               Foreground="{TemplateBinding PlaceholderForeground}"
                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"   
                                Opacity="{DynamicResource TextControlPlaceholderOpacity}"
-                               Text="{TemplateBinding Watermark}"
+                               Text="{TemplateBinding Placeholder}"
                                TextAlignment="{TemplateBinding TextAlignment}"
                                TextWrapping="{TemplateBinding TextWrapping}">
                       <TextBlock.IsVisible>
@@ -196,7 +196,7 @@
     <Style Selector="^:disabled /template/ Border#border">
       <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
-    <Style Selector="^ /template/ TextBlock#floatingWatermark">
+    <Style Selector="^ /template/ TextBlock#floatingPlaceholder">
       <Setter Property="Cursor" Value="IBeam"/>
     </Style>
 
diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
index a1d63cd1f22..6cb58308ad4 100644
--- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -1285,15 +1285,15 @@ public TestContextMenu()
         }
 
         [Fact]
-        public void WatermarkForeground_Can_Be_Set()
+        public void PlaceholderForeground_Can_Be_Set()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
                 var control = CreateControl();
-                control.Watermark = "Search...";
-                control.WatermarkForeground = Media.Brushes.Green;
+                control.Placeholder = "Search...";
+                control.PlaceholderForeground = Media.Brushes.Green;
 
-                Assert.Equal(Media.Brushes.Green, control.WatermarkForeground);
+                Assert.Equal(Media.Brushes.Green, control.PlaceholderForeground);
             }
         }
     }
diff --git a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
index bea401f73bb..92b8dbca8e3 100644
--- a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
@@ -180,15 +180,15 @@ private static void RaiseTextEvent(TextBox textBox, string text)
         }
 
         [Fact]
-        public void WatermarkForeground_Can_Be_Set()
+        public void PlaceholderForeground_Can_Be_Set()
         {
             using (UnitTestApplication.Start(Services))
             {
                 var control = CreateControl();
-                control.Watermark = "Select date";
-                control.WatermarkForeground = Media.Brushes.Purple;
+                control.Placeholder = "Select date";
+                control.PlaceholderForeground = Media.Brushes.Purple;
 
-                Assert.Equal(Media.Brushes.Purple, control.WatermarkForeground);
+                Assert.Equal(Media.Brushes.Purple, control.PlaceholderForeground);
             }
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
index e5ee23d1cb3..1ee32bc2c1b 100644
--- a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
@@ -191,15 +191,15 @@ public void TabIndex_Should_Be_Synchronized_With_Inner_TextBox()
         }
 
         [Fact]
-        public void WatermarkForeground_Can_Be_Set()
+        public void PlaceholderForeground_Can_Be_Set()
         {
             using (UnitTestApplication.Start(Services))
             {
                 var control = CreateControl();
-                control.Watermark = "Enter value";
-                control.WatermarkForeground = Media.Brushes.Red;
+                control.Placeholder = "Enter value";
+                control.PlaceholderForeground = Media.Brushes.Red;
 
-                Assert.Equal(Media.Brushes.Red, control.WatermarkForeground);
+                Assert.Equal(Media.Brushes.Red, control.PlaceholderForeground);
             }
         }
     }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 2e3422b2c23..09591bd75d0 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -2150,57 +2150,57 @@ public void Backspace_Should_Delete_CRLFNewline_Character_At_Once()
         }
 
         [Fact]
-        public void WatermarkForeground_Can_Be_Set()
+        public void PlaceholderForeground_Can_Be_Set()
         {
             using (UnitTestApplication.Start(Services))
             {
                 var target = new TextBox
                 {
                     Template = CreateTemplate(),
-                    Watermark = "Enter text",
-                    WatermarkForeground = Brushes.Red
+                    Placeholder = "Enter text",
+                    PlaceholderForeground = Brushes.Red
                 };
 
                 target.ApplyTemplate();
 
-                Assert.Equal(Brushes.Red, target.WatermarkForeground);
+                Assert.Equal(Brushes.Red, target.PlaceholderForeground);
             }
         }
 
         [Fact]
-        public void WatermarkForeground_Defaults_To_Null()
+        public void PlaceholderForeground_Defaults_To_Null()
         {
             using (UnitTestApplication.Start(Services))
             {
                 var target = new TextBox
                 {
                     Template = CreateTemplate(),
-                    Watermark = "Enter text"
+                    Placeholder = "Enter text"
                 };
 
                 target.ApplyTemplate();
 
-                Assert.Null(target.WatermarkForeground);
+                Assert.Null(target.PlaceholderForeground);
             }
         }
 
         [Fact]
-        public void WatermarkForeground_Can_Be_Set_To_Null()
+        public void PlaceholderForeground_Can_Be_Set_To_Null()
         {
             using (UnitTestApplication.Start(Services))
             {
                 var target = new TextBox
                 {
                     Template = CreateTemplate(),
-                    Watermark = "Enter text",
-                    WatermarkForeground = Brushes.Blue
+                    Placeholder = "Enter text",
+                    PlaceholderForeground = Brushes.Blue
                 };
 
                 target.ApplyTemplate();
-                
-                target.WatermarkForeground = null;
 
-                Assert.Null(target.WatermarkForeground);
+                target.PlaceholderForeground = null;
+
+                Assert.Null(target.PlaceholderForeground);
             }
         }
 
diff --git a/tests/Avalonia.Generators.Tests/Views/AttachedProps.xml b/tests/Avalonia.Generators.Tests/Views/AttachedProps.xml
index 209b7ca9f1a..ccd199040eb 100644
--- a/tests/Avalonia.Generators.Tests/Views/AttachedProps.xml
+++ b/tests/Avalonia.Generators.Tests/Views/AttachedProps.xml
@@ -3,6 +3,6 @@
         x:Class="Sample.App.AttachedProps"
         Design.Width="300">
     <TextBox Name="UserNameTextBox"
-             Watermark="Username input"
-             UseFloatingWatermark="True" />
+             Placeholder="Username input"
+             UseFloatingPlaceholder="True" />
 </Window>
diff --git a/tests/Avalonia.Generators.Tests/Views/ControlWithoutWindow.xml b/tests/Avalonia.Generators.Tests/Views/ControlWithoutWindow.xml
index 485fe93e4c8..54e7f156e10 100644
--- a/tests/Avalonia.Generators.Tests/Views/ControlWithoutWindow.xml
+++ b/tests/Avalonia.Generators.Tests/Views/ControlWithoutWindow.xml
@@ -3,6 +3,6 @@
         x:Class="Sample.App.ControlWithoutWindow"
         Design.Width="300">
     <TextBox Name="UserNameTextBox"
-             Watermark="Username input"
-             UseFloatingWatermark="True" />
+             Placeholder="Username input"
+             UseFloatingPlaceholder="True" />
 </UserControl>
diff --git a/tests/Avalonia.Generators.Tests/Views/DataTemplates.xml b/tests/Avalonia.Generators.Tests/Views/DataTemplates.xml
index f7e15644aa9..c4d587baf2b 100644
--- a/tests/Avalonia.Generators.Tests/Views/DataTemplates.xml
+++ b/tests/Avalonia.Generators.Tests/Views/DataTemplates.xml
@@ -3,14 +3,14 @@
         x:Class="Sample.App.DataTemplates">
     <StackPanel>
         <TextBox x:Name="UserNameTextBox"
-                 Watermark="Username input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Username input"
+                 UseFloatingPlaceholder="True" />
         <ListBox Name="NamedListBox">
             <ListBox.ItemTemplate>
                 <DataTemplate x:Name="NamedDataTemplate">
                     <TextBox x:Name="TemplatedTextBox"
-                             Watermark="Templated input"
-                             UseFloatingWatermark="True" />
+                             Placeholder="Templated input"
+                             UseFloatingPlaceholder="True" />
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
diff --git a/tests/Avalonia.Generators.Tests/Views/FieldModifier.xml b/tests/Avalonia.Generators.Tests/Views/FieldModifier.xml
index 3ee5e514668..65fafb414e4 100644
--- a/tests/Avalonia.Generators.Tests/Views/FieldModifier.xml
+++ b/tests/Avalonia.Generators.Tests/Views/FieldModifier.xml
@@ -4,20 +4,20 @@
     <StackPanel>
         <TextBox Name="FirstNameTextBox"
                  x:FieldModifier="Public"
-                 Watermark="Username input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Username input"
+                 UseFloatingPlaceholder="True" />
         <TextBox Name="LastNameTextBox"
                  x:FieldModifier="public"
-                 Watermark="Username input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Username input"
+                 UseFloatingPlaceholder="True" />
         <TextBox Name="PasswordTextBox"
                  x:FieldModifier="protected"
-                 Watermark="Password input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Password input"
+                 UseFloatingPlaceholder="True" />
         <TextBox Name="ConfirmPasswordTextBox"
                  x:FieldModifier="private"
-                 Watermark="Password input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Password input"
+                 UseFloatingPlaceholder="True" />
         <Button Name="SignUpButton"
                 x:FieldModifier="NotPublic"
                 Content="Sign up" />
diff --git a/tests/Avalonia.Generators.Tests/Views/NamedControl.xml b/tests/Avalonia.Generators.Tests/Views/NamedControl.xml
index 0a3c3d3111c..44aa833f3b3 100644
--- a/tests/Avalonia.Generators.Tests/Views/NamedControl.xml
+++ b/tests/Avalonia.Generators.Tests/Views/NamedControl.xml
@@ -3,6 +3,6 @@
         x:Class="Sample.App.NamedControl">
     <TextBox Name="UserNameTextBox"
              AutomationProperties.Name="The user name"
-             Watermark="Username input"
-             UseFloatingWatermark="True" />
+             Placeholder="Username input"
+             UseFloatingPlaceholder="True" />
 </Window>
diff --git a/tests/Avalonia.Generators.Tests/Views/NamedControls.xml b/tests/Avalonia.Generators.Tests/Views/NamedControls.xml
index 6083ec794c1..fb8d7c4c95b 100644
--- a/tests/Avalonia.Generators.Tests/Views/NamedControls.xml
+++ b/tests/Avalonia.Generators.Tests/Views/NamedControls.xml
@@ -3,11 +3,11 @@
         x:Class="Sample.App.NamedControls">
     <StackPanel>
         <TextBox Name="UserNameTextBox"
-                 Watermark="Username input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Username input"
+                 UseFloatingPlaceholder="True" />
         <TextBox Name="PasswordTextBox"
-                 Watermark="Password input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Password input"
+                 UseFloatingPlaceholder="True" />
         <Button Name="SignUpButton"
                 Content="Sign up" />
     </StackPanel>
diff --git a/tests/Avalonia.Generators.Tests/Views/NoNamedControls.xml b/tests/Avalonia.Generators.Tests/Views/NoNamedControls.xml
index 751d1574c87..3e9ba157fb4 100644
--- a/tests/Avalonia.Generators.Tests/Views/NoNamedControls.xml
+++ b/tests/Avalonia.Generators.Tests/Views/NoNamedControls.xml
@@ -1,6 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Sample.App.NoNamedControls">
-    <TextBox Watermark="Username input"
-             UseFloatingWatermark="True" />
+    <TextBox Placeholder="Username input"
+             UseFloatingPlaceholder="True" />
 </Window>
\ No newline at end of file
diff --git a/tests/Avalonia.Generators.Tests/Views/SignUpView.xml b/tests/Avalonia.Generators.Tests/Views/SignUpView.xml
index a482e1fc5e1..128fd0e2609 100644
--- a/tests/Avalonia.Generators.Tests/Views/SignUpView.xml
+++ b/tests/Avalonia.Generators.Tests/Views/SignUpView.xml
@@ -5,15 +5,15 @@
     <StackPanel>
         <controls:CustomTextBox Margin="0 10 0 0"
                                 Name="UserNameTextBox"
-                                Watermark="Please, enter user name..."
-                                UseFloatingWatermark="True" />
+                                Placeholder="Please, enter user name..."
+                                UseFloatingPlaceholder="True" />
         <TextBlock Name="UserNameValidation"
                    Foreground="Red"
                    FontSize="12" />
         <TextBox Margin="0 10 0 0"
                  Name="PasswordTextBox"
-                 Watermark="Please, enter your password..."
-                 UseFloatingWatermark="True"
+                 Placeholder="Please, enter your password..."
+                 UseFloatingPlaceholder="True"
                  PasswordChar="*" />
         <TextBlock Name="PasswordValidation"
                    Foreground="Red"
@@ -27,8 +27,8 @@
         </ListBox>
         <TextBox Margin="0 10 0 0"
                  x:Name="ConfirmPasswordTextBox"
-                 Watermark="Please, confirm the password..."
-                 UseFloatingWatermark="True"
+                 Placeholder="Please, confirm the password..."
+                 UseFloatingPlaceholder="True"
                  PasswordChar="*" />
         <TextBlock x:Name="ConfirmPasswordValidation"
                    TextWrapping="Wrap"
diff --git a/tests/Avalonia.Generators.Tests/Views/xNamedControl.xml b/tests/Avalonia.Generators.Tests/Views/xNamedControl.xml
index 3dc6df2c7d6..09cee5022bb 100644
--- a/tests/Avalonia.Generators.Tests/Views/xNamedControl.xml
+++ b/tests/Avalonia.Generators.Tests/Views/xNamedControl.xml
@@ -3,6 +3,6 @@
         x:Class="Sample.App.xNamedControl">
     <TextBox x:Name="UserNameTextBox"
              AutomationProperties.Name="The user name"
-             Watermark="Username input"
-             UseFloatingWatermark="True" />
+             Placeholder="Username input"
+             UseFloatingPlaceholder="True" />
 </Window>
diff --git a/tests/Avalonia.Generators.Tests/Views/xNamedControls.xml b/tests/Avalonia.Generators.Tests/Views/xNamedControls.xml
index 00eec9b9690..bd9bcccdecc 100644
--- a/tests/Avalonia.Generators.Tests/Views/xNamedControls.xml
+++ b/tests/Avalonia.Generators.Tests/Views/xNamedControls.xml
@@ -3,11 +3,11 @@
         x:Class="Sample.App.xNamedControls">
     <StackPanel>
         <TextBox x:Name="UserNameTextBox"
-                 Watermark="Username input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Username input"
+                 UseFloatingPlaceholder="True" />
         <TextBox x:Name="PasswordTextBox"
-                 Watermark="Password input"
-                 UseFloatingWatermark="True" />
+                 Placeholder="Password input"
+                 UseFloatingPlaceholder="True" />
         <!-- Name generator should still generate members, even if XAML is invalid -->
         <Button x:Name="SignUpButton"
                 Content="{x:Static NonExistent.Member}" />
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index 0cb587f849b..25ba7a29c0e 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -71,14 +71,14 @@ public void MultiBinding_TemplatedParent_Works()
 <Window xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Data;assembly=Avalonia.Markup.Xaml.UnitTests'>
-    <TextBox Name='textBox' Text='Foo' Watermark='Bar'>
+    <TextBox Name='textBox' Text='Foo' Placeholder='Bar'>
         <TextBox.Template>
             <ControlTemplate>
                 <TextPresenter Name='PART_TextPresenter'>
                     <TextPresenter.Text>
                         <MultiBinding Converter='{x:Static local:ConcatConverter.Instance}'>
                             <Binding RelativeSource='{RelativeSource TemplatedParent}' Path='Text'/>
-                            <Binding RelativeSource='{RelativeSource TemplatedParent}' Path='Watermark'/>
+                            <Binding RelativeSource='{RelativeSource TemplatedParent}' Path='Placeholder'/>
                         </MultiBinding>
                     </TextPresenter.Text>
                 </TextPresenter>
diff --git a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
index 85cec975e36..435deba518e 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
@@ -6,11 +6,7 @@
 using Avalonia.Media;
 using Xunit;
 
-#if AVALONIA_SKIA
 namespace Avalonia.Skia.RenderTests
-#else
-namespace Avalonia.Direct2D1.RenderTests.Controls
-#endif
 {
     public class TextBoxTests : TestBase
     {
@@ -33,11 +29,11 @@ private static IControlTemplate CreateTextBoxTemplate()
 
                 var panel = new Panel();
 
-                var watermark = new TextBlock
+                var placeholder = new TextBlock
                 {
-                    Name = "PART_Watermark",
-                    [!TextBlock.TextProperty] = textBox[!TextBox.WatermarkProperty],
-                    [!TextBlock.ForegroundProperty] = textBox[!TextBox.WatermarkForegroundProperty],
+                    Name = "PART_Placeholder",
+                    [!TextBlock.TextProperty] = textBox[!TextBox.PlaceholderProperty],
+                    [!TextBlock.ForegroundProperty] = textBox[!TextBox.PlaceholderForegroundProperty],
                     FontFamily = textBox.FontFamily,
                     FontSize = textBox.FontSize,
                     VerticalAlignment = VerticalAlignment.Center,
@@ -53,7 +49,7 @@ private static IControlTemplate CreateTextBoxTemplate()
                     FontSize = textBox.FontSize,
                 }.RegisterInNameScope(scope);
 
-                panel.Children.Add(watermark);
+                panel.Children.Add(placeholder);
                 panel.Children.Add(presenter);
                 border.Child = panel;
 
@@ -62,7 +58,7 @@ private static IControlTemplate CreateTextBoxTemplate()
         }
 
         [Fact]
-        public async Task Watermark_With_Red_Foreground()
+        public async Task Placeholder_With_Red_Foreground()
         {
             var target = new Border
             {
@@ -76,8 +72,8 @@ public async Task Watermark_With_Red_Foreground()
                     FontFamily = TestFontFamily,
                     FontSize = 12,
                     Background = Brushes.White,
-                    Watermark = "Red watermark",
-                    WatermarkForeground = Brushes.Red,
+                    Placeholder = "Red placeholder",
+                    PlaceholderForeground = Brushes.Red,
                 }
             };
 
@@ -86,7 +82,7 @@ public async Task Watermark_With_Red_Foreground()
         }
 
         [Fact]
-        public async Task Watermark_With_Blue_Foreground()
+        public async Task Placeholder_With_Blue_Foreground()
         {
             var target = new Border
             {
@@ -100,8 +96,8 @@ public async Task Watermark_With_Blue_Foreground()
                     FontFamily = TestFontFamily,
                     FontSize = 12,
                     Background = Brushes.White,
-                    Watermark = "Blue watermark",
-                    WatermarkForeground = Brushes.Blue,
+                    Placeholder = "Blue placeholder",
+                    PlaceholderForeground = Brushes.Blue,
                 }
             };
 
@@ -110,7 +106,7 @@ public async Task Watermark_With_Blue_Foreground()
         }
 
         [Fact]
-        public async Task Watermark_With_Default_Foreground()
+        public async Task Placeholder_With_Default_Foreground()
         {
             var target = new Border
             {
@@ -124,8 +120,8 @@ public async Task Watermark_With_Default_Foreground()
                     FontFamily = TestFontFamily,
                     FontSize = 12,
                     Background = Brushes.White,
-                    Watermark = "Default watermark",
-                    WatermarkForeground = Brushes.Gray,
+                    Placeholder = "Default placeholder",
+                    PlaceholderForeground = Brushes.Gray,
                 }
             };
 
diff --git a/tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Blue_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Blue_Foreground.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2262f7e523fdb153a27ccdd4e943fc054ebea60
GIT binary patch
literal 1645
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
A)Bpeg

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Default_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Default_Foreground.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..770ff257b496a2b871983262dd41b702db8c9509
GIT binary patch
literal 2059
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

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Red_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Placeholder_With_Red_Foreground.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d2bc5d78bad5d64dba1c06ee86635d53535c4dd
GIT binary patch
literal 1587
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

literal 0
HcmV?d00001

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Blue_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Blue_Foreground.expected.png
deleted file mode 100644
index b0c2e6a9e3ed6bda273f54a257548322f04d9962..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1423
zcmaKsYdjMQ7{=#zTtdj@AeUTHN1YrD&9uhCa4^R$k%|y=+-A*Xh|0*O$w+cp9Fj{^
zW+Kw2VVopnlQMJpm0L5WGnXCbLm$qEbKc+Yd7lr@`+j)7{Bu0rofPD><NyGG0^Awq
zwdZ|%GMD*bZ)+k7IeR9VU=R0}*_%|EP#gdt<p_sCy)pNfrzTy!gMMW2RtIMf4bf%d
z=>sFrmMWEDf2bjX9HG{TVQle^l=>8ky3%xuVDG8qs1HLZBd(vFCA(QLk@w`Q+;o_%
z)n3~4p&*O$CmQK`w^`Y&D2PQ<_;UEN=IBCFc{VO@0P;=@x6LfnH&Ap@QkFKx;j&a<
zbf~PsOr@l9+}#7KvW$E^ku4E7n30<+x3Ei<EpRq85IN<@@BY*RJNO@eo|!lsqje|;
zbH+ePaWX#a@L&Z*C%gnJ6js*n%j_v3gbMC@W?rYoin@+(rJBX)HUvny7PBc85Dv=%
z!~el5I&*EUPCh9)Rk*%-wNrqmCLJK?mVI^(%a<kj+u02d1M2-8pknKrw7>WioeMqU
z6CE0BYc)3PD>F&4oJ_l1d0?GNJ#|9Y)s<Y=pXTB^#jvzI?WNM-e{qql)R_|Qr<L)i
zJBBCz0O8-JsD3=Y&DspGxza<>p=?i!6&AjHb>r)-tg0GRAJEwNl_T+Orx|^GcAm|P
z`4sShDD$B`#E;&4i`;CM1_lC~ktMA=Jj2k-J>!kTBbQp9J(~cmZCRsG6H#s+*?N%I
z1O|V4C1|3P#TE$^*7(w&7RdqU$c+jE150+KI_o-ka<CriszXQ>$;Y*b4ykEX``E1)
zC=#lbL)zxbb!}3{LEg!rz~_>Qi7Ntev4@SVXb@<c<6ycB-v6k+k(;`UECbq3f`oHS
zG+~0*a?%S;A)Rg6!0<-LpqGtD-%t8jXtgdcFMIk(CCpFkvIDebA|sLArn+yQzK`WS
zcu_Mr*n@QdTGPhr(Inq^w+eU=)V)kA@Z(bks6W&a$ij7}v^A!b<3C1?Q}db3tP{aV
z@pJwWRY`uuiR<eq?cRNIOYLuubf#W`KTmBRDjgY_7DStBV!L>~cZg!y`$d}X21v~b
zCg5brbCj2xtK+&<ZqCu4Z$?k<BCU`17jW4?8&qEt+8leBq_3tX*r#{{N#}2Ii~S81
z8n;UCO>acm#9c~_mdrwP^;I(!w2|wI+0wQi;U-|L+~f1CWFvFoL$H?tPgM=yg<T0u
zfp~cxLu?6=O+^vl7D=tT4(+DEYa5HCgXy&D7`|}l_MMRKVG8A&><qu>ad6gRSy>kI
zTE>u`U|Bm@zNc~u7!{MfvvmkKHm`p2B&GW~dtTa!a5~=n{;4wmjvV@(`(UAf>}Mdt
z*;^4YuOl_4r=iresirhz<GA3PZm+86^@%d;f`Fmm;Fz{#ZvRlL3b~e1P({8N8;l_0
z9}NvzJ-A6jZvo4fkhbZ*MI`;CBrAJ{ijnG*xoV?QX_x^m|4m;rgFxU+nrL}|c{6cv
zc#HNyX~ma#ZQ4SD`Nm<CR1ThC;=v9vi%3jvI7Urme)-}|2d!`!Xuq0<!Fd@xK6XCO
z?kd-@V=ZG$5ESHVzt?Yo$xS~+EDF2qwv=%9L*OEY#iDdY730}HKI83c{A|67dvcR)
zwDyE?G3LP1@1rno+>7uWIycf#sd=swT)OGw%O)MMNZ9@bF5YQF(6LotJ$gVT2Xo#M
zB<zY9<tL}q3Q{E`(C)>%yKgHje&hA6yHv+`F#Ud2;XG==p3)wxE%>y0$|MilfvTAy
zmeigw&9ylK{a=!Nk7cnMt|FLIm}$kr=a?j1-WlVff6?k6>U_Tyi6JE38_|1Rw)Y4N
NfS+-PHQ8Ut{2Q4KxUm2L

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Default_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Default_Foreground.expected.png
deleted file mode 100644
index 5957ca66760cca816a82916d12277a58fe07eb8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1884
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
WA(+f{WK$U!mk_MGuNxC{HSaf%T%7~}

diff --git a/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Red_Foreground.expected.png b/tests/TestFiles/Skia/Controls/TextBox/Watermark_With_Red_Foreground.expected.png
deleted file mode 100644
index eb12e520220cd6114160969c9986228e5336f408..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1452
zcmZ`(X)v1!0R7@~6^W|*jHSv_cSY+=EkjmmN?K8AWh6#BNK`6Obu_E$j-!sD4cgTk
zQCe4&^m4|vx^=`=Lh5Q9Tf#clkNvT;v-@V=d-G=A`}<PS-tJHt4H*CcpePSlp9AkW
zpp~@bfvTU&`*L976c-dm`T()g#1sIKAfQ}NW1{abkMlg0$Xb#s?RDR=MX1>rtc?l5
z(zFAnru|h~d+A|1Ea7y58%lLt;`F)e3K+FimGNP>3remiC8c1UHEh9Ex8mFo0d2J*
zZ2lWNF_f`-)5*5he!Z7VTZo&B3&C1+)f|`AJMu~EiR|H`9;L$ypoHrOBt*dyjdYd!
zJK{+Vk_H9_*1oAJpm&MG)iE7}E)}M?W?n;CA5!xCcm1Dh0l2oPx-y$Sc%G{Rf=Kt|
z!Sfvr&!oy9iW!+p8Jp0HHK>0)yAm!znk<P_uk-)hI<Pv*qu;Y-R=Ko!IqKTjaB>Zh
zkya}^r_dJ=l}TRgDzmcZUGv6#IAO6K`-5qKB#{WbxBwCKLIPXG(p4z|zKZ?*z;P_V
z7l7*msg2O^V9xaP9uD5MDMV7N(bx{g-W;?#T+;#}=@2isG}cL}uZwJ&TLnz~*2aL9
z1!Z(VcO2Yds%d8jSvlDPVFj*7Z*6gYdxRtVbKWO&9(!@R3z0P2?7N^SmXof^d6(4O
z7PWY5J4V;8xb%`4#nCx_C8qgu3GIqBwpP-^iy6CYYKjcdL}SDo#&dSaol0l=tUbu)
zh1ag(5QxZa8?sLSr2Kuy?%t%;-uUmv&RLldnsD@Kq<0x%=y%B35`f8E8jgy>1qSvB
z=jU;L{_4Zdb{ZZYKoDWX-%%&NO=R7lB+KcL=HXgl&2in~1s^Gw*lkUUiX$-mJ@>4J
z{d|)h+vx2)-|~p>J3E~N6%`qRl+;7<<C&RZck>@boIF~iz#p-urWL5*|D;Na%?z?C
z1L#mq(VN=4i)m@m0&XW{V|k{I4w-r{wSFTvw_#~n!YQ6VE*dnXYOo4<2r}%|Sx?aH
zviP0kkv0JV&1P?H(V$Qy$*ek5wKYIRxNzeJ9pMD84({eRAxL~9A75~30-C{y%<JNw
z7y^OBM9#pkVfHz^o(K#EXwRbLskpnUWPfm_HjARE@fo!0(Tm=p-^OKMMKv~rh5kt~
z&MDS#(go~MA%>t2j?0dWjh(`Jc`Xh1^w24pj61FCh!ZQMgzf8J5#5DSfpE=kc7ltT
z1<lM^UY^G?#Iy?+!Jj?puS1n#$!;o#OXWRKkls?M=P%TApBj-&%;uV79+sDL^5m-b
zH%v@3wNDu&F&{rqYwzlw(Q0Yd8fL4WjLsf>;90n&Jv1vOBXjGgWS9C>2CQWwp>hup
zjXX0vcE`6J&Cmu(<I~c<XuR+uanx;3Zkh_-+yFL(pra$MKE?(fWN#Pk9!{2bNF;`U
z!b!@Buk(<JH?=gKtmJksSMJR0C~xanB`eFfAVbbcALDm+!r4+mv{S^~q%}5bWol?P
zlKuSnti<I{gd>Vz1s0-pN^Go=K)#*ds#l}%p-(WANIb6`A+o3@NWojo1LrpQMErhy
z@6eme)X079*VWnNo9|GlFIJ9BPgWs0WsHO$(8KS>Fo=MAO{#p$$cTfm$a-w9bYC#L
zTIqB3N1nmam94ikFKNqr=lC@0f~9t!vtDp8L<$Djk^n<*3%*rtg@rfMPPqzoMPI+b
z=A>FIZ>lUfli|HP{8kRSdjHt&?pt0)<~81#A$`Wn!TKj5;)g!Y7CSg^%G$89ZZrKJ
z><zIM-Q1EUHf$Gj{Cl=0gHpLcGASu^F}<L&TPbQrx_XlT9q|XJu&r;mmY^K$Uod-J
iL9aIdG4}t;D{##t9HNg=^yh>71yF9@u2nAhU;YBY!kX;>


From d4e86e9331ba6526291bd20655d83fb21225c274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Fri, 30 Jan 2026 19:15:51 +0100
Subject: [PATCH 08/11] Pending changes

---
 samples/BindingDemo/MainWindow.xaml           | 42 ++++-----
 .../Pages/AutoCompleteBoxPage.xaml            |  8 +-
 .../Pages/CalendarDatePickerPage.xaml         | 18 ++--
 .../ControlCatalog/Pages/ClipboardPage.xaml   |  4 +-
 samples/ControlCatalog/Pages/DialogsPage.xaml | 12 +--
 .../Pages/NumericUpDownPage.xaml              | 20 ++--
 samples/ControlCatalog/Pages/TextBoxPage.xaml | 42 ++++-----
 samples/ControlCatalog/Pages/ThemePage.axaml  |  6 +-
 .../Controls/SignUpView.xaml                  | 14 +--
 .../Pages/ScreensPage.axaml                   | 14 +--
 .../Pages/WindowDecorationsPage.axaml         |  2 +-
 .../IntegrationTestApp/Pages/WindowPage.axaml |  2 +-
 samples/SafeAreaDemo/Views/MainView.xaml      |  4 +-
 samples/SingleProjectSandbox/MainView.axaml   |  8 +-
 .../AutoCompleteBox.Properties.cs             | 26 +++---
 .../CalendarDatePicker.Properties.cs          | 54 +++++------
 .../CalendarDatePicker/CalendarDatePicker.cs  | 14 +--
 .../NumericUpDown/NumericUpDown.cs            | 36 ++++----
 src/Avalonia.Controls/TextBox.cs              | 62 ++++++-------
 .../Controls/AutoCompleteBox.xaml             | 12 +--
 .../Controls/CalendarDatePicker.xaml          |  6 +-
 .../Controls/ComboBox.xaml                    |  6 +-
 .../Controls/ManagedFileChooser.xaml          |  8 +-
 .../Controls/NumericUpDown.xaml               | 24 ++---
 .../Controls/TextBox.xaml                     | 16 ++--
 .../Controls/AutoCompleteBox.xaml             |  4 +-
 .../Controls/CalendarDatePicker.xaml          |  4 +-
 .../Controls/ManagedFileChooser.xaml          |  4 +-
 .../Controls/NumericUpDown.xaml               |  2 +-
 .../Controls/TextBox.xaml                     | 10 +-
 .../AutoCompleteBoxTests.cs                   | 16 ++--
 .../CalendarDatePickerTests.cs                |  6 +-
 .../NumericUpDownTests.cs                     | 20 ++--
 .../TextBoxTests.cs                           | 92 +++++++++----------
 .../Data/BindingTests.cs                      |  4 +-
 .../Controls/TextBoxTests.cs                  |  8 +-
 36 files changed, 315 insertions(+), 315 deletions(-)

diff --git a/samples/BindingDemo/MainWindow.xaml b/samples/BindingDemo/MainWindow.xaml
index d0a938ea836..7fc9014b8ba 100644
--- a/samples/BindingDemo/MainWindow.xaml
+++ b/samples/BindingDemo/MainWindow.xaml
@@ -1,7 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="BindingDemo.MainWindow"
-        xmlns:vm="using:BindingDemo.ViewModels" 
+        xmlns:vm="using:BindingDemo.ViewModels"
         xmlns:local="using:BindingDemo"
         xmlns:system="clr-namespace:System;assembly=System.Runtime"
         Title="AvaloniaUI Bindings Test"
@@ -13,29 +13,29 @@
       <Setter Property="FontSize" Value="18"/>
     </Style>
   </Window.Styles>
-  
+
   <TabControl>
     <TabItem Header="Basic">
       <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal">
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Simple Bindings"/>
-            <TextBox Placeholder="Two Way" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue}" Name="first"/>
-            <TextBox Placeholder="Two Way (LostFocus)" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, UpdateSourceTrigger=LostFocus}"/>
-            <TextBox Placeholder="One Way" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
-            <TextBox Placeholder="One Time" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
+            <TextBox PlaceholderText="Two Way" UseFloatingPlaceholderText="True" Text="{Binding Path=StringValue}" Name="first"/>
+            <TextBox PlaceholderText="Two Way (LostFocus)" UseFloatingPlaceholderText="True" Text="{Binding Path=StringValue, UpdateSourceTrigger=LostFocus}"/>
+            <TextBox PlaceholderText="One Way" UseFloatingPlaceholderText="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
+            <TextBox PlaceholderText="One Time" UseFloatingPlaceholderText="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
             <!-- Removed due to #2983: reinstate when that's fixed.
               <TextBox Placeholder="One Way to Source" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneWayToSource}"/>
             -->
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Collection Bindings"/>
-            <TextBox Placeholder="Items[1].Value" UseFloatingPlaceholder="True" Text="{Binding Path=Items[1].Value}"/>
+            <TextBox PlaceholderText="Items[1].Value" UseFloatingPlaceholderText="True" Text="{Binding Path=Items[1].Value}"/>
             <Button Command="{Binding ShuffleItems}">Shuffle</Button>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Negated Bindings"/>
-            <TextBox Placeholder="Boolean String" UseFloatingPlaceholder="True" Text="{Binding Path=BooleanString}"/>
+            <TextBox PlaceholderText="Boolean String" UseFloatingPlaceholderText="True" Text="{Binding Path=BooleanString}"/>
             <CheckBox IsChecked="{Binding !BooleanString}">!BooleanString</CheckBox>
             <CheckBox IsChecked="{Binding !!BooleanString}">!!BooleanString</CheckBox>
           </StackPanel>
@@ -43,24 +43,24 @@
         <StackPanel Orientation="Horizontal">
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
             <TextBlock FontSize="16" Text="Numeric Bindings"/>
-            <TextBox Placeholder="Double" UseFloatingPlaceholder="True" Text="{Binding Path=DoubleValue, Mode=TwoWay}"/>
+            <TextBox PlaceholderText="Double" UseFloatingPlaceholderText="True" Text="{Binding Path=DoubleValue, Mode=TwoWay}"/>
             <TextBlock Text="{Binding Path=DoubleValue}"/>
             <ProgressBar Maximum="10" Value="{Binding DoubleValue}"/>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
             <TextBlock FontSize="16" Text="Binding Sources"/>
-            <TextBox Placeholder="Value of first TextBox" UseFloatingPlaceholder="True" 
+            <TextBox PlaceholderText="Value of first TextBox" UseFloatingPlaceholderText="True"
                      Text="{Binding #first.Text, Mode=TwoWay}"/>
-            <TextBox Placeholder="Value of SharedItem.StringValue" UseFloatingPlaceholder="True"
+            <TextBox PlaceholderText="Value of SharedItem.StringValue" UseFloatingPlaceholderText="True"
                      Text="{Binding Value, Source={StaticResource SharedItem}, Mode=TwoWay, DataType={x:Type vm:MainWindowViewModel+TestItem, x:TypeArguments=x:String}}"/>
-            <TextBox Placeholder="Value of SharedItem.StringValue (duplicate)" UseFloatingPlaceholder="True"
+            <TextBox PlaceholderText="Value of SharedItem.StringValue (duplicate)" UseFloatingPlaceholderText="True"
                      Text="{Binding Value, Source={StaticResource SharedItem}, Mode=TwoWay, DataType={x:Type vm:MainWindowViewModel+TestItem, x:TypeArguments=x:String}}"/>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
             <TextBlock FontSize="16" Text="Scheduler"/>
-            <TextBox Placeholder="Background Thread" Text="{Binding CurrentTime, Mode=OneWay}"/>
+            <TextBox PlaceholderText="Background Thread" Text="{Binding CurrentTime, Mode=OneWay}"/>
             <TextBlock FontSize="16" Text="Stream Operator"/>
-            <TextBox Placeholder="StreamOperator" Text="{CompiledBinding CurrentTimeObservable^, Mode=OneWay}"/>
+            <TextBox PlaceholderText="StreamOperator" Text="{CompiledBinding CurrentTimeObservable^, Mode=OneWay}"/>
           </StackPanel>
         </StackPanel>
       </StackPanel>
@@ -91,19 +91,19 @@
     </TabItem>
     <TabItem Header="Property Validation">
       <StackPanel Orientation="Horizontal">
-        <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding ExceptionDataValidation}">
+         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding ExceptionDataValidation}">
           <TextBlock FontSize="16" Text="Exception Validation"/>
-          <TextBox Placeholder="Less Than 10" UseFloatingPlaceholder="True" Text="{Binding Path=LessThan10}"/>
+          <TextBox PlaceholderText="Less Than 10" UseFloatingPlaceholderText="True" Text="{Binding Path=LessThan10}"/>
         </StackPanel>
         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding IndeiDataValidation}">
           <TextBlock FontSize="16" Text="INotifyDataErrorInfo Validation"/>
-          <TextBox Placeholder="Maximum" UseFloatingPlaceholder="True" Text="{Binding Path=Maximum}"/>
-          <TextBox Placeholder="Value" UseFloatingPlaceholder="True" Text="{Binding Path=Value}"/>
+            <TextBox PlaceholderText="Maximum" UseFloatingPlaceholderText="True" Text="{Binding Path=Maximum}"/>
+            <TextBox PlaceholderText="Value" UseFloatingPlaceholderText="True" Text="{Binding Path=Value}"/>
         </StackPanel>
-        <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding DataAnnotationsValidation}">
+         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding DataAnnotationsValidation}">
           <TextBlock FontSize="16" Text="Data Annotations Validation"/>
-          <TextBox Placeholder="Phone #" UseFloatingPlaceholder="True" Text="{Binding PhoneNumber}"/>
-          <TextBox Placeholder="Less Than 10" UseFloatingPlaceholder="True" Text="{Binding Path=LessThan10}"/>
+          <TextBox PlaceholderText="Phone #" UseFloatingPlaceholderText="True" Text="{Binding PhoneNumber}"/>
+          <TextBox PlaceholderText="Less Than 10" UseFloatingPlaceholderText="True" Text="{Binding Path=LessThan10}"/>
         </StackPanel>
       </StackPanel>
     </TabItem>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index 487b638a1f8..35e917f9961 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -39,12 +39,12 @@
         <AutoCompleteBox MaxDropDownHeight="60" />
       </StackPanel>
       <StackPanel>
-        <TextBlock Text="Placeholder" />
-        <AutoCompleteBox Placeholder="Hello World" />
+        <TextBlock Text="PlaceholderText" />
+        <AutoCompleteBox PlaceholderText="Hello World" />
       </StackPanel>
       <StackPanel>
-        <TextBlock Text="Placeholder with custom color" />
-        <AutoCompleteBox Placeholder="Search here..." PlaceholderForeground="Green" />
+        <TextBlock Text="PlaceholderText with custom color" />
+        <AutoCompleteBox PlaceholderText="Search here..." PlaceholderForeground="Green" />
       </StackPanel>
       <StackPanel>
         <TextBlock Text="Disabled" />
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index c6b7e3910d0..2975255e8b2 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -5,7 +5,7 @@
              x:Class="ControlCatalog.Pages.CalendarDatePickerPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A control for selecting dates with a calendar drop-down</TextBlock>
-        
+
     <StackPanel Orientation="Horizontal"
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
@@ -32,24 +32,24 @@
                     Margin="0,0,0,8"/>
 
         <CalendarDatePicker Margin="0,0,0,8"
-                    Placeholder="Placeholder"/>
+                    PlaceholderText="Placeholder"/>
         <CalendarDatePicker Margin="0,0,0,8"
                     Name="DatePicker5"
-                    Placeholder="Floating Placeholder"
-                    UseFloatingPlaceholder="True"/>
+                    PlaceholderText="Floating Placeholder"
+                    UseFloatingPlaceholderText="True"/>
 
-        <TextBlock Text="Placeholder with custom color"/>
+        <TextBlock Text="PlaceholderText with custom color"/>
         <CalendarDatePicker Margin="0,0,0,8"
-                    Placeholder="Select a date"
+                    PlaceholderText="Select a date"
                     PlaceholderForeground="Purple"/>
-                
+
         <TextBlock Text="Disabled"/>
         <CalendarDatePicker IsEnabled="False"/>
-        
+
         <TextBlock Text="Validation Example"/>
         <CalendarDatePicker SelectedDate="{CompiledBinding ValidatedDateExample, Mode=TwoWay}"/>
       </StackPanel>
 
-    </StackPanel> 
+    </StackPanel>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 99bc527abf8..864a520aca8 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ControlCatalog.Pages.ClipboardPage"
+<UserControl x:Class="ControlCatalog.Pages.ClipboardPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <StackPanel Orientation="Vertical" Spacing="4">
@@ -21,7 +21,7 @@
     <TextBox x:Name="ClipboardContent"
              MinHeight="100"
              AcceptsReturn="True"
-             Placeholder="Text to copy of file names per line" />
+             PlaceholderText="Text to copy of file names per line" />
     <Viewbox Width="420" Height="360">
       <Image x:Name="ClipboardImage"
       />
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 9b93ece1b56..f32cc601ab7 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -58,17 +58,17 @@
         <Button Name="OpenBoth">Select _Both</Button>
       </StackPanel>
     </Expander>
-    
+
     <Expander Header="Launcher dialogs">
       <StackPanel Spacing="4">
-        <TextBox Name="UriToLaunch" Placeholder="Uri to launch" Text="https://avaloniaui.net/" />
+        <TextBox Name="UriToLaunch" PlaceholderText="Uri to launch" Text="https://avaloniaui.net/" />
         <Button Name="LaunchUri">Launch Uri</Button>
         <Button Name="LaunchFile">Launch File</Button>
         <TextBlock Name="LaunchStatus" />
       </StackPanel>
     </Expander>
 
-    <AutoCompleteBox x:Name="CurrentFolderBox" Placeholder="Write full path/uri or well known folder name">
+    <AutoCompleteBox x:Name="CurrentFolderBox" PlaceholderText="Write full path/uri or well known folder name">
       <AutoCompleteBox.ItemsSource>
         <generic:List x:TypeArguments="storage:WellKnownFolder">
           <storage:WellKnownFolder>Desktop</storage:WellKnownFolder>
@@ -80,17 +80,17 @@
         </generic:List>
       </AutoCompleteBox.ItemsSource>
     </AutoCompleteBox>
-    
+
     <TextBlock x:Name="PickerLastResultsVisible"
                Classes="h2"
                IsVisible="False"
                Text="Last picker results:" />
     <ItemsControl x:Name="PickerLastResults" />
 
-    <TextBox Name="BookmarkContainer" Placeholder="Bookmark" />
+    <TextBox Name="BookmarkContainer" PlaceholderText="Bookmark" />
     <TextBox Name="OpenedFileContent"
              MaxLines="10"
-             Placeholder="Picked file content" />
+             PlaceholderText="Picked file content" />
 
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index fbce9ec3e14..a112f79c02c 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:sys="using:System"
              xmlns:converter="using:ControlCatalog.Converter"
@@ -48,8 +48,8 @@
         <ComboBox x:Name="CultureSelector" Grid.Row="2" Grid.Column="1" ItemsSource="{Binding Cultures}"
                   VerticalAlignment="Center" Margin="2"/>
 
-        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">Placeholder:</TextBlock>
-        <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #upDown.Placeholder}" VerticalAlignment="Center" Margin="2" />
+        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">PlaceholderText:</TextBlock>
+        <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #upDown.PlaceholderText}" VerticalAlignment="Center" Margin="2" />
 
         <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">Text:</TextBlock>
         <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding #upDown.Text}" VerticalAlignment="Center" Margin="2" />
@@ -81,23 +81,23 @@
         <NumericUpDown Name="upDown" Minimum="0" Maximum="10" Increment="0.5"
                        NumberFormat="{Binding #CultureSelector.SelectedItem, Converter={x:Static pages:NumericUpDownPage.CultureConverter}}"
                        VerticalAlignment="Center" Value="{Binding DecimalValue}"
-                       Placeholder="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+                       PlaceholderText="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
       </StackPanel>
 
       <StackPanel Orientation="Vertical" Margin="10">
         <Label Target="DoubleUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of double NumericUpDown:</Label>
         <NumericUpDown Name="DoubleUpDown" Minimum="0" Maximum="10" Increment="0.5"
                        VerticalAlignment="Center" Value="{Binding DoubleValue}"
-                       Placeholder="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+                       PlaceholderText="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
       </StackPanel>
-      
+
       <StackPanel Orientation="Vertical" Margin="10">
         <Label Target="ValidationUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">NumericUpDown with Validation Errors:</Label>
         <NumericUpDown x:Name="ValidationUpDown" Minimum="0" Maximum="10" Increment="0.5"
                        VerticalAlignment="Center"
-                       Placeholder="Enter text" FormatString="{Binding SelectedFormat.Value}">
+                       PlaceholderText="Enter text" FormatString="{Binding SelectedFormat.Value}">
           <DataValidationErrors.Error>
-            <sys:Exception /> 
+            <sys:Exception />
           </DataValidationErrors.Error>
         </NumericUpDown>
       </StackPanel>
@@ -110,7 +110,7 @@
             <converter:HexConverter></converter:HexConverter>
           </NumericUpDown.TextConverter>
         </NumericUpDown>
-        
+
       </StackPanel>
     </WrapPanel>
 
@@ -118,7 +118,7 @@
       <Label FontSize="14" FontWeight="Bold" Target="PlaceholderForegroundUpDown"
              Content="Placeholder with custom foreground color:"/>
       <NumericUpDown x:Name="PlaceholderForegroundUpDown"
-                     Placeholder="Enter amount"
+                     PlaceholderText="Enter amount"
                      PlaceholderForeground="Orange"/>
     </StackPanel>
 
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index bb2bb39f1d0..7ae755c5944 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -17,41 +17,41 @@
             </Flyout>
           </TextBox.ContextFlyout>
         </TextBox>
-        <TextBox Width="200" Placeholder="ReadOnly" IsReadOnly="True" Text="This is read only"/>
-        <TextBox Width="200" Placeholder="Numeric with placeholder" TextInputOptions.ContentType="Number" />
+        <TextBox Width="200" PlaceholderText="ReadOnly" IsReadOnly="True" Text="This is read only"/>
+        <TextBox Width="200" PlaceholderText="Numeric with placeholder" TextInputOptions.ContentType="Number" />
         <TextBox Width="200"
-                 Placeholder="Floating Placeholder"
-                 UseFloatingPlaceholder="True"
+                 PlaceholderText="Floating Placeholder"
+                 UseFloatingPlaceholderText="True"
                  Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
         <TextBox Width="200"
-                 Placeholder="Custom Placeholder Color"
+                 PlaceholderText="Custom Placeholder Color"
                  PlaceholderForeground="Red"/>
         <TextBox Width="200"
-                 Placeholder="Floating Placeholder Color"
-                 UseFloatingPlaceholder="True"
+                 PlaceholderText="Floating Placeholder Color"
+                 UseFloatingPlaceholderText="True"
                  PlaceholderForeground="Purple"/>
         <MaskedTextBox Width="200" ResetOnSpace="False"  Mask="(LLL) 999-0000"/>
-        
+
         <TextBox Width="200" Text="Validation Error">
           <DataValidationErrors.Error>
-            <sys:Exception /> 
+            <sys:Exception />
           </DataValidationErrors.Error>
         </TextBox>
 
         <TextBox Width="200"
-                 Placeholder="Password Box"
+                 PlaceholderText="Password Box"
                  Classes="revealPasswordButton"
                  TextInputOptions.ContentType="Password"
-                 UseFloatingPlaceholder="True"
+                 UseFloatingPlaceholderText="True"
                  PasswordChar="*"
                  Text="Password" />
-        <TextBox Width="200" Placeholder="Suggestions are hidden" TextInputOptions.ShowSuggestions="False" />
+        <TextBox Width="200" PlaceholderText="Suggestions are hidden" TextInputOptions.ShowSuggestions="False" />
         <TextBox Width="200" Text="Left aligned text" TextAlignment="Left" AcceptsTab="True" />
         <TextBox Width="200" Text="Center aligned text" TextAlignment="Center" />
         <TextBox Width="200" Text="Right aligned text" TextAlignment="Right" />
         <TextBox Width="200" Text="Custom selection brush"
-                  SelectionStart="5" SelectionEnd="22"
-                  SelectionBrush="Green" SelectionForegroundBrush="Yellow" ClearSelectionOnLostFocus="False"/>
+                 SelectionStart="5" SelectionEnd="22"
+                 SelectionBrush="Green" SelectionForegroundBrush="Yellow" ClearSelectionOnLostFocus="False"/>
         <TextBox Width="200" Text="Custom caret brush" CaretBrush="DarkOrange"/>
       </StackPanel>
 
@@ -61,11 +61,11 @@
         <TextBox AcceptsReturn="True" Width="200" Height="125"
                  Text="Multiline TextBox with no TextWrapping.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
 
-        <TextBox Classes="clearButton" Text="Clear Content" Width="200" FontWeight="Normal" FontStyle="Normal" Placeholder="Placeholder" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+        <TextBox Classes="clearButton" Text="Clear Content" Width="200" FontWeight="Normal" FontStyle="Normal" PlaceholderText="Placeholder" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
         <TextBox Text="IME small font" Width="200"
-         FontFamily="Comic Sans MS"
-         FontSize="10"
-         Foreground="Red"/>
+                 FontFamily="Comic Sans MS"
+                 FontSize="10"
+                 Foreground="Red"/>
         <TextBox Text="IME large font" Width="200"
                  FontFamily="Comic Sans MS"
                  FontSize="22"
@@ -74,9 +74,9 @@
                  FontFamily="Comic Sans MS"
                  InputMethod.IsInputMethodEnabled="False"
                  Foreground="Red"/>
-        <TextBox AcceptsReturn="True" 
-                 TextWrapping="Wrap" 
-                 Width="200" 
+        <TextBox AcceptsReturn="True"
+                 TextWrapping="Wrap"
+                 Width="200"
                  Height="125"
                  LineHeight="32"
                  Text="Multiline TextBox with TextWrapping and increased LineHeight.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
diff --git a/samples/ControlCatalog/Pages/ThemePage.axaml b/samples/ControlCatalog/Pages/ThemePage.axaml
index db6025ea4af..7eb95471a05 100644
--- a/samples/ControlCatalog/Pages/ThemePage.axaml
+++ b/samples/ControlCatalog/Pages/ThemePage.axaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ControlCatalog.Pages.ThemePage"
+<UserControl x:Class="ControlCatalog.Pages.ThemePage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -70,8 +70,8 @@
         </ComboBox>
         <TextBlock Grid.Column="0" Grid.Row="2" Text="Username:" VerticalAlignment="Center" />
         <TextBlock Grid.Column="0" Grid.Row="4" Text="Password:" VerticalAlignment="Center" />
-        <TextBox Grid.Column="1" Grid.Row="2" Placeholder="Input here" HorizontalAlignment="Stretch" />
-        <TextBox Grid.Column="1" Grid.Row="4" Placeholder="Input here" HorizontalAlignment="Stretch" />
+        <TextBox Grid.Column="1" Grid.Row="2" PlaceholderText="Input here" HorizontalAlignment="Stretch" />
+        <TextBox Grid.Column="1" Grid.Row="4" PlaceholderText="Input here" HorizontalAlignment="Stretch" />
         <Button Grid.Column="1" Grid.Row="6" Content="Login" HorizontalAlignment="Stretch" />
       </Grid>
     </Border>
diff --git a/samples/Generators.Sandbox/Controls/SignUpView.xaml b/samples/Generators.Sandbox/Controls/SignUpView.xaml
index 3004bb7a15e..5bcb16ee53c 100644
--- a/samples/Generators.Sandbox/Controls/SignUpView.xaml
+++ b/samples/Generators.Sandbox/Controls/SignUpView.xaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:Generators.Sandbox.Controls"
         xmlns:vm="clr-namespace:Generators.Sandbox.ViewModels"
@@ -17,8 +17,8 @@
         <controls:CustomTextBox Margin="0 10 0 0"
                  x:Name="UserNameTextBox"
                  Text="{Binding UserName}"
-                 Placeholder="Please, enter user name..."
-                 UseFloatingPlaceholder="True" />
+                  PlaceholderText="Please, enter user name..."
+                  UseFloatingPlaceholderText="True" />
         <TextBlock x:Name="UserNameValidation"
                    Text="{Binding UserNameValidation}"
                    Foreground="Green"
@@ -26,8 +26,8 @@
         <TextBox Margin="0 10 0 0"
                  x:Name="PasswordTextBox"
                  Text="{Binding Password}"
-                 Placeholder="Please, enter your password..."
-                 UseFloatingPlaceholder="True"
+                 PlaceholderText="Please, enter your password..."
+                 UseFloatingPlaceholderText="True"
                  PasswordChar="*" />
         <TextBlock x:Name="PasswordValidation"
                    Text="{Binding PasswordValidation}"
@@ -36,8 +36,8 @@
         <TextBox Margin="0 10 0 0"
                  x:Name="ConfirmPasswordTextBox"
                  Text="{Binding ConfirmPassword}"
-                 Placeholder="Please, confirm the password..."
-                 UseFloatingPlaceholder="True"
+                 PlaceholderText="Please, confirm the password..."
+                 UseFloatingPlaceholderText="True"
                  PasswordChar="*" />
         <TextBlock x:Name="ConfirmPasswordValidation"
                    Text="{Binding ConfirmPasswordValidation}"
diff --git a/samples/IntegrationTestApp/Pages/ScreensPage.axaml b/samples/IntegrationTestApp/Pages/ScreensPage.axaml
index 6b60763a9a9..011030e79e7 100644
--- a/samples/IntegrationTestApp/Pages/ScreensPage.axaml
+++ b/samples/IntegrationTestApp/Pages/ScreensPage.axaml
@@ -8,12 +8,12 @@
     <Button Name="ScreenRefresh"
             Content="Refresh"
             Click="ScreenRefresh_Click"/>
-    <TextBox Name="ScreenName" Placeholder="DisplayName" UseFloatingPlaceholder="true" />
-    <TextBox Name="ScreenHandle" Placeholder="Handle" UseFloatingPlaceholder="true" />
-    <TextBox Name="ScreenScaling" Placeholder="Scaling" UseFloatingPlaceholder="true" />
-    <TextBox Name="ScreenBounds" Placeholder="Bounds" UseFloatingPlaceholder="true" />
-    <TextBox Name="ScreenWorkArea" Placeholder="WorkArea" UseFloatingPlaceholder="true" />
-    <TextBox Name="ScreenOrientation" Placeholder="Orientation" UseFloatingPlaceholder="true" />
-    <TextBox Name="ScreenSameReference" Placeholder="Is same reference" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenName" PlaceholderText="DisplayName" UseFloatingPlaceholderText="true" />
+    <TextBox Name="ScreenHandle" PlaceholderText="Handle" UseFloatingPlaceholderText="true" />
+    <TextBox Name="ScreenScaling" PlaceholderText="Scaling" UseFloatingPlaceholderText="true" />
+    <TextBox Name="ScreenBounds" PlaceholderText="Bounds" UseFloatingPlaceholderText="true" />
+    <TextBox Name="ScreenWorkArea" PlaceholderText="WorkArea" UseFloatingPlaceholderText="true" />
+    <TextBox Name="ScreenOrientation" PlaceholderText="Orientation" UseFloatingPlaceholderText="true" />
+    <TextBox Name="ScreenSameReference" PlaceholderText="Is same reference" UseFloatingPlaceholderText="true" />
   </StackPanel>
 </UserControl>
diff --git a/samples/IntegrationTestApp/Pages/WindowDecorationsPage.axaml b/samples/IntegrationTestApp/Pages/WindowDecorationsPage.axaml
index 52c17629e6b..0a7dce9c024 100644
--- a/samples/IntegrationTestApp/Pages/WindowDecorationsPage.axaml
+++ b/samples/IntegrationTestApp/Pages/WindowDecorationsPage.axaml
@@ -10,7 +10,7 @@
     <CheckBox Name="WindowPreferSystemChrome" Content="Prefer SystemChrome" />
     <CheckBox Name="WindowMacThickSystemChrome" Content="Mac Thick SystemChrome" />
     <CheckBox Name="WindowShowTitleAreaControl" Content="Show Title Area Control" />
-    <TextBox Name="WindowTitleBarHeightHint" Text="-1" Placeholder="In dips" />
+    <TextBox Name="WindowTitleBarHeightHint" Text="-1" PlaceholderText="In dips" />
     <Button Name="ApplyWindowDecorations"
             Content="Apply decorations on this Window"
             Click="ApplyWindowDecorations_Click"/>
diff --git a/samples/IntegrationTestApp/Pages/WindowPage.axaml b/samples/IntegrationTestApp/Pages/WindowPage.axaml
index 7789eee1c88..797c1c7170b 100644
--- a/samples/IntegrationTestApp/Pages/WindowPage.axaml
+++ b/samples/IntegrationTestApp/Pages/WindowPage.axaml
@@ -6,7 +6,7 @@
              x:Class="IntegrationTestApp.Pages.WindowPage">
   <Grid ColumnDefinitions="*,8,*">
     <StackPanel Grid.Column="0">
-      <TextBox Name="ShowWindowSize" Placeholder="Window Size"/>
+      <TextBox Name="ShowWindowSize" PlaceholderText="Window Size"/>
       <ComboBox Name="ShowWindowMode" SelectedIndex="0">
         <ComboBoxItem>NonOwned</ComboBoxItem>
         <ComboBoxItem>Owned</ComboBoxItem>
diff --git a/samples/SafeAreaDemo/Views/MainView.xaml b/samples/SafeAreaDemo/Views/MainView.xaml
index 565cded1396..c03ffc1f391 100644
--- a/samples/SafeAreaDemo/Views/MainView.xaml
+++ b/samples/SafeAreaDemo/Views/MainView.xaml
@@ -24,7 +24,7 @@
             <Label Margin="5"
                    Foreground="Red"
                    VerticalAlignment="Bottom"
-                   HorizontalContentAlignment="Right">View Bounds</Label>                
+                   HorizontalContentAlignment="Right">View Bounds</Label>
             </Grid>
         </Border>
         <Border BorderBrush="LimeGreen"
@@ -47,7 +47,7 @@
                         <CheckBox IsChecked="{Binding UseSafeArea}" IsEnabled="{Binding !AutoSafeAreaPadding}">Use Safe Area</CheckBox>
                         <CheckBox IsChecked="{Binding AutoSafeAreaPadding}">Automatic Paddings</CheckBox>
                         <CheckBox IsChecked="{Binding HideSystemBars}">Hide System Bars</CheckBox>
-                        <TextBox Width="200" Placeholder="Tap to Show Keyboard"/>
+                         <TextBox Width="200" PlaceholderText="Tap to Show Keyboard"/>
                     </StackPanel>
                 </Grid>
             </DockPanel>
diff --git a/samples/SingleProjectSandbox/MainView.axaml b/samples/SingleProjectSandbox/MainView.axaml
index 787bcd6c9d9..b7f1bdaa537 100644
--- a/samples/SingleProjectSandbox/MainView.axaml
+++ b/samples/SingleProjectSandbox/MainView.axaml
@@ -5,10 +5,10 @@
              x:DataType="local:MainView">
   <StackPanel Margin="100 50" Spacing="50">
     <TextBlock Text="Login" Foreground="White" />
-    <TextBox TextInputOptions.Multiline="True" AcceptsReturn="True" Placeholder="Text" Height="200" TextWrapping="Wrap"/>
-    <TextBox Placeholder="Username" TextInputOptions.ContentType="Email" TextInputOptions.ReturnKeyType="Done" />
-    <TextBox Placeholder="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
-    <TextBox Placeholder="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" TextInputOptions.ReturnKeyType="Next" />
+    <TextBox TextInputOptions.Multiline="True" AcceptsReturn="True" PlaceholderText="Text" Height="200" TextWrapping="Wrap"/>
+    <TextBox PlaceholderText="Username" TextInputOptions.ContentType="Email" TextInputOptions.ReturnKeyType="Done" />
+    <TextBox PlaceholderText="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
+    <TextBox PlaceholderText="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" TextInputOptions.ReturnKeyType="Next" />
     <Button Content="Login" Command="{Binding ButtonCommand}" />
   </StackPanel>
 </UserControl>
diff --git a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
index efe78044b15..90cedbce8c7 100644
--- a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Microsoft Corporation.
+// (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
 // Please see https://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
@@ -25,16 +25,16 @@ public partial class AutoCompleteBox
                 defaultBindingMode: BindingMode.TwoWay));
 
         /// <summary>
-        /// Defines the <see cref="Placeholder"/> property.
+        /// Defines the <see cref="PlaceholderText"/> property.
         /// </summary>
-        public static readonly StyledProperty<string?> PlaceholderProperty =
-            TextBox.PlaceholderProperty.AddOwner<AutoCompleteBox>();
+        public static readonly StyledProperty<string?> PlaceholderTextProperty =
+            TextBox.PlaceholderTextProperty.AddOwner<AutoCompleteBox>();
 
         /// <summary>
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
-        [Obsolete("Use PlaceholderProperty instead.", false)]
-        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderProperty;
+        [Obsolete("Use PlaceholderTextProperty instead.", false)]
+        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
@@ -332,7 +332,7 @@ public bool ClearSelectionOnLostFocus
         }
 
         /// <summary>
-        /// Gets or sets the  <see cref="T:Avalonia.Data.Binding" /> that
+        /// Gets or sets the <see cref="T:Avalonia.Data.Binding" /> that
         /// is used to get the values for display in the text portion of
         /// the <see cref="AutoCompleteBox" />
         /// control.
@@ -434,20 +434,20 @@ public AutoCompleteFilterMode FilterMode
         /// <summary>
         /// Gets or sets the placeholder or descriptive text that is displayed even if the text is not yet set.
         /// </summary>
-        public string? Placeholder
+        public string? PlaceholderText
         {
-            get => GetValue(PlaceholderProperty);
-            set => SetValue(PlaceholderProperty, value);
+            get => GetValue(PlaceholderTextProperty);
+            set => SetValue(PlaceholderTextProperty, value);
         }
 
         /// <summary>
         /// Gets or sets the placeholder or descriptive text that is displayed even if the text is not yet set.
         /// </summary>
-        [Obsolete("Use Placeholder instead.", false)]
+        [Obsolete("Use PlaceholderText instead.", false)]
         public string? Watermark
         {
-            get => Placeholder;
-            set => Placeholder = value;
+            get => PlaceholderText;
+            set => PlaceholderText = value;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
index 4fc0741f553..ffab7e880bb 100644
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
 using Avalonia.Layout;
@@ -53,7 +53,7 @@ public partial class CalendarDatePicker
         public static readonly StyledProperty<DateTime?> SelectedDateProperty =
             AvaloniaProperty.Register<CalendarDatePicker, DateTime?>(
                 nameof(SelectedDate),
-                enableDataValidation: true, 
+                enableDataValidation: true,
                 defaultBindingMode:BindingMode.TwoWay);
 
         /// <summary>
@@ -81,28 +81,28 @@ public partial class CalendarDatePicker
             AvaloniaProperty.Register<CalendarDatePicker, string?>(nameof(Text));
 
         /// <summary>
-        /// Defines the <see cref="Placeholder"/> property.
+        /// Defines the <see cref="PlaceholderText"/> property.
         /// </summary>
-        public static readonly StyledProperty<string?> PlaceholderProperty =
-            TextBox.PlaceholderProperty.AddOwner<CalendarDatePicker>();
+        public static readonly StyledProperty<string?> PlaceholderTextProperty =
+            TextBox.PlaceholderTextProperty.AddOwner<CalendarDatePicker>();
 
         /// <summary>
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
-        [Obsolete("Use PlaceholderProperty instead.", false)]
-        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderProperty;
+        [Obsolete("Use PlaceholderTextProperty instead.", false)]
+        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
-        /// Defines the <see cref="UseFloatingPlaceholder"/> property.
+        /// Defines the <see cref="UseFloatingPlaceholderText"/> property.
         /// </summary>
-        public static readonly StyledProperty<bool> UseFloatingPlaceholderProperty =
-            TextBox.UseFloatingPlaceholderProperty.AddOwner<CalendarDatePicker>();
+        public static readonly StyledProperty<bool> UseFloatingPlaceholderTextProperty =
+            TextBox.UseFloatingPlaceholderTextProperty.AddOwner<CalendarDatePicker>();
 
         /// <summary>
         /// Defines the <see cref="UseFloatingWatermark"/> property.
         /// </summary>
-        [Obsolete("Use UseFloatingPlaceholderProperty instead.", false)]
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderProperty;
+        [Obsolete("Use UseFloatingPlaceholderTextProperty instead.", false)]
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderTextProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
@@ -154,7 +154,7 @@ public DateTime DisplayDate
             get => GetValue(DisplayDateProperty);
             set => SetValue(DisplayDateProperty, value);
         }
-        
+
         /// <summary>
         /// Gets or sets the first date to be displayed.
         /// </summary>
@@ -278,34 +278,34 @@ public string? Text
             set => SetValue(TextProperty, value);
         }
 
-        /// <inheritdoc cref="TextBox.Placeholder"/>
-        public string? Placeholder
+        /// <inheritdoc cref="TextBox.PlaceholderText"/>
+        public string? PlaceholderText
         {
-            get => GetValue(PlaceholderProperty);
-            set => SetValue(PlaceholderProperty, value);
+            get => GetValue(PlaceholderTextProperty);
+            set => SetValue(PlaceholderTextProperty, value);
         }
 
         /// <inheritdoc cref="TextBox.Watermark"/>
-        [Obsolete("Use Placeholder instead.", false)]
+        [Obsolete("Use PlaceholderText instead.", false)]
         public string? Watermark
         {
-            get => Placeholder;
-            set => Placeholder = value;
+            get => PlaceholderText;
+            set => PlaceholderText = value;
         }
 
-        /// <inheritdoc cref="TextBox.UseFloatingPlaceholder"/>
-        public bool UseFloatingPlaceholder
+        /// <inheritdoc cref="TextBox.UseFloatingPlaceholderText"/>
+        public bool UseFloatingPlaceholderText
         {
-            get => GetValue(UseFloatingPlaceholderProperty);
-            set => SetValue(UseFloatingPlaceholderProperty, value);
+            get => GetValue(UseFloatingPlaceholderTextProperty);
+            set => SetValue(UseFloatingPlaceholderTextProperty, value);
         }
 
         /// <inheritdoc cref="TextBox.UseFloatingWatermark"/>
-        [Obsolete("Use UseFloatingPlaceholder instead.", false)]
+        [Obsolete("Use UseFloatingPlaceholderText instead.", false)]
         public bool UseFloatingWatermark
         {
-            get => UseFloatingPlaceholder;
-            set => UseFloatingPlaceholder = value;
+            get => UseFloatingPlaceholderText;
+            set => UseFloatingPlaceholderText = value;
         }
 
         /// <inheritdoc cref="TextBox.PlaceholderForeground"/>
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
index 75fb72d7234..a37c3b2d53d 100644
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
@@ -570,7 +570,7 @@ private void Calendar_SelectedDatesChanged(object? sender, SelectionChangedEvent
 
         private void Calendar_PointerReleased(object? sender, PointerReleasedEventArgs e)
         {
-             
+
             if (e.InitialPressMouseButton == MouseButton.Left)
             {
                 e.Handled = true;
@@ -779,7 +779,7 @@ private bool ProcessDatePickerKey(KeyEventArgs e)
                         return true;
                     }
                 case Key.Down:
-                    { 
+                    {
                         if ((e.KeyModifiers & KeyModifiers.Control) == KeyModifiers.Control)
                         {
                             TogglePopUp();
@@ -816,7 +816,7 @@ private void SetSelectedDate()
                         }
                     }
                     DateTime? d = SetTextBoxValue(s);
-                    
+
                     if (SelectedDate != d)
                     {
                         SetCurrentValue(SelectedDateProperty, d);
@@ -880,8 +880,8 @@ private void SetWaterMarkText()
             if (_textBox != null)
             {
                 SetCurrentValue(TextProperty, String.Empty);
-                
-                if (string.IsNullOrEmpty(Placeholder) && !UseFloatingPlaceholder)
+
+                if (string.IsNullOrEmpty(PlaceholderText) && !UseFloatingPlaceholderText)
                 {
                     DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
                     _defaultText = string.Empty;
@@ -908,11 +908,11 @@ private void SetWaterMarkText()
                             }
                     }
 
-                    _textBox.Placeholder = placeholderText;
+                    _textBox.PlaceholderText = placeholderText;
                 }
                 else
                 {
-                    _textBox.ClearValue(TextBox.PlaceholderProperty);
+                    _textBox.ClearValue(TextBox.PlaceholderTextProperty);
                 }
             }
         }
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 0b46087e8f5..453c7524c2a 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -109,16 +109,16 @@ public class NumericUpDown : TemplatedControl
                 defaultBindingMode: BindingMode.TwoWay, enableDataValidation: true);
 
         /// <summary>
-        /// Defines the <see cref="Placeholder"/> property.
+        /// Defines the <see cref="PlaceholderText"/> property.
         /// </summary>
-        public static readonly StyledProperty<string?> PlaceholderProperty =
-            AvaloniaProperty.Register<NumericUpDown, string?>(nameof(Placeholder));
+        public static readonly StyledProperty<string?> PlaceholderTextProperty =
+            AvaloniaProperty.Register<NumericUpDown, string?>(nameof(PlaceholderText));
 
         /// <summary>
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
-        [Obsolete("Use PlaceholderProperty instead.", false)]
-        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderProperty;
+        [Obsolete("Use PlaceholderTextProperty instead.", false)]
+        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
@@ -271,7 +271,7 @@ public decimal Minimum
 
         /// <summary>
         /// Gets or sets the parsing style (AllowLeadingWhite, Float, AllowHexSpecifier, ...). By default, Any.
-        /// Note that Hex style does not work with decimal. 
+        /// Note that Hex style does not work with decimal.
         /// For hexadecimal display, use <see cref="TextConverter"/>.
         /// </summary>
         public NumberStyles ParsingNumberStyle
@@ -291,7 +291,7 @@ public string? Text
 
         /// <summary>
         /// Gets or sets the custom bidirectional Text-Value converter.
-        /// Non-null converter overrides <see cref="ParsingNumberStyle"/>, providing finer control over 
+        /// Non-null converter overrides <see cref="ParsingNumberStyle"/>, providing finer control over
         /// string representation of the underlying value.
         /// </summary>
         public IValueConverter? TextConverter
@@ -312,20 +312,20 @@ public decimal? Value
         /// <summary>
         /// Gets or sets the object to use as a placeholder if the <see cref="Value"/> is null.
         /// </summary>
-        public string? Placeholder
+        public string? PlaceholderText
         {
-            get => GetValue(PlaceholderProperty);
-            set => SetValue(PlaceholderProperty, value);
+            get => GetValue(PlaceholderTextProperty);
+            set => SetValue(PlaceholderTextProperty, value);
         }
 
         /// <summary>
         /// Gets or sets the object to use as a placeholder if the <see cref="Value"/> is null.
         /// </summary>
-        [Obsolete("Use Placeholder instead.", false)]
+        [Obsolete("Use PlaceholderText instead.", false)]
         public string? Watermark
         {
-            get => Placeholder;
-            set => Placeholder = value;
+            get => PlaceholderText;
+            set => PlaceholderText = value;
         }
 
         /// <summary>
@@ -747,8 +747,8 @@ private void OnIncrement()
             }
             else
             {
-                // if Minimum is set we set value to Minimum on Increment. 
-                // otherwise we set value to 0. It ill be clamped to be between Minimum and Maximum later, so we don't need to do it here. 
+                // if Minimum is set we set value to Minimum on Increment.
+                // otherwise we set value to 0. It ill be clamped to be between Minimum and Maximum later, so we don't need to do it here.
                 result = IsSet(MinimumProperty) ? Minimum : 0;
             }
 
@@ -768,8 +768,8 @@ private void OnDecrement()
             }
             else
             {
-                // if Maximum is set we set value to Maximum on decrement. 
-                // otherwise we set value to 0. It ill be clamped to be between Minimum and Maximum later, so we don't need to do it here. 
+                // if Maximum is set we set value to Maximum on decrement.
+                // otherwise we set value to 0. It ill be clamped to be between Minimum and Maximum later, so we don't need to do it here.
                 result = IsSet(MaximumProperty) ? Maximum : 0;
             }
 
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index bb2864b24c0..58af074c654 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -48,13 +48,13 @@ public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.I
         /// <summary>
         /// Defines the <see cref="IsInactiveSelectionHighlightEnabled"/> property
         /// </summary>
-        public static readonly StyledProperty<bool> IsInactiveSelectionHighlightEnabledProperty = 
+        public static readonly StyledProperty<bool> IsInactiveSelectionHighlightEnabledProperty =
             AvaloniaProperty.Register<TextBox, bool>(nameof(IsInactiveSelectionHighlightEnabled), defaultValue: true);
 
         /// <summary>
         /// Defines the <see cref="ClearSelectionOnLostFocus"/> property
         /// </summary>
-        public static readonly StyledProperty<bool> ClearSelectionOnLostFocusProperty = 
+        public static readonly StyledProperty<bool> ClearSelectionOnLostFocusProperty =
             AvaloniaProperty.Register<TextBox, bool>(nameof(ClearSelectionOnLostFocus), defaultValue: true);
 
         /// <summary>
@@ -181,28 +181,28 @@ public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.I
             TextBlock.LineHeightProperty.AddOwner<TextBox>(new(defaultValue: double.NaN));
 
         /// <summary>
-        /// Defines the <see cref="Placeholder"/> property.
+        /// Defines the <see cref="PlaceholderText"/> property.
         /// </summary>
-        public static readonly StyledProperty<string?> PlaceholderProperty =
-            AvaloniaProperty.Register<TextBox, string?>(nameof(Placeholder));
+        public static readonly StyledProperty<string?> PlaceholderTextProperty =
+            AvaloniaProperty.Register<TextBox, string?>(nameof(PlaceholderText));
 
         /// <summary>
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
-        [Obsolete("Use PlaceholderProperty instead.", false)]
-        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderProperty;
+        [Obsolete("Use PlaceholderTextProperty instead.", false)]
+        public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
-        /// Defines the <see cref="UseFloatingPlaceholder"/> property.
+        /// Defines the <see cref="UseFloatingPlaceholderText"/> property.
         /// </summary>
-        public static readonly StyledProperty<bool> UseFloatingPlaceholderProperty =
-            AvaloniaProperty.Register<TextBox, bool>(nameof(UseFloatingPlaceholder));
+        public static readonly StyledProperty<bool> UseFloatingPlaceholderTextProperty =
+            AvaloniaProperty.Register<TextBox, bool>(nameof(UseFloatingPlaceholderText));
 
         /// <summary>
         /// Defines the <see cref="UseFloatingWatermark"/> property.
         /// </summary>
-        [Obsolete("Use UseFloatingPlaceholderProperty instead.", false)]
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderProperty;
+        [Obsolete("Use UseFloatingPlaceholderTextProperty instead.", false)]
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderTextProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
@@ -418,8 +418,8 @@ public bool IsInactiveSelectionHighlightEnabled
         /// </summary>
         public bool ClearSelectionOnLostFocus
         {
-            get=> GetValue(ClearSelectionOnLostFocusProperty);
-            set=> SetValue(ClearSelectionOnLostFocusProperty, value);
+            get => GetValue(ClearSelectionOnLostFocusProperty);
+            set => SetValue(ClearSelectionOnLostFocusProperty, value);
         }
 
         /// <summary>
@@ -432,7 +432,7 @@ public bool AcceptsReturn
         }
 
         /// <summary>
-        /// Gets or sets a value that determins whether the TextBox allows and displays tabs
+        /// Gets or sets a value that determines whether the TextBox allows and displays tabs
         /// </summary>
         public bool AcceptsTab
         {
@@ -540,7 +540,7 @@ private void OnSelectionStartChanged(AvaloniaPropertyChangedEventArgs e)
         /// Gets or sets the end position of the text selected in the TextBox
         /// </summary>
         /// <remarks>
-        /// When the SelectionEnd is equal to <see cref="SelectionStart"/>, there is no 
+        /// When the SelectionEnd is equal to <see cref="SelectionStart"/>, there is no
         /// selected text and it marks the caret position
         /// </remarks>
         public int SelectionEnd
@@ -689,42 +689,42 @@ public TextAlignment TextAlignment
         /// Gets or sets the placeholder or descriptive text that is displayed even if the <see cref="Text"/>
         /// property is not yet set.
         /// </summary>
-        public string? Placeholder
+        public string? PlaceholderText
         {
-            get => GetValue(PlaceholderProperty);
-            set => SetValue(PlaceholderProperty, value);
+            get => GetValue(PlaceholderTextProperty);
+            set => SetValue(PlaceholderTextProperty, value);
         }
 
         /// <summary>
         /// Gets or sets the placeholder or descriptive text that is displayed even if the <see cref="Text"/>
         /// property is not yet set.
         /// </summary>
-        [Obsolete("Use Placeholder instead.", false)]
+        [Obsolete("Use PlaceholderText instead.", false)]
         public string? Watermark
         {
-            get => Placeholder;
-            set => Placeholder = value;
+            get => PlaceholderText;
+            set => PlaceholderText = value;
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the <see cref="Placeholder"/> will still be shown above the
+        /// Gets or sets a value indicating whether the <see cref="PlaceholderText"/> will still be shown above the
         /// <see cref="Text"/> even after a text value is set.
         /// </summary>
-        public bool UseFloatingPlaceholder
+        public bool UseFloatingPlaceholderText
         {
-            get => GetValue(UseFloatingPlaceholderProperty);
-            set => SetValue(UseFloatingPlaceholderProperty, value);
+            get => GetValue(UseFloatingPlaceholderTextProperty);
+            set => SetValue(UseFloatingPlaceholderTextProperty, value);
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the <see cref="Placeholder"/> will still be shown above the
+        /// Gets or sets a value indicating whether the <see cref="PlaceholderText"/> will still be shown above the
         /// <see cref="Text"/> even after a text value is set.
         /// </summary>
-        [Obsolete("Use UseFloatingPlaceholder instead.", false)]
+        [Obsolete("Use UseFloatingPlaceholderText instead.", false)]
         public bool UseFloatingWatermark
         {
-            get => UseFloatingPlaceholder;
-            set => UseFloatingPlaceholder = value;
+            get => UseFloatingPlaceholderText;
+            set => UseFloatingPlaceholderText = value;
         }
 
         /// <summary>
@@ -1083,7 +1083,7 @@ protected override void OnGotFocus(GotFocusEventArgs e)
             if(_presenter != null)
             {
                 _presenter.ShowSelectionHighlight = true;
-            }           
+            }
 
             // when navigating to a textbox via the tab key, select all text if
             //   1) this textbox is *not* a multiline textbox
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
index a05590b49fb..92c46ecd41d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:generic="using:System.Collections.Generic"
                     x:ClassModifier="internal">
@@ -20,7 +20,7 @@
       </AutoCompleteBox>
     </Border>
   </Design.PreviewWith>
-  
+
     <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
       <Setter Property="VerticalAlignment" Value="Top" />
       <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
@@ -34,7 +34,7 @@
         <ControlTemplate>
           <Grid Name="PART_LayoutRoot">
             <TextBox Name="PART_TextBox"
-                     Placeholder="{TemplateBinding Placeholder}"
+                     PlaceholderText="{TemplateBinding PlaceholderText}"
                      PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
                      Width="{TemplateBinding Width}"
                      Foreground="{TemplateBinding Foreground}"
@@ -51,9 +51,9 @@
                      InnerLeftContent="{TemplateBinding InnerLeftContent}"
                      InnerRightContent="{TemplateBinding InnerRightContent}"
                      />
-            <Popup Name="PART_Popup" 
+            <Popup Name="PART_Popup"
                    WindowManagerAddShadowHint="False"
-                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" 
+                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
                    IsLightDismissEnabled="True"
                    PlacementTarget="{TemplateBinding}">
@@ -75,5 +75,5 @@
         </ControlTemplate>
       </Setter>
     </ControlTheme>
-  
+
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index cbed2ffd476..b8914f74237 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="using:System"
                     x:ClassModifier="internal">
@@ -92,9 +92,9 @@
                        CornerRadius="{TemplateBinding CornerRadius}"
                        Margin="{TemplateBinding BorderThickness}"
                        Padding="{TemplateBinding Padding}"
-                       Placeholder="{TemplateBinding Placeholder}"
+                       PlaceholderText="{TemplateBinding PlaceholderText}"
                        PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
-                       UseFloatingPlaceholder="{TemplateBinding UseFloatingPlaceholder}"
+                       UseFloatingPlaceholderText="{TemplateBinding UseFloatingPlaceholderText}"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 6263d738d59..d9ce9271533 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="using:System"
                     x:ClassModifier="internal">
@@ -16,7 +16,7 @@
           <ComboBoxItem>Item 1</ComboBoxItem>
           <ComboBoxItem>Item 2</ComboBoxItem>
         </ComboBox>
-        
+
         <ComboBox PlaceholderText="Error">
           <DataValidationErrors.Error>
             <sys:Exception>
@@ -126,7 +126,7 @@
                      Foreground="{TemplateBinding Foreground}"
                      Background="Transparent"
                      Text="{TemplateBinding Text, Mode=TwoWay}"
-                     Placeholder="{TemplateBinding PlaceholderText}"
+                     PlaceholderText="{TemplateBinding PlaceholderText}"
                      BorderThickness="0"
                      IsVisible="{TemplateBinding IsEditable}">
               <TextBox.Resources>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
index c1dfe8d4a3d..c980135ecaf 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:dialogs="using:Avalonia.Dialogs"
         xmlns:internal="using:Avalonia.Dialogs.Internal"
@@ -166,7 +166,7 @@
                   <Path Data="M 0 7 L 7 0 L 14 7 M 7 0 L 7 16" Stroke="{CompiledBinding $parent[Button].Foreground}" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,1,0,-1"/>
                 </Button>
                 <Button Command="{Binding Refresh}" DockPanel.Dock="Right" Margin="8,0,0,0">
-                  <Path Data="M18.62 3.32c.39 0 .7.29.76.66v3c0 .39-.28.7-.66.76h-3a.77.77 0 0 1-.1-1.52h1.08a7.42 7.42 0 1 0 2.65 4.37.77.77 0 1 1 1.5-.3 8.94 8.94 0 1 1-3-5.12V4.09c0-.43.35-.77.77-.77Z" 
+                  <Path Data="M18.62 3.32c.39 0 .7.29.76.66v3c0 .39-.28.7-.66.76h-3a.77.77 0 0 1-.1-1.52h1.08a7.42 7.42 0 1 0 2.65 4.37.77.77 0 1 1 1.5-.3 8.94 8.94 0 1 1-3-5.12V4.09c0-.43.35-.77.77-.77Z"
                         Fill="{CompiledBinding $parent[Button].Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="-2,-4,0,0"/>
                 </Button>
                 <TextBox x:Name="Location" Text="{Binding Location}">
@@ -184,7 +184,7 @@
                       IsVisible="{Binding ShowFilters}"
                       ItemsSource="{Binding Filters}"
                       SelectedItem="{Binding SelectedFilter}" />
-                  <TextBox Text="{Binding FileName}" Placeholder="{DynamicResource StringManagedFileChooserFileNamePlaceholder}" IsVisible="{Binding !SelectingFolder}" />
+                  <TextBox Text="{Binding FileName}" PlaceholderText="{DynamicResource StringManagedFileChooserFileNamePlaceholder}" IsVisible="{Binding !SelectingFolder}" />
                 </DockPanel>
                 <CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="{DynamicResource StringManagedFileChooserShowHiddenFilesText}" DockPanel.Dock="Left"/>
                 <UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1">
@@ -344,7 +344,7 @@
       <Setter Property="Margin" Value="4,0,0,0"/>
     </Style>
   </ControlTheme>
-  
+
   <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooserOverwritePrompt}" TargetType="dialogs:ManagedFileChooserOverwritePrompt">
     <Setter Property="MinWidth" Value="270" />
     <Setter Property="MaxWidth" Value="400" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index ff854b40a83..b6c19484e95 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -1,21 +1,21 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=System.Runtime"
                     x:ClassModifier="internal">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
+         <NumericUpDown Minimum="0"
+                        Maximum="10"
+                        Increment="0.5"
+                        PlaceholderText="Enter text" />
         <NumericUpDown Minimum="0"
-                       Maximum="10"
-                       Increment="0.5"
-                       Placeholder="Enter text" />
-        <NumericUpDown Minimum="0"
-                       Maximum="10"
-                       Increment="0.5"
-                       VerticalContentAlignment="Center"
-                       HorizontalContentAlignment="Center"
-                       ButtonSpinnerLocation="Left"
-                       Placeholder="Enter text" />
+                        Maximum="10"
+                        Increment="0.5"
+                        VerticalContentAlignment="Center"
+                        HorizontalContentAlignment="Center"
+                        ButtonSpinnerLocation="Left"
+                        PlaceholderText="Enter text" />
         <NumericUpDown ButtonSpinnerLocation="Left">
           <NumericUpDown.InnerLeftContent>
             <TextBlock Text="m"
@@ -81,7 +81,7 @@
                      Padding="{TemplateBinding Padding}"
                      MinWidth="0"
                      Foreground="{TemplateBinding Foreground}"
-                     Placeholder="{TemplateBinding Placeholder}"
+                     PlaceholderText="{TemplateBinding PlaceholderText}"
                      PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
                      IsReadOnly="{TemplateBinding IsReadOnly}"
                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index d22af33beb5..b420d4ff01c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -9,9 +9,9 @@
         <TextBox Classes="clearButton">Clear</TextBox>
         <TextBox PasswordChar="*" Classes="revealPasswordButton">Reveal Password</TextBox>
         <TextBox PasswordChar="*" Classes="revealPasswordButton" RevealPassword="True">Password Revealed</TextBox>
-        <TextBox Placeholder="Placeholder"/>
-        <TextBox Placeholder="Floating Placeholder" UseFloatingPlaceholder="True"/>
-        <TextBox Placeholder="Floating Placeholder" UseFloatingPlaceholder="True">Content</TextBox>
+        <TextBox PlaceholderText="Placeholder"/>
+        <TextBox PlaceholderText="Floating Placeholder" UseFloatingPlaceholderText="True"/>
+        <TextBox PlaceholderText="Floating Placeholder" UseFloatingPlaceholderText="True">Content</TextBox>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
@@ -20,7 +20,7 @@
   <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
   <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
   <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
-  
+
   <MenuFlyout x:Key="DefaultTextBoxContextFlyout" ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}">
     <MenuItem Header="{DynamicResource StringTextFlyoutCutText}" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
     <MenuItem Header="{DynamicResource StringTextFlyoutCopyText}" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
@@ -136,7 +136,7 @@
                   <TextBlock Name="PART_FloatingPlaceholder"
                              Foreground="{TemplateBinding PlaceholderForeground}"
                              IsVisible="False"
-                             Text="{TemplateBinding Placeholder}"
+                             Text="{TemplateBinding PlaceholderText}"
                              DockPanel.Dock="Top" />
 
                   <ScrollViewer Name="PART_ScrollViewer"
@@ -149,7 +149,7 @@
                       <TextBlock Name="PART_Placeholder"
                               Foreground="{TemplateBinding PlaceholderForeground}"
                               Opacity="{DynamicResource TextControlPlaceholderOpacity}"
-                              Text="{TemplateBinding Placeholder}"
+                              Text="{TemplateBinding PlaceholderText}"
                               TextAlignment="{TemplateBinding TextAlignment}"
                               TextWrapping="{TemplateBinding TextWrapping}"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -238,8 +238,8 @@
     <Style Selector="^ /template/ TextBlock#PART_FloatingPlaceholder">
       <Setter Property="Cursor" Value="IBeam"/>
     </Style>
-    
-    <Style Selector="^[UseFloatingPlaceholder=true]:not(:empty) /template/ TextBlock#PART_FloatingPlaceholder">
+
+    <Style Selector="^[UseFloatingPlaceholderText=true]:not(:empty) /template/ TextBlock#PART_FloatingPlaceholder">
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
diff --git a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
index a8da9116747..ec0eccc8c42 100644
--- a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
@@ -19,9 +19,9 @@
                    CaretIndex="{TemplateBinding CaretIndex, Mode=TwoWay}"
                    ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   Placeholder="{TemplateBinding Placeholder}"
+                   PlaceholderText="{TemplateBinding PlaceholderText}"
                    PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
-                   MaxLength="{TemplateBinding MaxLength}"                   
+                   MaxLength="{TemplateBinding MaxLength}"
                    InnerLeftContent="{TemplateBinding InnerLeftContent}"
                    InnerRightContent="{TemplateBinding InnerRightContent}"
                    />
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
index 386728eca39..e49905eff48 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
@@ -101,8 +101,8 @@
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   UseFloatingPlaceholder="{TemplateBinding UseFloatingPlaceholder}"
-                   Placeholder="{TemplateBinding Placeholder}"
+                   UseFloatingPlaceholderText="{TemplateBinding UseFloatingPlaceholderText}"
+                   PlaceholderText="{TemplateBinding PlaceholderText}"
                    PlaceholderForeground="{TemplateBinding PlaceholderForeground}" />
 
           <Button Name="PART_Button"
diff --git a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
index 3967ddccf96..2b98d158a68 100644
--- a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
@@ -115,7 +115,7 @@
             <TextBox DockPanel.Dock="Bottom"
                      IsVisible="{Binding !SelectingFolder}"
                      Text="{Binding FileName}"
-                     Placeholder="{DynamicResource StringManagedFileChooserFileNamePlaceholder}" />
+                     PlaceholderText="{DynamicResource StringManagedFileChooserFileNamePlaceholder}" />
 
             <ListBox x:Name="PART_QuickLinks"
                      MaxWidth="200"
@@ -264,7 +264,7 @@
                   <Binding Path ="FileName" RelativeSource="{RelativeSource TemplatedParent}" />
                 </MultiBinding>
               </TextBlock.Text>
-            </TextBlock>            
+            </TextBlock>
             <StackPanel HorizontalAlignment="Right"
                         Spacing="10"
                         Orientation="Horizontal">
diff --git a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
index 0e1121c3f7b..14cb0de6af7 100644
--- a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
@@ -37,7 +37,7 @@
                      Text="{TemplateBinding Text}"
                      TextAlignment="{TemplateBinding TextAlignment}"
                      TextWrapping="NoWrap"
-                     Placeholder="{TemplateBinding Placeholder}"
+                     PlaceholderText="{TemplateBinding PlaceholderText}"
                      PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
                      InnerLeftContent="{Binding InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}}"
                      InnerRightContent="{Binding InnerRightContent, RelativeSource={RelativeSource TemplatedParent}}"/>
diff --git a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
index 489ec176ad2..6e56e4a3103 100644
--- a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -107,10 +107,10 @@
                        DockPanel.Dock="Top"
                        FontSize="{DynamicResource FontSizeSmall}"
                        Foreground="{TemplateBinding PlaceholderForeground}"
-                       Text="{TemplateBinding Placeholder}">
+                       Text="{TemplateBinding PlaceholderText}">
               <TextBlock.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
-                  <Binding Path="UseFloatingPlaceholder"
+                  <Binding Path="UseFloatingPlaceholderText"
                            RelativeSource="{RelativeSource TemplatedParent}" />
                   <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                            Path="Text"
@@ -137,9 +137,9 @@
                     <TextBlock Name="placeholder"
                                Foreground="{TemplateBinding PlaceholderForeground}"
                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"   
+                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                Opacity="{DynamicResource TextControlPlaceholderOpacity}"
-                               Text="{TemplateBinding Placeholder}"
+                               Text="{TemplateBinding PlaceholderText}"
                                TextAlignment="{TemplateBinding TextAlignment}"
                                TextWrapping="{TemplateBinding TextWrapping}">
                       <TextBlock.IsVisible>
@@ -205,7 +205,7 @@
         <Template>
           <Button Command="{Binding $parent[TextBox].Clear}"
                   Focusable="False"
-                  Theme="{StaticResource SimpleTextBoxClearButtonTheme}" 
+                  Theme="{StaticResource SimpleTextBoxClearButtonTheme}"
                   ClipToBounds="True" />
         </Template>
       </Setter>
diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
index 6cb58308ad4..26ece37acf6 100644
--- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -406,7 +406,7 @@ public void Custom_ItemSelector()
                 Assert.Equal(control.Text, control.ItemSelector(input, selectedItem));
             });
         }
-        
+
         [Fact]
         public void Text_Validation()
         {
@@ -421,7 +421,7 @@ public void Text_Validation()
                 Assert.Equal([exception], DataValidationErrors.GetErrors(control));
             });
         }
-        
+
         [Fact]
         public void Text_Validation_TextBox_Errors_Binding()
         {
@@ -430,20 +430,20 @@ public void Text_Validation_TextBox_Errors_Binding()
                 // simulate the TemplateBinding that would be used within the AutoCompleteBox control theme for the inner PART_TextBox
                 //      DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                 textbox.Bind(DataValidationErrors.ErrorsProperty, control.GetBindingObservable(DataValidationErrors.ErrorsProperty));
-                
+
                 var exception = new InvalidCastException("failed validation");
                 var textObservable = new BehaviorSubject<BindingNotification>(new BindingNotification(exception, BindingErrorType.DataValidationError));
                 control.Bind(AutoCompleteBox.TextProperty, textObservable);
                 Dispatcher.UIThread.RunJobs();
-                
+
                 Assert.True(DataValidationErrors.GetHasErrors(control));
                 Assert.Equal([exception], DataValidationErrors.GetErrors(control));
-                
+
                 Assert.True(DataValidationErrors.GetHasErrors(textbox));
                 Assert.Equal([exception], DataValidationErrors.GetErrors(textbox));
             });
         }
-        
+
         [Fact]
         public void SelectedItem_Validation()
         {
@@ -583,7 +583,7 @@ public void Opening_Context_Menu_Does_not_Lose_Selection()
         }
 
         /// <summary>
-        /// Retrieves a defined predicate filter through a new AutoCompleteBox 
+        /// Retrieves a defined predicate filter through a new AutoCompleteBox
         /// control instance.
         /// </summary>
         /// <param name="mode">The FilterMode of interest.</param>
@@ -1290,7 +1290,7 @@ public void PlaceholderForeground_Can_Be_Set()
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
                 var control = CreateControl();
-                control.Placeholder = "Search...";
+                control.PlaceholderText = "Search...";
                 control.PlaceholderForeground = Media.Brushes.Green;
 
                 Assert.Equal(Media.Brushes.Green, control.PlaceholderForeground);
diff --git a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
index 92b8dbca8e3..d97a9729fb0 100644
--- a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
@@ -117,7 +117,7 @@ private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate<CalendarDatePicker>((control, scope) =>
             {
-                var textBox = 
+                var textBox =
                     new TextBox
                     {
                         Name = "PART_TextBox"
@@ -130,7 +130,7 @@ private static IControlTemplate CreateTemplate()
                 var calendar =
                     new Calendar
                     {
-                        Name = "PART_Calendar", 
+                        Name = "PART_Calendar",
                         [!Calendar.SelectedDateProperty] = control[!CalendarDatePicker.SelectedDateProperty],
                         [!Calendar.DisplayDateProperty] = control[!CalendarDatePicker.DisplayDateProperty],
                         [!Calendar.DisplayDateStartProperty] = control[!CalendarDatePicker.DisplayDateStartProperty],
@@ -185,7 +185,7 @@ public void PlaceholderForeground_Can_Be_Set()
             using (UnitTestApplication.Start(Services))
             {
                 var control = CreateControl();
-                control.Placeholder = "Select date";
+                control.PlaceholderText = "Select date";
                 control.PlaceholderForeground = Media.Brushes.Purple;
 
                 Assert.Equal(Media.Brushes.Purple, control.PlaceholderForeground);
diff --git a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
index 1ee32bc2c1b..868b33d7bd0 100644
--- a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -58,7 +58,7 @@ public void Increment_Decrement_Tests(decimal min, decimal max, decimal? value,
             var spinner = GetSpinner(control);
 
             spinner.RaiseEvent(new SpinEventArgs(Spinner.SpinEvent, direction));
-            
+
             Assert.Equal(control.Value, expected);
         }
 
@@ -105,16 +105,16 @@ public void NumberFormat_Is_Applied_Immediately()
             // if min and max are not defined and value was null, 0 should be ne new value after spin
             yield return [decimal.MinValue, decimal.MaxValue, null, SpinDirection.Decrease, 0m];
             yield return [decimal.MinValue, decimal.MaxValue, null, SpinDirection.Increase, 0m];
-            
+
             // if no value was defined, but Min or Max are defined, use these as the new value
             yield return [-400m, -200m, null, SpinDirection.Decrease, -200m];
             yield return [200m, 400m, null, SpinDirection.Increase, 200m];
-            
+
             // Value should be clamped to Min / Max after spinning
             yield return [200m, 400m, 5m, SpinDirection.Increase, 200m];
             yield return [200m, 400m, 200m, SpinDirection.Decrease, 200m];
         }
-        
+
         private void RunTest(Action<NumericUpDown, TextBox> test)
         {
             using (UnitTestApplication.Start(Services))
@@ -148,14 +148,14 @@ private static TextBox GetTextBox(NumericUpDown control)
                           .OfType<TextBox>()
                           .First();
         }
-        
+
         private static ButtonSpinner GetSpinner(NumericUpDown control)
         {
             return control.GetTemplateChildren()
                 .OfType<ButtonSpinner>()
                 .First();
         }
-        
+
         private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate<NumericUpDown>((control, scope) =>
@@ -180,10 +180,10 @@ public void TabIndex_Should_Be_Synchronized_With_Inner_TextBox()
             {
                 // Set TabIndex on NumericUpDown
                 control.TabIndex = 5;
-                
+
                 // The inner TextBox should inherit the same TabIndex
                 Assert.Equal(5, textbox.TabIndex);
-                
+
                 // Change TabIndex and verify it gets synchronized
                 control.TabIndex = 10;
                 Assert.Equal(10, textbox.TabIndex);
@@ -196,7 +196,7 @@ public void PlaceholderForeground_Can_Be_Set()
             using (UnitTestApplication.Start(Services))
             {
                 var control = CreateControl();
-                control.Placeholder = "Enter value";
+                control.PlaceholderText = "Enter value";
                 control.PlaceholderForeground = Media.Brushes.Red;
 
                 Assert.Equal(Media.Brushes.Red, control.PlaceholderForeground);
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 09591bd75d0..31b8fe45e8d 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -42,25 +42,25 @@ public void Opening_Context_Menu_Does_not_Lose_Selection()
                     Template = CreateTemplate(),
                     Text = "5678"
                 };
-                
+
                 var sp = new StackPanel();
                 sp.Children.Add(target1);
                 sp.Children.Add(target2);
 
                 target1.ApplyTemplate();
                 target2.ApplyTemplate();
-                
+
                 var root = new TestRoot() { Child = sp };
 
                 target1.SelectionStart = 0;
                 target1.SelectionEnd = 3;
-                
+
                 target1.Focus();
                 Assert.False(target2.IsFocused);
                 Assert.True(target1.IsFocused);
 
                 target2.Focus();
-                
+
                 Assert.Equal("123", target1.SelectedText);
             }
         }
@@ -106,7 +106,7 @@ public void Opening_Context_Flyout_Does_not_Lose_Selection()
                         }
                     }
                 };
-                              
+
 
                 target1.ApplyTemplate();
 
@@ -165,16 +165,16 @@ public void CaretIndex_Can_Moved_To_Position_After_The_End_Of_Text_With_Arrow_Ke
                 };
 
                 target.ApplyTemplate();
-                
+
                 target.Measure(Size.Infinity);
-                
+
                 target.CaretIndex = 3;
                 RaiseKeyEvent(target, Key.Right, 0);
 
                 Assert.Equal(4, target.CaretIndex);
             }
         }
-        
+
         [Fact]
         public void Control_Backspace_Should_Set_Caret_Position_To_The_Start_Of_The_Deletion()
         {
@@ -194,11 +194,11 @@ public void Control_Backspace_Should_Set_Caret_Position_To_The_Start_Of_The_Dele
                 // (First Second |Third)
                 RaiseKeyEvent(target, Key.Back, KeyModifiers.Control);
                 // (First |Third)
-                
+
                 Assert.Equal(6, target.CaretIndex);
             }
         }
-        
+
         [Fact]
         public void Control_Backspace_Should_Remove_The_Double_Whitespace_If_Caret_Index_Was_At_The_End_Of_A_Word()
         {
@@ -213,7 +213,7 @@ public void Control_Backspace_Should_Remove_The_Double_Whitespace_If_Caret_Index
                 };
 
                 target.ApplyTemplate();
-                
+
                 // (First Second| Third)
                 RaiseKeyEvent(target, Key.Back, KeyModifiers.Control);
                 // (First| Third)
@@ -236,11 +236,11 @@ public void Control_Backspace_Undo_Should_Return_Caret_Position()
                 };
 
                 target.ApplyTemplate();
-                
+
                 // (First Second| Third)
                 RaiseKeyEvent(target, Key.Back, KeyModifiers.Control);
                 // (First| Third)
-                
+
                 target.Undo();
                 // (First Second| Third)
 
@@ -258,7 +258,7 @@ public void Press_Ctrl_A_Select_All_Text()
                     Template = CreateTemplate(),
                     Text = "1234"
                 };
-                
+
                 target.ApplyTemplate();
 
                 RaiseKeyEvent(target, Key.A, KeyModifiers.Control);
@@ -314,7 +314,7 @@ public void Control_Backspace_Should_Remove_The_Word_Before_The_Caret_If_There_I
                     SelectionStart = 5,
                     SelectionEnd = 5
                 };
-                
+
                 textBox.ApplyTemplate();
 
                 // (First| Second Third Fourth)
@@ -356,7 +356,7 @@ public void Control_Delete_Should_Remove_The_Word_After_The_Caret_If_There_Is_No
                     Text = "First Second Third Fourth",
                     CaretIndex = 19,
                 };
-                
+
                 textBox.ApplyTemplate();
 
                 // (First Second Third |Fourth)
@@ -400,7 +400,7 @@ public void Setting_SelectionStart_To_SelectionEnd_Sets_CaretPosition_To_Selecti
 
                 textBox.SelectionStart = 2;
                 textBox.SelectionEnd = 2;
-                
+
                 Assert.Equal(2, textBox.CaretIndex);
             }
         }
@@ -443,7 +443,7 @@ public void Press_Enter_Does_Not_Accept_Return()
                     AcceptsReturn = false,
                     Text = "1234"
                 };
-                
+
                 target.ApplyTemplate();
 
                 RaiseKeyEvent(target, Key.Enter, 0);
@@ -462,7 +462,7 @@ public void Press_Enter_Add_Default_Newline()
                     Template = CreateTemplate(),
                     AcceptsReturn = true
                 };
-                
+
                 target.ApplyTemplate();
 
                 RaiseKeyEvent(target, Key.Enter, 0);
@@ -482,7 +482,7 @@ public void Press_Enter_Add_Custom_Newline()
                     AcceptsReturn = true,
                     NewLine = "Test"
                 };
-                
+
                 target.ApplyTemplate();
 
                 RaiseKeyEvent(target, Key.Enter, 0);
@@ -523,7 +523,7 @@ public void SelectionEnd_Doesnt_Cause_Exception()
                     Template = CreateTemplate(),
                     Text = "0123456789"
                 };
-                
+
                 target.ApplyTemplate();
 
                 target.SelectionStart = 0;
@@ -547,7 +547,7 @@ public void SelectionStart_Doesnt_Cause_Exception()
                     Template = CreateTemplate(),
                     Text = "0123456789"
                 };
-                
+
                 target.ApplyTemplate();
 
                 target.SelectionStart = 8;
@@ -592,7 +592,7 @@ public void SelectedText_Changes_OnSelectionChange()
                     Template = CreateTemplate(),
                     Text = "0123456789"
                 };
-                
+
                 target.ApplyTemplate();
 
                 Assert.True(target.SelectedText == "");
@@ -614,7 +614,7 @@ public void SelectedText_EditsText()
                     Template = CreateTemplate(),
                     Text = "0123"
                 };
-                
+
                 target.ApplyTemplate();
 
                 target.SelectedText = "AA";
@@ -679,7 +679,7 @@ public void CoerceCaretIndex_Doesnt_Cause_Exception_with_malformed_line_ending()
                 Assert.True(true);
             }
         }
-        
+
         [Theory]
         [InlineData(Key.Up)]
         [InlineData(Key.Down)]
@@ -725,7 +725,7 @@ public void TextBox_GotFocus_And_LostFocus_Work_Properly()
 
                 target1.ApplyTemplate();
                 target2.ApplyTemplate();
-                
+
                 var root = new TestRoot { Child = sp };
 
                 var gfcount = 0;
@@ -746,7 +746,7 @@ public void TextBox_GotFocus_And_LostFocus_Work_Properly()
                 Assert.Equal(1, lfcount);
             }
         }
-        
+
         [Fact]
         public void TextBox_CaretIndex_Persists_When_Focus_Lost()
         {
@@ -768,7 +768,7 @@ public void TextBox_CaretIndex_Persists_When_Focus_Lost()
 
                 target1.ApplyTemplate();
                 target2.ApplyTemplate();
-                
+
                 var root = new TestRoot { Child = sp };
 
                 target2.Focus();
@@ -777,11 +777,11 @@ public void TextBox_CaretIndex_Persists_When_Focus_Lost()
                 Assert.True(target2.IsFocused);
 
                 target1.Focus();
-                
+
                 Assert.Equal(2, target2.CaretIndex);
             }
         }
-        
+
         [Fact]
         public void TextBox_Reveal_Password_Reset_When_Lost_Focus()
         {
@@ -804,14 +804,14 @@ public void TextBox_Reveal_Password_Reset_When_Lost_Focus()
 
                 target1.ApplyTemplate();
                 target2.ApplyTemplate();
-                
+
                 var root = new TestRoot { Child = sp };
 
                 target1.Focus();
                 target1.RevealPassword = true;
-                
+
                 target2.Focus();
-                
+
                 Assert.False(target1.RevealPassword);
             }
         }
@@ -833,7 +833,7 @@ public void Setting_Bound_Text_To_Null_Works()
                 Assert.Null(target.Text);
             }
         }
-        
+
         [Theory]
         [InlineData("abc", "d", 3, 0, 0, false, "abc")]
         [InlineData("abc", "dd", 4, 3, 3, false, "abcd")]
@@ -870,7 +870,7 @@ public async Task MaxLength_Works_Properly(
                 topLevel.LayoutManager.ExecuteInitialLayoutPass();
 
                 target.Measure(Size.Infinity);
-                
+
                 if (fromClipboard)
                 {
                     await topLevel.Clipboard!.SetTextAsync(textInput);
@@ -882,7 +882,7 @@ public async Task MaxLength_Works_Properly(
                 {
                     RaiseTextEvent(target, textInput);
                 }
-                
+
                 Assert.Equal(expected, target.Text);
             }
         }
@@ -1246,7 +1246,7 @@ public void MinLines_Sets_ScrollViewer_MinHeight_With_TextPresenter_Margin(int m
                 Assert.Equal((minLines * target.LineHeight) + textPresenterMargin.Top + textPresenterMargin.Bottom, scrollViewer.MinHeight);
             }
         }
-        
+
         [Theory]
         [InlineData(null, 1)]
         [InlineData("", 1)]
@@ -1285,7 +1285,7 @@ public void Unmeasured_TextBox_Has_Negative_LineCount()
             var b = new TextBox();
             Assert.Equal(-1, b.GetLineCount());
         }
-        
+
         [Fact]
         public void LineCount_Is_Correct_After_Text_Change()
         {
@@ -1309,7 +1309,7 @@ public void LineCount_Is_Correct_After_Text_Change()
 
                 target.ApplyTemplate();
                 target.Measure(Size.Infinity);
-                
+
                 Assert.Equal(1, target.GetLineCount());
 
                 target.Text = "Hello\r\nWorld";
@@ -1505,7 +1505,7 @@ public void UndoLimit_Count_Is_Respected()
                 Assert.Equal("ABCDEF123", tb.Text);
 
                 // Undo will take us back one step
-                tb.Undo();                
+                tb.Undo();
                 Assert.Equal("ABCDEF", tb.Text);
 
                 // Undo again
@@ -2050,7 +2050,7 @@ public void InputMethodClient_SurroundingText_Returns_Empty_For_Empty_Line()
             Assert.NotNull(client);
             Assert.Equal(string.Empty, client.SurroundingText);
         }
-  
+
         [Fact]
         public void Backspace_Should_Delete_Last_Character_In_Line_And_Keep_Caret_On_Same_Line()
         {
@@ -2122,7 +2122,7 @@ public void Losing_Focus_Should_Not_Reset_Selection()
 
                 Assert.True(target1.IsFocused);
 
-                Assert.Equal("1234", target1.SelectedText);            
+                Assert.Equal("1234", target1.SelectedText);
 
                 target2.Focus();
 
@@ -2157,7 +2157,7 @@ public void PlaceholderForeground_Can_Be_Set()
                 var target = new TextBox
                 {
                     Template = CreateTemplate(),
-                    Placeholder = "Enter text",
+                    PlaceholderText = "Enter text",
                     PlaceholderForeground = Brushes.Red
                 };
 
@@ -2175,7 +2175,7 @@ public void PlaceholderForeground_Defaults_To_Null()
                 var target = new TextBox
                 {
                     Template = CreateTemplate(),
-                    Placeholder = "Enter text"
+                    PlaceholderText = "Enter text"
                 };
 
                 target.ApplyTemplate();
@@ -2192,7 +2192,7 @@ public void PlaceholderForeground_Can_Be_Set_To_Null()
                 var target = new TextBox
                 {
                     Template = CreateTemplate(),
-                    Placeholder = "Enter text",
+                    PlaceholderText = "Enter text",
                     PlaceholderForeground = Brushes.Blue
                 };
 
@@ -2215,7 +2215,7 @@ public void PlaceholderForeground_Can_Be_Set_To_Null()
         private static TestServices Services => TestServices.MockThreadingInterface.With(
             standardCursorFactory: Mock.Of<ICursorFactory>(),
             renderInterface: new HeadlessPlatformRenderInterface(),
-            textShaperImpl: new HarfBuzzTextShaper(), 
+            textShaperImpl: new HarfBuzzTextShaper(),
             fontManagerImpl: new TestFontManager(),
             assetLoader: new StandardAssetLoader());
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index 25ba7a29c0e..03871d2c846 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -71,14 +71,14 @@ public void MultiBinding_TemplatedParent_Works()
 <Window xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Data;assembly=Avalonia.Markup.Xaml.UnitTests'>
-    <TextBox Name='textBox' Text='Foo' Placeholder='Bar'>
+    <TextBox Name='textBox' Text='Foo' PlaceholderText='Bar'>
         <TextBox.Template>
             <ControlTemplate>
                 <TextPresenter Name='PART_TextPresenter'>
                     <TextPresenter.Text>
                         <MultiBinding Converter='{x:Static local:ConcatConverter.Instance}'>
                             <Binding RelativeSource='{RelativeSource TemplatedParent}' Path='Text'/>
-                            <Binding RelativeSource='{RelativeSource TemplatedParent}' Path='Placeholder'/>
+                            <Binding RelativeSource='{RelativeSource TemplatedParent}' Path='PlaceholderText'/>
                         </MultiBinding>
                     </TextPresenter.Text>
                 </TextPresenter>
diff --git a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
index 435deba518e..6e8608b8b10 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
@@ -32,7 +32,7 @@ private static IControlTemplate CreateTextBoxTemplate()
                 var placeholder = new TextBlock
                 {
                     Name = "PART_Placeholder",
-                    [!TextBlock.TextProperty] = textBox[!TextBox.PlaceholderProperty],
+                    [!TextBlock.TextProperty] = textBox[!TextBox.PlaceholderTextProperty],
                     [!TextBlock.ForegroundProperty] = textBox[!TextBox.PlaceholderForegroundProperty],
                     FontFamily = textBox.FontFamily,
                     FontSize = textBox.FontSize,
@@ -72,7 +72,7 @@ public async Task Placeholder_With_Red_Foreground()
                     FontFamily = TestFontFamily,
                     FontSize = 12,
                     Background = Brushes.White,
-                    Placeholder = "Red placeholder",
+                    PlaceholderText = "Red placeholder",
                     PlaceholderForeground = Brushes.Red,
                 }
             };
@@ -96,7 +96,7 @@ public async Task Placeholder_With_Blue_Foreground()
                     FontFamily = TestFontFamily,
                     FontSize = 12,
                     Background = Brushes.White,
-                    Placeholder = "Blue placeholder",
+                    PlaceholderText = "Blue placeholder",
                     PlaceholderForeground = Brushes.Blue,
                 }
             };
@@ -120,7 +120,7 @@ public async Task Placeholder_With_Default_Foreground()
                     FontFamily = TestFontFamily,
                     FontSize = 12,
                     Background = Brushes.White,
-                    Placeholder = "Default placeholder",
+                    PlaceholderText = "Default placeholder",
                     PlaceholderForeground = Brushes.Gray,
                 }
             };

From 4541c08981a102f268d90cef9e720665d1f239ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Wed, 4 Feb 2026 13:30:03 +0100
Subject: [PATCH 09/11] More changes

---
 .../AutoCompleteBox.Properties.cs              | 12 ++++++++++++
 .../CalendarDatePicker.Properties.cs           | 18 ++++++++++++++++++
 .../NumericUpDown/NumericUpDown.cs             | 10 ++++++++++
 src/Avalonia.Controls/TextBox.cs               | 12 ++++++++++++
 4 files changed, 52 insertions(+)

diff --git a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
index 90cedbce8c7..641257d3adf 100644
--- a/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox/AutoCompleteBox.Properties.cs
@@ -27,6 +27,8 @@ public partial class AutoCompleteBox
         /// <summary>
         /// Defines the <see cref="PlaceholderText"/> property.
         /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1013",
+            Justification = "We keep WatermarkProperty for backward compatibility.")]
         public static readonly StyledProperty<string?> PlaceholderTextProperty =
             TextBox.PlaceholderTextProperty.AddOwner<AutoCompleteBox>();
 
@@ -34,11 +36,15 @@ public partial class AutoCompleteBox
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
         [Obsolete("Use PlaceholderTextProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
         /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1013",
+            Justification = "We keep WatermarkForegroundProperty for backward compatibility.")]
         public static readonly StyledProperty<Media.IBrush?> PlaceholderForegroundProperty =
             TextBox.PlaceholderForegroundProperty.AddOwner<AutoCompleteBox>();
 
@@ -46,6 +52,8 @@ public partial class AutoCompleteBox
         /// Defines the <see cref="WatermarkForeground"/> property.
         /// </summary>
         [Obsolete("Use PlaceholderForegroundProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty = PlaceholderForegroundProperty;
 
         /// <summary>
@@ -447,6 +455,8 @@ public string? PlaceholderText
         public string? Watermark
         {
             get => PlaceholderText;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => PlaceholderText = value;
         }
 
@@ -466,6 +476,8 @@ public Media.IBrush? PlaceholderForeground
         public Media.IBrush? WatermarkForeground
         {
             get => PlaceholderForeground;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => PlaceholderForeground = value;
         }
 
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
index ffab7e880bb..160ce031e2f 100644
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
@@ -83,6 +83,8 @@ public partial class CalendarDatePicker
         /// <summary>
         /// Defines the <see cref="PlaceholderText"/> property.
         /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1013",
+            Justification = "We keep WatermarkProperty for backward compatibility.")]
         public static readonly StyledProperty<string?> PlaceholderTextProperty =
             TextBox.PlaceholderTextProperty.AddOwner<CalendarDatePicker>();
 
@@ -90,11 +92,15 @@ public partial class CalendarDatePicker
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
         [Obsolete("Use PlaceholderTextProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
         /// Defines the <see cref="UseFloatingPlaceholderText"/> property.
         /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1013",
+            Justification = "We keep UseFloatingWatermarkProperty for backward compatibility.")]
         public static readonly StyledProperty<bool> UseFloatingPlaceholderTextProperty =
             TextBox.UseFloatingPlaceholderTextProperty.AddOwner<CalendarDatePicker>();
 
@@ -102,11 +108,15 @@ public partial class CalendarDatePicker
         /// Defines the <see cref="UseFloatingWatermark"/> property.
         /// </summary>
         [Obsolete("Use UseFloatingPlaceholderTextProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderTextProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
         /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1013",
+            Justification = "We keep WatermarkForegroundProperty for backward compatibility.")]
         public static readonly StyledProperty<Media.IBrush?> PlaceholderForegroundProperty =
             TextBox.PlaceholderForegroundProperty.AddOwner<CalendarDatePicker>();
 
@@ -114,6 +124,8 @@ public partial class CalendarDatePicker
         /// Defines the <see cref="WatermarkForeground"/> property.
         /// </summary>
         [Obsolete("Use PlaceholderForegroundProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty = PlaceholderForegroundProperty;
 
         /// <summary>
@@ -290,6 +302,8 @@ public string? PlaceholderText
         public string? Watermark
         {
             get => PlaceholderText;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => PlaceholderText = value;
         }
 
@@ -305,6 +319,8 @@ public bool UseFloatingPlaceholderText
         public bool UseFloatingWatermark
         {
             get => UseFloatingPlaceholderText;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => UseFloatingPlaceholderText = value;
         }
 
@@ -320,6 +336,8 @@ public Media.IBrush? PlaceholderForeground
         public Media.IBrush? WatermarkForeground
         {
             get => PlaceholderForeground;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => PlaceholderForeground = value;
         }
 
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index 453c7524c2a..ab3861db474 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -118,11 +118,15 @@ public class NumericUpDown : TemplatedControl
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
         [Obsolete("Use PlaceholderTextProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
         /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1013",
+            Justification = "We keep WatermarkForegroundProperty for backward compatibility.")]
         public static readonly StyledProperty<Media.IBrush?> PlaceholderForegroundProperty =
             TextBox.PlaceholderForegroundProperty.AddOwner<NumericUpDown>();
 
@@ -130,6 +134,8 @@ public class NumericUpDown : TemplatedControl
         /// Defines the <see cref="WatermarkForeground"/> property.
         /// </summary>
         [Obsolete("Use PlaceholderForegroundProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<Media.IBrush?> WatermarkForegroundProperty = PlaceholderForegroundProperty;
 
         /// <summary>
@@ -325,6 +331,8 @@ public string? PlaceholderText
         public string? Watermark
         {
             get => PlaceholderText;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => PlaceholderText = value;
         }
 
@@ -344,6 +352,8 @@ public Media.IBrush? PlaceholderForeground
         public Media.IBrush? WatermarkForeground
         {
             get => PlaceholderForeground;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => PlaceholderForeground = value;
         }
 
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 58af074c654..42aaecdda77 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -190,6 +190,8 @@ public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.I
         /// Defines the <see cref="Watermark"/> property.
         /// </summary>
         [Obsolete("Use PlaceholderTextProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
@@ -202,6 +204,8 @@ public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.I
         /// Defines the <see cref="UseFloatingWatermark"/> property.
         /// </summary>
         [Obsolete("Use UseFloatingPlaceholderTextProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderTextProperty;
 
         /// <summary>
@@ -214,6 +218,8 @@ public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.I
         /// Defines the <see cref="WatermarkForeground"/> property.
         /// </summary>
         [Obsolete("Use PlaceholderForegroundProperty instead.", false)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
+            Justification = "Obsolete property alias for backward compatibility.")]
         public static readonly StyledProperty<IBrush?> WatermarkForegroundProperty = PlaceholderForegroundProperty;
 
         /// <summary>
@@ -703,6 +709,8 @@ public string? PlaceholderText
         public string? Watermark
         {
             get => PlaceholderText;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => PlaceholderText = value;
         }
 
@@ -724,6 +732,8 @@ public bool UseFloatingPlaceholderText
         public bool UseFloatingWatermark
         {
             get => UseFloatingPlaceholderText;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => UseFloatingPlaceholderText = value;
         }
 
@@ -743,6 +753,8 @@ public IBrush? PlaceholderForeground
         public IBrush? WatermarkForeground
         {
             get => PlaceholderForeground;
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
+                Justification = "Obsolete property setter for backward compatibility.")]
             set => PlaceholderForeground = value;
         }
 

From be2a8c8bf23d6ce7bac8e2f1d2d589114b9dcfe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Feb 2026 16:19:01 +0100
Subject: [PATCH 10/11] Use UseFloatingPlaceholder

---
 samples/BindingDemo/MainWindow.xaml           | 30 +++++++++----------
 .../Pages/CalendarDatePickerPage.xaml         |  2 +-
 samples/ControlCatalog/Pages/TextBoxPage.xaml |  6 ++--
 .../Controls/SignUpView.xaml                  |  6 ++--
 .../Pages/ScreensPage.axaml                   | 14 ++++-----
 .../CalendarDatePicker.Properties.cs          | 24 +++++++--------
 .../CalendarDatePicker/CalendarDatePicker.cs  |  2 +-
 src/Avalonia.Controls/TextBox.cs              | 22 +++++++-------
 .../Controls/CalendarDatePicker.xaml          |  2 +-
 .../Controls/TextBox.xaml                     |  6 ++--
 .../Controls/CalendarDatePicker.xaml          |  2 +-
 .../Controls/TextBox.xaml                     |  2 +-
 12 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/samples/BindingDemo/MainWindow.xaml b/samples/BindingDemo/MainWindow.xaml
index 7fc9014b8ba..3ff80069f46 100644
--- a/samples/BindingDemo/MainWindow.xaml
+++ b/samples/BindingDemo/MainWindow.xaml
@@ -20,22 +20,22 @@
         <StackPanel Orientation="Horizontal">
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Simple Bindings"/>
-            <TextBox PlaceholderText="Two Way" UseFloatingPlaceholderText="True" Text="{Binding Path=StringValue}" Name="first"/>
-            <TextBox PlaceholderText="Two Way (LostFocus)" UseFloatingPlaceholderText="True" Text="{Binding Path=StringValue, UpdateSourceTrigger=LostFocus}"/>
-            <TextBox PlaceholderText="One Way" UseFloatingPlaceholderText="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
-            <TextBox PlaceholderText="One Time" UseFloatingPlaceholderText="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
+            <TextBox PlaceholderText="Two Way" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue}" Name="first"/>
+            <TextBox PlaceholderText="Two Way (LostFocus)" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, UpdateSourceTrigger=LostFocus}"/>
+            <TextBox PlaceholderText="One Way" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
+            <TextBox PlaceholderText="One Time" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
             <!-- Removed due to #2983: reinstate when that's fixed.
               <TextBox Placeholder="One Way to Source" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneWayToSource}"/>
             -->
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Collection Bindings"/>
-            <TextBox PlaceholderText="Items[1].Value" UseFloatingPlaceholderText="True" Text="{Binding Path=Items[1].Value}"/>
+            <TextBox PlaceholderText="Items[1].Value" UseFloatingPlaceholder="True" Text="{Binding Path=Items[1].Value}"/>
             <Button Command="{Binding ShuffleItems}">Shuffle</Button>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200">
             <TextBlock FontSize="16" Text="Negated Bindings"/>
-            <TextBox PlaceholderText="Boolean String" UseFloatingPlaceholderText="True" Text="{Binding Path=BooleanString}"/>
+            <TextBox PlaceholderText="Boolean String" UseFloatingPlaceholder="True" Text="{Binding Path=BooleanString}"/>
             <CheckBox IsChecked="{Binding !BooleanString}">!BooleanString</CheckBox>
             <CheckBox IsChecked="{Binding !!BooleanString}">!!BooleanString</CheckBox>
           </StackPanel>
@@ -43,17 +43,17 @@
         <StackPanel Orientation="Horizontal">
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
             <TextBlock FontSize="16" Text="Numeric Bindings"/>
-            <TextBox PlaceholderText="Double" UseFloatingPlaceholderText="True" Text="{Binding Path=DoubleValue, Mode=TwoWay}"/>
+            <TextBox PlaceholderText="Double" UseFloatingPlaceholder="True" Text="{Binding Path=DoubleValue, Mode=TwoWay}"/>
             <TextBlock Text="{Binding Path=DoubleValue}"/>
             <ProgressBar Maximum="10" Value="{Binding DoubleValue}"/>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
             <TextBlock FontSize="16" Text="Binding Sources"/>
-            <TextBox PlaceholderText="Value of first TextBox" UseFloatingPlaceholderText="True"
+            <TextBox PlaceholderText="Value of first TextBox" UseFloatingPlaceholder="True"
                      Text="{Binding #first.Text, Mode=TwoWay}"/>
-            <TextBox PlaceholderText="Value of SharedItem.StringValue" UseFloatingPlaceholderText="True"
+            <TextBox PlaceholderText="Value of SharedItem.StringValue" UseFloatingPlaceholder="True"
                      Text="{Binding Value, Source={StaticResource SharedItem}, Mode=TwoWay, DataType={x:Type vm:MainWindowViewModel+TestItem, x:TypeArguments=x:String}}"/>
-            <TextBox PlaceholderText="Value of SharedItem.StringValue (duplicate)" UseFloatingPlaceholderText="True"
+            <TextBox PlaceholderText="Value of SharedItem.StringValue (duplicate)" UseFloatingPlaceholder="True"
                      Text="{Binding Value, Source={StaticResource SharedItem}, Mode=TwoWay, DataType={x:Type vm:MainWindowViewModel+TestItem, x:TypeArguments=x:String}}"/>
           </StackPanel>
           <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
@@ -93,17 +93,17 @@
       <StackPanel Orientation="Horizontal">
          <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding ExceptionDataValidation}">
           <TextBlock FontSize="16" Text="Exception Validation"/>
-          <TextBox PlaceholderText="Less Than 10" UseFloatingPlaceholderText="True" Text="{Binding Path=LessThan10}"/>
+          <TextBox PlaceholderText="Less Than 10" UseFloatingPlaceholder="True" Text="{Binding Path=LessThan10}"/>
         </StackPanel>
         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding IndeiDataValidation}">
           <TextBlock FontSize="16" Text="INotifyDataErrorInfo Validation"/>
-            <TextBox PlaceholderText="Maximum" UseFloatingPlaceholderText="True" Text="{Binding Path=Maximum}"/>
-            <TextBox PlaceholderText="Value" UseFloatingPlaceholderText="True" Text="{Binding Path=Value}"/>
+            <TextBox PlaceholderText="Maximum" UseFloatingPlaceholder="True" Text="{Binding Path=Maximum}"/>
+            <TextBox PlaceholderText="Value" UseFloatingPlaceholder="True" Text="{Binding Path=Value}"/>
         </StackPanel>
          <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding DataAnnotationsValidation}">
           <TextBlock FontSize="16" Text="Data Annotations Validation"/>
-          <TextBox PlaceholderText="Phone #" UseFloatingPlaceholderText="True" Text="{Binding PhoneNumber}"/>
-          <TextBox PlaceholderText="Less Than 10" UseFloatingPlaceholderText="True" Text="{Binding Path=LessThan10}"/>
+          <TextBox PlaceholderText="Phone #" UseFloatingPlaceholder="True" Text="{Binding PhoneNumber}"/>
+          <TextBox PlaceholderText="Less Than 10" UseFloatingPlaceholder="True" Text="{Binding Path=LessThan10}"/>
         </StackPanel>
       </StackPanel>
     </TabItem>
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 2975255e8b2..8734758d263 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -36,7 +36,7 @@
         <CalendarDatePicker Margin="0,0,0,8"
                     Name="DatePicker5"
                     PlaceholderText="Floating Placeholder"
-                    UseFloatingPlaceholderText="True"/>
+                    UseFloatingPlaceholder="True"/>
 
         <TextBlock Text="PlaceholderText with custom color"/>
         <CalendarDatePicker Margin="0,0,0,8"
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index 7ae755c5944..346e561dfc2 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -21,14 +21,14 @@
         <TextBox Width="200" PlaceholderText="Numeric with placeholder" TextInputOptions.ContentType="Number" />
         <TextBox Width="200"
                  PlaceholderText="Floating Placeholder"
-                 UseFloatingPlaceholderText="True"
+                 UseFloatingPlaceholder="True"
                  Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
         <TextBox Width="200"
                  PlaceholderText="Custom Placeholder Color"
                  PlaceholderForeground="Red"/>
         <TextBox Width="200"
                  PlaceholderText="Floating Placeholder Color"
-                 UseFloatingPlaceholderText="True"
+                 UseFloatingPlaceholder="True"
                  PlaceholderForeground="Purple"/>
         <MaskedTextBox Width="200" ResetOnSpace="False"  Mask="(LLL) 999-0000"/>
 
@@ -42,7 +42,7 @@
                  PlaceholderText="Password Box"
                  Classes="revealPasswordButton"
                  TextInputOptions.ContentType="Password"
-                 UseFloatingPlaceholderText="True"
+                 UseFloatingPlaceholder="True"
                  PasswordChar="*"
                  Text="Password" />
         <TextBox Width="200" PlaceholderText="Suggestions are hidden" TextInputOptions.ShowSuggestions="False" />
diff --git a/samples/Generators.Sandbox/Controls/SignUpView.xaml b/samples/Generators.Sandbox/Controls/SignUpView.xaml
index 5bcb16ee53c..09313705f40 100644
--- a/samples/Generators.Sandbox/Controls/SignUpView.xaml
+++ b/samples/Generators.Sandbox/Controls/SignUpView.xaml
@@ -18,7 +18,7 @@
                  x:Name="UserNameTextBox"
                  Text="{Binding UserName}"
                   PlaceholderText="Please, enter user name..."
-                  UseFloatingPlaceholderText="True" />
+                  UseFloatingPlaceholder="True" />
         <TextBlock x:Name="UserNameValidation"
                    Text="{Binding UserNameValidation}"
                    Foreground="Green"
@@ -27,7 +27,7 @@
                  x:Name="PasswordTextBox"
                  Text="{Binding Password}"
                  PlaceholderText="Please, enter your password..."
-                 UseFloatingPlaceholderText="True"
+                 UseFloatingPlaceholder="True"
                  PasswordChar="*" />
         <TextBlock x:Name="PasswordValidation"
                    Text="{Binding PasswordValidation}"
@@ -37,7 +37,7 @@
                  x:Name="ConfirmPasswordTextBox"
                  Text="{Binding ConfirmPassword}"
                  PlaceholderText="Please, confirm the password..."
-                 UseFloatingPlaceholderText="True"
+                 UseFloatingPlaceholder="True"
                  PasswordChar="*" />
         <TextBlock x:Name="ConfirmPasswordValidation"
                    Text="{Binding ConfirmPasswordValidation}"
diff --git a/samples/IntegrationTestApp/Pages/ScreensPage.axaml b/samples/IntegrationTestApp/Pages/ScreensPage.axaml
index 011030e79e7..7f0b341714f 100644
--- a/samples/IntegrationTestApp/Pages/ScreensPage.axaml
+++ b/samples/IntegrationTestApp/Pages/ScreensPage.axaml
@@ -8,12 +8,12 @@
     <Button Name="ScreenRefresh"
             Content="Refresh"
             Click="ScreenRefresh_Click"/>
-    <TextBox Name="ScreenName" PlaceholderText="DisplayName" UseFloatingPlaceholderText="true" />
-    <TextBox Name="ScreenHandle" PlaceholderText="Handle" UseFloatingPlaceholderText="true" />
-    <TextBox Name="ScreenScaling" PlaceholderText="Scaling" UseFloatingPlaceholderText="true" />
-    <TextBox Name="ScreenBounds" PlaceholderText="Bounds" UseFloatingPlaceholderText="true" />
-    <TextBox Name="ScreenWorkArea" PlaceholderText="WorkArea" UseFloatingPlaceholderText="true" />
-    <TextBox Name="ScreenOrientation" PlaceholderText="Orientation" UseFloatingPlaceholderText="true" />
-    <TextBox Name="ScreenSameReference" PlaceholderText="Is same reference" UseFloatingPlaceholderText="true" />
+    <TextBox Name="ScreenName" PlaceholderText="DisplayName" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenHandle" PlaceholderText="Handle" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenScaling" PlaceholderText="Scaling" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenBounds" PlaceholderText="Bounds" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenWorkArea" PlaceholderText="WorkArea" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenOrientation" PlaceholderText="Orientation" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenSameReference" PlaceholderText="Is same reference" UseFloatingPlaceholder="true" />
   </StackPanel>
 </UserControl>
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
index 160ce031e2f..864ba86ef08 100644
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
@@ -97,20 +97,20 @@ public partial class CalendarDatePicker
         public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
-        /// Defines the <see cref="UseFloatingPlaceholderText"/> property.
+        /// Defines the <see cref="UseFloatingPlaceholder"/> property.
         /// </summary>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1013",
             Justification = "We keep UseFloatingWatermarkProperty for backward compatibility.")]
-        public static readonly StyledProperty<bool> UseFloatingPlaceholderTextProperty =
-            TextBox.UseFloatingPlaceholderTextProperty.AddOwner<CalendarDatePicker>();
+        public static readonly StyledProperty<bool> UseFloatingPlaceholderProperty =
+            TextBox.UseFloatingPlaceholderProperty.AddOwner<CalendarDatePicker>();
 
         /// <summary>
         /// Defines the <see cref="UseFloatingWatermark"/> property.
         /// </summary>
-        [Obsolete("Use UseFloatingPlaceholderTextProperty instead.", false)]
+        [Obsolete("Use UseFloatingPlaceholderProperty instead.", false)]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
             Justification = "Obsolete property alias for backward compatibility.")]
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderTextProperty;
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
@@ -307,21 +307,21 @@ public string? Watermark
             set => PlaceholderText = value;
         }
 
-        /// <inheritdoc cref="TextBox.UseFloatingPlaceholderText"/>
-        public bool UseFloatingPlaceholderText
+        /// <inheritdoc cref="TextBox.UseFloatingPlaceholder"/>
+        public bool UseFloatingPlaceholder
         {
-            get => GetValue(UseFloatingPlaceholderTextProperty);
-            set => SetValue(UseFloatingPlaceholderTextProperty, value);
+            get => GetValue(UseFloatingPlaceholderProperty);
+            set => SetValue(UseFloatingPlaceholderProperty, value);
         }
 
         /// <inheritdoc cref="TextBox.UseFloatingWatermark"/>
-        [Obsolete("Use UseFloatingPlaceholderText instead.", false)]
+        [Obsolete("Use UseFloatingPlaceholder instead.", false)]
         public bool UseFloatingWatermark
         {
-            get => UseFloatingPlaceholderText;
+            get => UseFloatingPlaceholder;
             [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
                 Justification = "Obsolete property setter for backward compatibility.")]
-            set => UseFloatingPlaceholderText = value;
+            set => UseFloatingPlaceholder = value;
         }
 
         /// <inheritdoc cref="TextBox.PlaceholderForeground"/>
diff --git a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
index a37c3b2d53d..c07d43b77c0 100644
--- a/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
@@ -881,7 +881,7 @@ private void SetWaterMarkText()
             {
                 SetCurrentValue(TextProperty, String.Empty);
 
-                if (string.IsNullOrEmpty(PlaceholderText) && !UseFloatingPlaceholderText)
+                if (string.IsNullOrEmpty(PlaceholderText) && !UseFloatingPlaceholder)
                 {
                     DateTimeFormatInfo dtfi = DateTimeHelper.GetCurrentDateFormat();
                     _defaultText = string.Empty;
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 42aaecdda77..447a6a41fcf 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -195,18 +195,18 @@ public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.I
         public static readonly StyledProperty<string?> WatermarkProperty = PlaceholderTextProperty;
 
         /// <summary>
-        /// Defines the <see cref="UseFloatingPlaceholderText"/> property.
+        /// Defines the <see cref="UseFloatingPlaceholder"/> property.
         /// </summary>
-        public static readonly StyledProperty<bool> UseFloatingPlaceholderTextProperty =
-            AvaloniaProperty.Register<TextBox, bool>(nameof(UseFloatingPlaceholderText));
+        public static readonly StyledProperty<bool> UseFloatingPlaceholderProperty =
+            AvaloniaProperty.Register<TextBox, bool>(nameof(UseFloatingPlaceholder));
 
         /// <summary>
         /// Defines the <see cref="UseFloatingWatermark"/> property.
         /// </summary>
-        [Obsolete("Use UseFloatingPlaceholderTextProperty instead.", false)]
+        [Obsolete("Use UseFloatingPlaceholderProperty instead.", false)]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1022",
             Justification = "Obsolete property alias for backward compatibility.")]
-        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderTextProperty;
+        public static readonly StyledProperty<bool> UseFloatingWatermarkProperty = UseFloatingPlaceholderProperty;
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
@@ -718,23 +718,23 @@ public string? Watermark
         /// Gets or sets a value indicating whether the <see cref="PlaceholderText"/> will still be shown above the
         /// <see cref="Text"/> even after a text value is set.
         /// </summary>
-        public bool UseFloatingPlaceholderText
+        public bool UseFloatingPlaceholder
         {
-            get => GetValue(UseFloatingPlaceholderTextProperty);
-            set => SetValue(UseFloatingPlaceholderTextProperty, value);
+            get => GetValue(UseFloatingPlaceholderProperty);
+            set => SetValue(UseFloatingPlaceholderProperty, value);
         }
 
         /// <summary>
         /// Gets or sets a value indicating whether the <see cref="PlaceholderText"/> will still be shown above the
         /// <see cref="Text"/> even after a text value is set.
         /// </summary>
-        [Obsolete("Use UseFloatingPlaceholderText instead.", false)]
+        [Obsolete("Use UseFloatingPlaceholder instead.", false)]
         public bool UseFloatingWatermark
         {
-            get => UseFloatingPlaceholderText;
+            get => UseFloatingPlaceholder;
             [System.Diagnostics.CodeAnalysis.SuppressMessage("AvaloniaProperty", "AVP1012",
                 Justification = "Obsolete property setter for backward compatibility.")]
-            set => UseFloatingPlaceholderText = value;
+            set => UseFloatingPlaceholder = value;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index b8914f74237..3a8db8ae361 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -94,7 +94,7 @@
                        Padding="{TemplateBinding Padding}"
                        PlaceholderText="{TemplateBinding PlaceholderText}"
                        PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
-                       UseFloatingPlaceholderText="{TemplateBinding UseFloatingPlaceholderText}"
+                       UseFloatingPlaceholder="{TemplateBinding UseFloatingPlaceholder}"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index b420d4ff01c..5cd5f84204d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -10,8 +10,8 @@
         <TextBox PasswordChar="*" Classes="revealPasswordButton">Reveal Password</TextBox>
         <TextBox PasswordChar="*" Classes="revealPasswordButton" RevealPassword="True">Password Revealed</TextBox>
         <TextBox PlaceholderText="Placeholder"/>
-        <TextBox PlaceholderText="Floating Placeholder" UseFloatingPlaceholderText="True"/>
-        <TextBox PlaceholderText="Floating Placeholder" UseFloatingPlaceholderText="True">Content</TextBox>
+        <TextBox PlaceholderText="Floating Placeholder" UseFloatingPlaceholder="True"/>
+        <TextBox PlaceholderText="Floating Placeholder" UseFloatingPlaceholder="True">Content</TextBox>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
@@ -239,7 +239,7 @@
       <Setter Property="Cursor" Value="IBeam"/>
     </Style>
 
-    <Style Selector="^[UseFloatingPlaceholderText=true]:not(:empty) /template/ TextBlock#PART_FloatingPlaceholder">
+    <Style Selector="^[UseFloatingPlaceholder=true]:not(:empty) /template/ TextBlock#PART_FloatingPlaceholder">
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
index e49905eff48..a38f6f912dc 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
@@ -101,7 +101,7 @@
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   UseFloatingPlaceholderText="{TemplateBinding UseFloatingPlaceholderText}"
+                   UseFloatingPlaceholder="{TemplateBinding UseFloatingPlaceholder}"
                    PlaceholderText="{TemplateBinding PlaceholderText}"
                    PlaceholderForeground="{TemplateBinding PlaceholderForeground}" />
 
diff --git a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
index 6e56e4a3103..f49e6317d0e 100644
--- a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -110,7 +110,7 @@
                        Text="{TemplateBinding PlaceholderText}">
               <TextBlock.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
-                  <Binding Path="UseFloatingPlaceholderText"
+                  <Binding Path="UseFloatingPlaceholder"
                            RelativeSource="{RelativeSource TemplatedParent}" />
                   <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                            Path="Text"

From f2dc15f71da4d85e286f13d034b0d1c4f58b195e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Feb 2026 16:34:46 +0100
Subject: [PATCH 11/11] Fix tests

---
 tests/Avalonia.RenderTests/Controls/TextBoxTests.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
index 6e8608b8b10..8047f2d103e 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBoxTests.cs
@@ -29,6 +29,9 @@ private static IControlTemplate CreateTextBoxTemplate()
 
                 var panel = new Panel();
 
+                // Use Antialias mode
+                TextOptions.SetTextRenderingMode(panel, TextRenderingMode.Antialias);
+
                 var placeholder = new TextBlock
                 {
                     Name = "PART_Placeholder",