diff --git a/src/Avalonia/Directory.Build.props b/src/Avalonia/Directory.Build.props
index 9ed3221f9..336c213bd 100644
--- a/src/Avalonia/Directory.Build.props
+++ b/src/Avalonia/Directory.Build.props
@@ -1,8 +1,8 @@
-<Project>
+<Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <TargetFramework>net9.0</TargetFramework>
-    <AvaloniaVersion>11.3.6</AvaloniaVersion>
+    <AvaloniaVersion>12.0.1</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/App.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/App.axaml.cs
index 78d6b88ed..90d3ab92c 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/App.axaml.cs
+++ b/src/Avalonia/HandyControlDemo_Avalonia/App.axaml.cs
@@ -18,7 +18,6 @@ public override void Initialize()
     public override void OnFrameworkInitializationCompleted()
     {
         Properties.Langs.Lang.Culture = new CultureInfo("en");
-        RemoveDefaultDataValidator();
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
@@ -27,17 +26,4 @@ public override void OnFrameworkInitializationCompleted()
 
         base.OnFrameworkInitializationCompleted();
     }
-
-    private static void RemoveDefaultDataValidator()
-    {
-        // Get an array of plugins to remove
-        var dataValidationPluginsToRemove =
-            BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
-
-        // remove each entry found
-        foreach (var plugin in dataValidationPluginsToRemove)
-        {
-            BindingPlugins.DataValidators.Remove(plugin);
-        }
-    }
 }
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Main/LeftMainContent.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Main/LeftMainContent.axaml
index 58cb4fb21..ed917abb2 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Main/LeftMainContent.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Main/LeftMainContent.axaml
@@ -3,6 +3,8 @@
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:data="clr-namespace:HandyControlDemo.Data"
+             xmlns:vm="using:HandyControlDemo.ViewModel"
+             x:DataType="{x:Type vm:MainViewModel}"
              Margin="16,16,0,16"
              CornerRadius="10"
              Effect="{StaticResource EffectShadow4}">
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Main/MainContent.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Main/MainContent.axaml
index 7f72e59aa..4fb52c327 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Main/MainContent.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Main/MainContent.axaml
@@ -1,5 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.MainContent"
              xmlns="https://github.com/avaloniaui"
+             xmlns:vm="using:HandyControlDemo.ViewModel"
+             x:DataType="{x:Type vm:MainViewModel}"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Panel>
         <Border Margin="16">
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/AutoCompleteBoxDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/AutoCompleteBoxDemo.axaml
index 22686e938..1a6bc501f 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/AutoCompleteBoxDemo.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/AutoCompleteBoxDemo.axaml
@@ -1,6 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:data="using:HandyControlDemo.Data"
+             x:DataType="{x:Type data:DemoDataModel}"
              x:Class="HandyControlDemo.UserControl.AutoCompleteBoxDemo">
     <ScrollViewer>
         <hc:UniformSpacingPanel Spacing="32"
@@ -36,7 +38,7 @@
                                  FilterMode="Contains"
                                  Margin="0,16,0,0"
                                  IsEnabled="False" />
-                <AutoCompleteBox Watermark="please enter content"
+                <AutoCompleteBox PlaceholderText="please enter content"
                                  hc:TitleElement.Title="This item must be filled in"
                                  Theme="{StaticResource AutoCompleteBoxExtend}"
                                  ItemsSource="{Binding DataList}"
@@ -55,7 +57,7 @@
                                  Margin="0,32,0,0" />
                 <AutoCompleteBox Width="380"
                                  hc:TitleElement.TitleWidth="120"
-                                 Watermark="Please enter content"
+                                 PlaceholderText="Please enter content"
                                  hc:TitleElement.TitlePlacement="Left"
                                  hc:TitleElement.Title="The title is on the left"
                                  hc:InfoElement.Necessary="True"
@@ -97,7 +99,7 @@
                                  FilterMode="Contains"
                                  Margin="0,16,0,0"
                                  IsEnabled="False" />
-                <AutoCompleteBox Watermark="please enter content"
+                <AutoCompleteBox PlaceholderText="please enter content"
                                  hc:TitleElement.Title="This item must be filled in"
                                  Theme="{StaticResource AutoCompleteBoxExtend.Small}"
                                  ItemsSource="{Binding DataList}"
@@ -116,7 +118,7 @@
                                  Margin="0,32,0,0" />
                 <AutoCompleteBox Width="380"
                                  hc:TitleElement.TitleWidth="120"
-                                 Watermark="Please enter content"
+                                 PlaceholderText="Please enter content"
                                  hc:TitleElement.TitlePlacement="Left"
                                  hc:TitleElement.Title="The title is on the left"
                                  hc:InfoElement.Necessary="True"
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ComboBoxDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ComboBoxDemo.axaml
index efe0338bc..fec9d5a09 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ComboBoxDemo.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ComboBoxDemo.axaml
@@ -1,10 +1,13 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:vm="clr-namespace:HandyControlDemo.ViewModel"
              x:Class="HandyControlDemo.UserControl.ComboBoxDemo"
-             DataContext="{Binding InputElementDemo, Source={x:Static vm:ViewModelLocator.Instance}}">
-    <ScrollViewer>
+             x:DataType="vm:InputElementDemoViewModel"
+             x:CompileBindings="False"
+             DataContext="{Binding InputElementDemo, Source={x:Static vm:ViewModelLocator.Instance}}"
+             >
+    <ScrollViewer >
         <hc:UniformSpacingPanel Spacing="32"
                                 Margin="32"
                                 ChildWrapping="Wrap">
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ListBoxDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ListBoxDemo.axaml
index 4e0bffac3..1b112bb84 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ListBoxDemo.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/ListBoxDemo.axaml
@@ -1,5 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:data="using:HandyControlDemo.Data"
+             x:DataType="{x:Type data:DemoDataModel}"
              x:Class="HandyControlDemo.UserControl.ListBoxDemo">
     <WrapPanel Margin="16">
         <ListBox Margin="16"
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/MenuDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/MenuDemo.axaml
index 359d934c2..78dec7146 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/MenuDemo.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/MenuDemo.axaml
@@ -1,6 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:data="using:HandyControlDemo.Data"
+             x:DataType="{x:Type data:DemoDataModel}"
              x:Class="HandyControlDemo.UserControl.MenuDemo">
     <hc:UniformSpacingPanel Spacing="16"
                             Margin="32">
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NumericUpDownDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NumericUpDownDemo.axaml
index 677d506c9..527158dbe 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NumericUpDownDemo.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NumericUpDownDemo.axaml
@@ -1,8 +1,10 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:vm="clr-namespace:HandyControlDemo.ViewModel"
              x:Class="HandyControlDemo.UserControl.NumericUpDownDemo"
+             x:DataType="{x:Type vm:InputElementDemoViewModel}"
+             x:CompileBindings="False"
              DataContext="{Binding InputElementDemo, Source={x:Static vm:ViewModelLocator.Instance}}">
     <ScrollViewer>
         <hc:UniformSpacingPanel Spacing="32"
@@ -21,7 +23,7 @@
                                hc:TitleElement.Title="This is the title"
                                Theme="{StaticResource NumericUpDownExtend}" />
                 <NumericUpDown Value="0"
-                               Watermark="Please enter content"
+                               PlaceholderText="Please enter content"
                                hc:TitleElement.Title="This is the title"
                                hc:InfoElement.Necessary="True"
                                Theme="{StaticResource NumericUpDownExtend}" />
@@ -36,7 +38,7 @@
                                Value="10000"
                                Width="380"
                                hc:TitleElement.TitleWidth="140"
-                               Watermark="Please enter content"
+                               PlaceholderText="Please enter content"
                                hc:TitleElement.TitlePlacement="Left"
                                hc:TitleElement.Title="The title is on the left"
                                Theme="{StaticResource NumericUpDownExtend}"
@@ -59,7 +61,7 @@
                                hc:TitleElement.Title="This is the title"
                                Theme="{StaticResource NumericUpDownExtend}" />
                 <NumericUpDown Value="0"
-                               Watermark="Please enter content"
+                               PlaceholderText="Please enter content"
                                hc:TitleElement.Title="This is the title"
                                hc:InfoElement.Necessary="True"
                                Theme="{StaticResource NumericUpDownExtend}" />
@@ -74,7 +76,7 @@
                                hc:InfoElement.ShowClearButton="True"
                                Width="380"
                                hc:TitleElement.TitleWidth="140"
-                               Watermark="Please enter content"
+                               PlaceholderText="Please enter content"
                                hc:TitleElement.TitlePlacement="Left"
                                hc:TitleElement.Title="The title is on the left"
                                Theme="{StaticResource NumericUpDownExtend}"
@@ -96,7 +98,7 @@
                                hc:TitleElement.Title="This is the title"
                                Theme="{StaticResource NumericUpDownExtend.Small}" />
                 <NumericUpDown Value="0"
-                               Watermark="Please enter content"
+                               PlaceholderText="Please enter content"
                                hc:TitleElement.Title="This is the title"
                                hc:InfoElement.Necessary="True"
                                Theme="{StaticResource NumericUpDownExtend.Small}" />
@@ -111,7 +113,7 @@
                                Value="10000"
                                Width="380"
                                hc:TitleElement.TitleWidth="140"
-                               Watermark="Please enter content"
+                               PlaceholderText="Please enter content"
                                hc:TitleElement.TitlePlacement="Left"
                                hc:TitleElement.Title="The title is on the left"
                                Theme="{StaticResource NumericUpDownExtend.Small}"
@@ -134,7 +136,7 @@
                                hc:TitleElement.Title="This is the title"
                                Theme="{StaticResource NumericUpDownExtend.Small}" />
                 <NumericUpDown Value="0"
-                               Watermark="Please enter content"
+                               PlaceholderText="Please enter content"
                                hc:TitleElement.Title="This is the title"
                                hc:InfoElement.Necessary="True"
                                Theme="{StaticResource NumericUpDownExtend.Small}" />
@@ -149,7 +151,7 @@
                                hc:InfoElement.ShowClearButton="True"
                                Width="380"
                                hc:TitleElement.TitleWidth="140"
-                               Watermark="Please enter content"
+                               PlaceholderText="Please enter content"
                                hc:TitleElement.TitlePlacement="Left"
                                hc:TitleElement.Title="The title is on the left"
                                Theme="{StaticResource NumericUpDownExtend.Small}"
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TextBoxDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TextBoxDemo.axaml
index ba4536835..0eabdd4a3 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TextBoxDemo.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TextBoxDemo.axaml
@@ -1,8 +1,10 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:vm="clr-namespace:HandyControlDemo.ViewModel"
              x:Class="HandyControlDemo.UserControl.TextBoxDemo"
+             x:DataType="{x:Type vm:InputElementDemoViewModel}"
+             x:CompileBindings="False"
              DataContext="{Binding InputElementDemo, Source={x:Static vm:ViewModelLocator.Instance}}">
     <ScrollViewer>
         <hc:UniformSpacingPanel Spacing="32"
@@ -28,7 +30,7 @@
                          Margin="0,16,0,0"
                          Text="This is the content"
                          IsEnabled="False" />
-                <TextBox Watermark="please enter email"
+                <TextBox PlaceholderText="please enter email"
                          Text="{Binding Email1, UpdateSourceTrigger=PropertyChanged}"
                          hc:TitleElement.Title="This item must be filled in"
                          Theme="{StaticResource TextBoxExtend}"
@@ -44,7 +46,7 @@
                 <TextBox Width="380"
                          Text="{Binding Text1, UpdateSourceTrigger=PropertyChanged}"
                          hc:TitleElement.TitleWidth="120"
-                         Watermark="Please enter content"
+                         PlaceholderText="Please enter content"
                          hc:TitleElement.TitlePlacement="Left"
                          hc:TitleElement.Title="The title is on the left"
                          hc:InfoElement.Necessary="True"
@@ -74,7 +76,7 @@
                          Margin="0,16,0,0"
                          Text="This is the content"
                          IsEnabled="False" />
-                <TextBox Watermark="please enter email"
+                <TextBox PlaceholderText="please enter email"
                          Text="{Binding Email2, UpdateSourceTrigger=PropertyChanged}"
                          hc:TitleElement.Title="This item must be filled in"
                          Theme="{StaticResource TextBoxExtend.Small}"
@@ -90,7 +92,7 @@
                 <TextBox Width="380"
                          Text="{Binding Text2, UpdateSourceTrigger=PropertyChanged}"
                          hc:TitleElement.TitleWidth="120"
-                         Watermark="Please enter content"
+                         PlaceholderText="Please enter content"
                          hc:TitleElement.TitlePlacement="Left"
                          hc:TitleElement.Title="The title is on the left"
                          hc:InfoElement.Necessary="True"
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TreeViewDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TreeViewDemo.axaml
index 362883c67..344ffaa58 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TreeViewDemo.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TreeViewDemo.axaml
@@ -1,5 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:data="using:HandyControlDemo.Data"
+             x:DataType="{x:Type data:DemoDataModel}"
              x:Class="HandyControlDemo.UserControl.TreeViewDemo">
     <WrapPanel Margin="16">
         <TreeView Width="200"
diff --git a/src/Avalonia/HandyControl_Avalonia/Controls/Other/DashedBorder.cs b/src/Avalonia/HandyControl_Avalonia/Controls/Other/DashedBorder.cs
index ba0037167..f63ed50f2 100644
--- a/src/Avalonia/HandyControl_Avalonia/Controls/Other/DashedBorder.cs
+++ b/src/Avalonia/HandyControl_Avalonia/Controls/Other/DashedBorder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
@@ -145,7 +145,7 @@ private Thickness LayoutThickness
             Thickness thickness = BorderThickness;
             if (UseLayoutRounding)
             {
-                thickness = LayoutHelper.RoundLayoutThickness(thickness, _scale, _scale);
+                thickness = LayoutHelper.RoundLayoutThickness(thickness, _scale);
             }
 
             _layoutThickness = thickness;
diff --git a/src/Avalonia/HandyControl_Avalonia/Controls/Panel/SimplePanel.cs b/src/Avalonia/HandyControl_Avalonia/Controls/Panel/SimplePanel.cs
new file mode 100644
index 000000000..6d24ca17d
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Controls/Panel/SimplePanel.cs
@@ -0,0 +1,41 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+
+namespace HandyControl.Controls;
+
+/// <summary>
+///     用以代替Grid
+/// </summary>
+/// <remarks>
+///     当不需要Grid的行、列分隔等功能时建议用此轻量级类代替
+/// </remarks>
+public class SimplePanel : Panel
+{
+    protected override Size MeasureOverride(Size constraint)
+    {
+        var maxWidth = 0d;
+        var maxHeight = 0d;
+        foreach (Control? child in Children)
+        {
+            if (child != null)
+            {
+                child.Measure(constraint);
+                maxWidth = Math.Max(maxWidth, child.DesiredSize.Width);
+                maxHeight = Math.Max(maxHeight, child.DesiredSize.Height);
+            }
+        }
+
+        return new Size(maxWidth, maxHeight);
+    }
+
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        foreach (Control? child in Children)
+        {
+            child?.Arrange(new Rect(arrangeSize));
+        }
+
+        return arrangeSize;
+    }
+}
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/AutoCompleteBox.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/AutoCompleteBox.axaml
index acc05f8c4..dfdfcfc86 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/AutoCompleteBox.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/AutoCompleteBox.axaml
@@ -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"
                     x:ClassModifier="internal"
                     xmlns:hc="clr-namespace:HandyControl.Controls"
@@ -41,7 +41,7 @@
                              CaretIndex="{TemplateBinding CaretIndex, Mode=TwoWay}"
                              ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
                              DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                             Watermark="{TemplateBinding Watermark}"
+                             PlaceholderText="{TemplateBinding PlaceholderText}"
                              MaxLength="{TemplateBinding MaxLength}" />
                     <Popup Name="PART_Popup"
                            MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
@@ -95,7 +95,7 @@
                 Value="{StaticResource DefaultControlHeight}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <HeaderedContentControl Header="{Binding $parent.(hc:TitleElement.Title)}">
+                <HeaderedContentControl Header="{Binding $parent[AutoCompleteBox].(hc:TitleElement.Title)}">
                     <Panel>
                         <TextBox Name="PART_TextBox"
                                  Padding="{TemplateBinding Padding}"
@@ -107,7 +107,7 @@
                                  CaretIndex="{TemplateBinding CaretIndex, Mode=TwoWay}"
                                  ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
                                  DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                                 Watermark="{TemplateBinding Watermark}"
+                                 PlaceholderText="{TemplateBinding PlaceholderText}"
                                  MaxLength="{TemplateBinding MaxLength}" />
                         <Popup Name="PART_Popup"
                                MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ComboBox.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ComboBox.axaml
index bf6f1d55f..d30b5d314 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ComboBox.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ComboBox.axaml
@@ -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"
                     x:ClassModifier="internal"
                     xmlns:hc="clr-namespace:HandyControl.Controls"
@@ -225,7 +225,7 @@
                 Value="{StaticResource DefaultControlHeight}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <HeaderedContentControl Header="{Binding $parent.(hc:TitleElement.Title)}">
+                <HeaderedContentControl Header="{Binding $parent[ComboBox].(hc:TitleElement.Title)}">
                     <Grid ColumnDefinitions="*,Auto,Auto">
                         <Border x:Name="border"
                                 Grid.ColumnSpan="3"
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/NumericUpDown.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/NumericUpDown.axaml
index 63a5d4952..4b4bcdb9a 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/NumericUpDown.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/NumericUpDown.axaml
@@ -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"
                     x:ClassModifier="internal"
                     xmlns:hc="clr-namespace:HandyControl.Controls"
@@ -57,7 +57,7 @@
                                  MinWidth="0"
                                  MinHeight="{TemplateBinding MinHeight}"
                                  Foreground="{TemplateBinding Foreground}"
-                                 Watermark="{TemplateBinding Watermark}"
+                                 PlaceholderText="{TemplateBinding PlaceholderText}"
                                  IsReadOnly="{TemplateBinding IsReadOnly}"
                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -117,7 +117,7 @@
                 Value="{StaticResource DefaultControlHeight}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <HeaderedContentControl Header="{Binding $parent.(hc:TitleElement.Title)}">
+                <HeaderedContentControl Header="{Binding $parent[NumericUpDown].(hc:TitleElement.Title)}">
                     <ButtonSpinner Name="PART_Spinner"
                                    HorizontalContentAlignment="Stretch"
                                    VerticalContentAlignment="Stretch"
@@ -166,7 +166,7 @@
                                      MinWidth="0"
                                      MinHeight="{TemplateBinding MinHeight}"
                                      Foreground="{TemplateBinding Foreground}"
-                                     Watermark="{TemplateBinding Watermark}"
+                                     PlaceholderText="{TemplateBinding PlaceholderText}"
                                      IsReadOnly="{TemplateBinding IsReadOnly}"
                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/OverlayPopupHost.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/OverlayPopupHost.axaml
index 0922da7fd..7c5f8477b 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/OverlayPopupHost.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/OverlayPopupHost.axaml
@@ -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"
                     x:ClassModifier="internal">
 
@@ -11,7 +11,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-                    <VisualLayerManager IsPopup="True">
+                    <VisualLayerManager>
                         <ContentPresenter Name="PART_ContentPresenter"
                                           Padding="{TemplateBinding Padding}"
                                           Background="{TemplateBinding Background}"
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/PopupRoot.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/PopupRoot.axaml
index 400fa3ee0..a4e51718f 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/PopupRoot.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/PopupRoot.axaml
@@ -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"
                     x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type PopupRoot}"
@@ -15,7 +15,7 @@
                     <Panel>
                         <Border Name="PART_TransparencyFallback"
                                 IsHitTestVisible="False" />
-                        <VisualLayerManager IsPopup="True">
+                        <VisualLayerManager>
                             <ContentPresenter Name="PART_ContentPresenter"
                                               Background="{TemplateBinding Background}"
                                               ContentTemplate="{TemplateBinding ContentTemplate}"
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
index 80e4ca1bb..4b65775ab 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
@@ -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"
                     x:ClassModifier="internal"
                     xmlns:hc="clr-namespace:HandyControl.Controls">
@@ -248,9 +248,9 @@
                 </Style.Animations>
 
                 <Setter Property="Width"
-                        Value="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DoubleExpandConverter}, ConverterParameter=40}" />
+                        Value="{Binding $parent[ProgressBar].Bounds.Width, Converter={StaticResource DoubleExpandConverter}, ConverterParameter=40}" />
                 <Setter Property="Height"
-                        Value="{Binding Bounds.Height, RelativeSource={RelativeSource TemplatedParent}}" />
+                        Value="{Binding $parent[ProgressBar].Bounds.Height}" />
             </Style>
         </Style>
 
@@ -282,9 +282,9 @@
                 </Style.Animations>
 
                 <Setter Property="Width"
-                        Value="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" />
+                        Value="{Binding $parent[ProgressBar].Bounds.Width}" />
                 <Setter Property="Height"
-                        Value="{Binding Bounds.Height, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DoubleExpandConverter}, ConverterParameter=40}" />
+                        Value="{Binding $parent[ProgressBar].Bounds.Height, Converter={StaticResource DoubleExpandConverter}, ConverterParameter=40}" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/TextBox.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/TextBox.axaml
index 5bc5a285e..76c55212d 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/TextBox.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/TextBox.axaml
@@ -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"
                     x:ClassModifier="internal"
                     xmlns:hc="clr-namespace:HandyControl.Controls"
@@ -139,7 +139,7 @@
                 Value="{StaticResource DefaultControlHeight}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <HeaderedContentControl Header="{Binding $parent.(hc:TitleElement.Title)}">
+                <HeaderedContentControl Header="{Binding $parent[TextBox].(hc:TitleElement.Title)}">
                     <Grid ColumnDefinitions="*,Auto">
                         <Border x:Name="border"
                                 Grid.ColumnSpan="2"
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Window.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Window.axaml
index 9f288134e..820b42124 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Window.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Window.axaml
@@ -23,9 +23,6 @@
                     <Panel Background="Transparent"
                            Margin="{TemplateBinding WindowDecorationMargin}" />
                     <VisualLayerManager>
-                        <VisualLayerManager.ChromeOverlayLayer>
-                            <TitleBar />
-                        </VisualLayerManager.ChromeOverlayLayer>
                         <ContentPresenter Name="PART_ContentPresenter"
                                           ContentTemplate="{TemplateBinding ContentTemplate}"
                                           Content="{TemplateBinding Content}"