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/HandyControlDemo_Avalonia.csproj b/src/Avalonia/HandyControlDemo_Avalonia/HandyControlDemo_Avalonia.csproj
index 569b95451..06e25f1be 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/HandyControlDemo_Avalonia.csproj
+++ b/src/Avalonia/HandyControlDemo_Avalonia/HandyControlDemo_Avalonia.csproj
@@ -29,6 +29,10 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0">
+      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@@ -44,6 +48,12 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Lang.resx</DependentUpon>
     </Compile>
+    <Compile Update="UserControl\Styles\SearchBarDemo.axaml.cs">
+      <DependentUpon>SearchBarDemo.axaml</DependentUpon>
+    </Compile>
+    <Compile Update="UserControl\Styles\WindowDemo.axaml.cs">
+      <DependentUpon>WindowDemo.axaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/Program.cs b/src/Avalonia/HandyControlDemo_Avalonia/Program.cs
index 8cc817a5d..94ee99f08 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/Program.cs
+++ b/src/Avalonia/HandyControlDemo_Avalonia/Program.cs
@@ -12,5 +12,8 @@ public static void Main(string[] args) => BuildAvaloniaApp()
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
+#if DEBUG
+            .WithDeveloperTools()
+#endif
             .LogToTrace();
 }
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/SearchBarDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SearchBarDemo.axaml
new file mode 100644
index 000000000..404ab7063
--- /dev/null
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SearchBarDemo.axaml
@@ -0,0 +1,132 @@
+<UserControl
+    DataContext="{Binding InputElementDemo, Source={x:Static vm:ViewModelLocator.Instance}}"
+    x:Class="HandyControlDemo.UserControl.SearchBarDemo"
+    x:CompileBindings="False"
+    x:DataType="{x:Type vm:InputElementDemoViewModel}"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:data="using:HandyControlDemo.Data"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
+    xmlns:vm="using:HandyControlDemo.ViewModel"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ScrollViewer>
+        <hc:UniformSpacingPanel
+            ChildWrapping="Wrap"
+            Margin="32"
+            Spacing="32">
+            <hc:UniformSpacingPanel Orientation="Vertical" Spacing="16">
+                <hc:SearchBar Command="{Binding SearchCommand}" CommandParameter="{Binding Text, RelativeSource={RelativeSource Self}}" />
+                <hc:SearchBar IsEnabled="False" />
+                <hc:SearchBar Theme="{StaticResource SearchBarExtend}" hc:TitleElement.Title="TitleDemoStr1" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarExtend}"
+                    hc:InfoElement.Necessary="True"
+                    hc:InfoElement.Placeholder="PlsEnterContent"
+                    hc:TitleElement.Title="TitleDemoStr1" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarExtend}"
+                    Width="380"
+                    hc:InfoElement.Placeholder="PlsEnterContent"
+                    hc:TitleElement.Title="TitleDemoStr3"
+                    hc:TitleElement.TitlePlacement="Left"
+                    hc:TitleElement.TitleWidth="140" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarExtend}"
+                    Width="380"
+                    hc:InfoElement.Necessary="True"
+                    hc:InfoElement.Placeholder="PlsEnterContent"
+                    hc:TitleElement.Title="TitleDemoStr3"
+                    hc:TitleElement.TitlePlacement="Left"
+                    hc:TitleElement.TitleWidth="140" />
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Orientation="Vertical" Spacing="16">
+                <hc:SearchBar Theme="{StaticResource SearchBarPlus}" hc:InfoElement.ShowClearButton="True" />
+                <hc:SearchBar IsEnabled="False" Theme="{StaticResource SearchBarPlus}" />
+
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarPlus}"
+                    hc:InfoElement.ShowClearButton="True"
+                    hc:TitleElement.Title="TitleDemoStr1" />
+                <hc:SearchBar
+                    Text="{Binding Email1, UpdateSourceTrigger=PropertyChanged}"
+                    Theme="{StaticResource SearchBarPlus}"
+                    hc:InfoElement.Necessary="True"
+                    hc:InfoElement.Placeholder="PlsEnterEmail"
+                    hc:TitleElement.Title="TitleDemoStr1" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarPlus}"
+                    Width="380"
+                    hc:TitleElement.Title="TitleDemoStr3"
+                    hc:TitleElement.TitlePlacement="Left"
+                    hc:TitleElement.TitleWidth="140" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarPlus}"
+                    Width="380"
+                    hc:InfoElement.Necessary="True"
+                    hc:InfoElement.Placeholder="PlsEnterContent"
+                    hc:InfoElement.ShowClearButton="True"
+                    hc:TitleElement.Title="TitleDemoStr3"
+                    hc:TitleElement.TitlePlacement="Left"
+                    hc:TitleElement.TitleWidth="140" />
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Orientation="Vertical" Spacing="16">
+                <hc:SearchBar
+                    Command="{Binding SearchCommand}"
+                    CommandParameter="{Binding Text, RelativeSource={RelativeSource Self}}"
+                    Theme="{StaticResource SearchBar.Small}" />
+                <hc:SearchBar IsEnabled="False" Theme="{StaticResource SearchBar.Small}" />
+
+                <hc:SearchBar Theme="{StaticResource SearchBarExtend.Small}" hc:TitleElement.Title="TitleDemoStr1" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarExtend.Small}"
+                    hc:InfoElement.Necessary="True"
+                    hc:InfoElement.Placeholder="PlsEnterContent"
+                    hc:TitleElement.Title="TitleDemoStr1" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarExtend.Small}"
+                    Width="380"
+                    hc:InfoElement.Placeholder="PlsEnterContent"
+                    hc:TitleElement.Title="TitleDemoStr3"
+                    hc:TitleElement.TitlePlacement="Left"
+                    hc:TitleElement.TitleWidth="140" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarExtend.Small}"
+                    Width="380"
+                    hc:InfoElement.Necessary="True"
+                    hc:InfoElement.Placeholder="PlsEnterContent"
+                    hc:TitleElement.Title="TitleDemoStr3"
+                    hc:TitleElement.TitlePlacement="Left"
+                    hc:TitleElement.TitleWidth="140" />
+            </hc:UniformSpacingPanel>
+            <hc:UniformSpacingPanel Orientation="Vertical" Spacing="16">
+                <hc:SearchBar Theme="{StaticResource SearchBarPlus.Small}" hc:InfoElement.ShowClearButton="True" />
+                <hc:SearchBar IsEnabled="False" Theme="{StaticResource SearchBarPlus.Small}" />
+
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarPlus.Small}"
+                    hc:InfoElement.ShowClearButton="True"
+                    hc:TitleElement.Title="TitleDemoStr1" />
+                <hc:SearchBar
+                    Text="{Binding Email1, UpdateSourceTrigger=PropertyChanged}"
+                    Theme="{StaticResource SearchBarPlus.Small}"
+                    hc:InfoElement.Necessary="True"
+                    hc:InfoElement.Placeholder="PlsEnterEmail"
+                    hc:TitleElement.Title="TitleDemoStr1" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarPlus.Small}"
+                    Width="380"
+                    hc:TitleElement.Title="TitleDemoStr3"
+                    hc:TitleElement.TitlePlacement="Left"
+                    hc:TitleElement.TitleWidth="140" />
+                <hc:SearchBar
+                    Theme="{StaticResource SearchBarPlus.Small}"
+                    Width="380"
+                    hc:InfoElement.Necessary="True"
+                    hc:InfoElement.Placeholder="PlsEnterContent"
+                    hc:InfoElement.ShowClearButton="True"
+                    hc:TitleElement.Title="TitleDemoStr3"
+                    hc:TitleElement.TitlePlacement="Left"
+                    hc:TitleElement.TitleWidth="140" />
+            </hc:UniformSpacingPanel>
+        </hc:UniformSpacingPanel>
+    </ScrollViewer>
+</UserControl>
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SearchBarDemo.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SearchBarDemo.axaml.cs
new file mode 100644
index 000000000..0e5b2a31e
--- /dev/null
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/SearchBarDemo.axaml.cs
@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using Avalonia.Data;
+using Avalonia.Interactivity;
+using HandyControl.Controls;
+using HandyControl.Data;
+
+namespace HandyControlDemo.UserControl;
+
+public partial class SearchBarDemo : Avalonia.Controls.UserControl
+{
+    public SearchBarDemo()
+    {
+        InitializeComponent();
+    }
+ 
+}
+
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/HandyControlDemo_Avalonia/UserControl/Styles/WindowDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/WindowDemo.axaml
new file mode 100644
index 000000000..fb2b9f4ae
--- /dev/null
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/WindowDemo.axaml
@@ -0,0 +1,12 @@
+<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}"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             x:Class="HandyControlDemo.UserControl.WindowDemo">
+    <!--<hc:TransitioningContentControl>-->
+    <hc:UniformSpacingPanel Margin="32" ChildWrapping="Wrap" Spacing="16" VerticalAlignment="Center" MaxWidth="500">
+        <Button Click="ButtonMessage_OnClick" Content="OpenMessageWindow"/>
+    </hc:UniformSpacingPanel>
+    <!--</hc:TransitioningContentControl>-->
+</UserControl>
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/WindowDemo.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/WindowDemo.axaml.cs
new file mode 100644
index 000000000..957ac0e15
--- /dev/null
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/WindowDemo.axaml.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Avalonia.Interactivity;
+using HandyControl.Controls;
+using HandyControl.Data;
+
+namespace HandyControlDemo.UserControl;
+
+public partial class WindowDemo : Avalonia.Controls.UserControl
+{
+    public WindowDemo()
+    {
+        InitializeComponent();
+    }
+
+
+    private async void ButtonMessage_OnClick(object sender, RoutedEventArgs e)
+    {
+       await MessageBox.Show(Properties.Langs.Lang.GrowlAsk, Properties.Langs.Lang.Title, MessageBoxButton.YesNo, MessageBoxImage.Question);
+    }
+}
+
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/ViewModel/Common/InputElementDemoViewModel.cs b/src/Avalonia/HandyControlDemo_Avalonia/ViewModel/Common/InputElementDemoViewModel.cs
index 3fe76999a..91c702450 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/ViewModel/Common/InputElementDemoViewModel.cs
+++ b/src/Avalonia/HandyControlDemo_Avalonia/ViewModel/Common/InputElementDemoViewModel.cs
@@ -1,7 +1,10 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using HandyControl.Controls;
 using HandyControlDemo.Properties.Langs;
 using HandyControlDemo.Tools.Converter;
 
@@ -43,4 +46,10 @@ private static List<string> GetComboBoxDemoDataList()
 
         return list;
     }
+
+    [RelayCommand]
+    private static async Task Search(string key)
+    {
+        await MessageBox.Info(key);
+    }
 }
diff --git a/src/Avalonia/HandyControl_Avalonia/Controls/Attach/InfoElement.cs b/src/Avalonia/HandyControl_Avalonia/Controls/Attach/InfoElement.cs
index 53ea4c72c..2859e0a0e 100644
--- a/src/Avalonia/HandyControl_Avalonia/Controls/Attach/InfoElement.cs
+++ b/src/Avalonia/HandyControl_Avalonia/Controls/Attach/InfoElement.cs
@@ -2,8 +2,16 @@
 
 namespace HandyControl.Controls;
 
-public class InfoElement
+public class InfoElement : AvaloniaObject
 {
+    public static readonly AttachedProperty<string> PlaceholderProperty =
+    AvaloniaProperty.RegisterAttached<InfoElement, AvaloniaObject, string>("Placeholder", inherits: true);
+
+    public static void SetPlaceholder(AvaloniaObject element, string value) => element.SetValue(PlaceholderProperty, value);
+
+    public static string GetPlaceholder(AvaloniaObject element) => element.GetValue(PlaceholderProperty);
+
+
     public static readonly AttachedProperty<bool> NecessaryProperty =
         AvaloniaProperty.RegisterAttached<InfoElement, AvaloniaObject, bool>("Necessary", inherits: true);
 
diff --git a/src/Avalonia/HandyControl_Avalonia/Controls/Attach/TitleElement.cs b/src/Avalonia/HandyControl_Avalonia/Controls/Attach/TitleElement.cs
index ed95a7ad2..bba9061af 100644
--- a/src/Avalonia/HandyControl_Avalonia/Controls/Attach/TitleElement.cs
+++ b/src/Avalonia/HandyControl_Avalonia/Controls/Attach/TitleElement.cs
@@ -6,7 +6,7 @@
 
 namespace HandyControl.Controls;
 
-public class TitleElement
+public class TitleElement: AvaloniaObject
 {
     public static readonly AttachedProperty<string> TitleProperty =
         AvaloniaProperty.RegisterAttached<TitleElement, AvaloniaObject, string>("Title");
diff --git a/src/Avalonia/HandyControl_Avalonia/Controls/Input/SearchBar.cs b/src/Avalonia/HandyControl_Avalonia/Controls/Input/SearchBar.cs
new file mode 100644
index 000000000..24e4e1397
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Controls/Input/SearchBar.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using HandyControl.Data;
+
+namespace HandyControl.Controls;
+
+public class SearchBar : TextBox, ICommandSource
+{
+    public static readonly RoutedEvent SearchStartedEvent = RoutedEvent.Register<SearchBar, FunctionEventArgs<string>>("SearchStarted", RoutingStrategies.Bubble);
+
+    public event EventHandler<FunctionEventArgs<string>> SearchStarted
+    {
+        add => AddHandler(SearchStartedEvent, value);
+        remove => RemoveHandler(SearchStartedEvent, value);
+    }
+
+    protected override void OnKeyDown(KeyEventArgs e)
+    {
+        base.OnKeyDown(e);
+
+        if (e.Key == Key.Enter)
+        {
+            OnSearchStarted();
+        }
+    }
+
+    protected override void OnTextInput(TextInputEventArgs e)
+    {
+        base.OnTextInput(e);
+
+        if (IsRealTime)
+        {
+            OnSearchStarted();
+        }
+    }
+
+    private void OnSearchStarted()
+    {
+        RaiseEvent(new FunctionEventArgs<string>(SearchStartedEvent, this)
+        {
+            Info = Text
+        });
+
+        switch (Command)
+        {
+            case null:
+                return;
+            default:
+                Command.Execute(CommandParameter);
+                break;
+        }
+    }
+
+    /// <summary>
+    ///     是否实时搜索
+    /// </summary>
+    public static readonly StyledProperty<bool> IsRealTimeProperty = AvaloniaProperty.Register<SearchBar, bool>(nameof(IsRealTime), false);
+
+
+    /// <summary>
+    ///     是否实时搜索
+    /// </summary>
+    public bool IsRealTime
+    {
+        get => (bool)GetValue(IsRealTimeProperty);
+        set => SetValue(IsRealTimeProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly StyledProperty<ICommand> CommandProperty = AvaloniaProperty.Register<SearchBar, ICommand>(nameof(Command));
+
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == CommandProperty)
+        {
+            OnCommandChanged(change);
+        }
+    }
+
+    private void OnCommandChanged(AvaloniaPropertyChangedEventArgs e)
+    {
+        if (e.OldValue is ICommand oldCommand)
+        {
+            oldCommand.CanExecuteChanged -= CanExecuteChanged;
+        }
+        if (e.NewValue is ICommand newCommand)
+        {
+            newCommand.CanExecuteChanged += CanExecuteChanged;
+        }
+    }
+
+    public ICommand Command
+    {
+        get => (ICommand)GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
+
+    public static readonly StyledProperty<object?> CommandParameterProperty = AvaloniaProperty.Register<SearchBar, object?>(nameof(CommandParameter));
+
+
+    public object? CommandParameter
+    {
+        get => GetValue(CommandParameterProperty);
+        set => SetValue(CommandParameterProperty, value);
+    }
+
+    public void CanExecuteChanged(object sender, EventArgs e)
+    {
+        if (Command == null) return;
+
+        IsEnabled = Command.CanExecute(CommandParameter);
+    }
+
+}
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/Controls/Window/MessageBox.cs b/src/Avalonia/HandyControl_Avalonia/Controls/Window/MessageBox.cs
new file mode 100644
index 000000000..a11dd0990
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Controls/Window/MessageBox.cs
@@ -0,0 +1,611 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.Threading;
+using HandyControl.Data;
+using HandyControl.Properties.Langs;
+using HandyControl.Tools;
+
+namespace HandyControl.Controls
+{
+    /// <summary>
+    /// Displays a message box with text, buttons, and symbols to inform and instruct the user.
+    /// </summary>
+    [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
+    [TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
+    public sealed class MessageBox : HandyControl.Controls.Window
+    {
+        private const string ElementPanel = "PART_Panel";
+        private const string ElementButtonClose = "PART_ButtonClose";
+        private const string ElementButtonIcon = "PART_ButtonIcon";
+
+        public static readonly StyledProperty<string> MessageProperty = AvaloniaProperty.Register<MessageBox, string>(
+            nameof(Message));
+
+        public static readonly StyledProperty<Geometry> ImageProperty = AvaloniaProperty.Register<MessageBox, Geometry>(
+            nameof(Image));
+        public static readonly StyledProperty<Brush> ImageBrushProperty = AvaloniaProperty.Register<MessageBox, Brush>(
+            nameof(ImageBrush));
+
+        public static readonly StyledProperty<bool> ShowImageProperty = AvaloniaProperty.Register<MessageBox, bool>(
+            nameof(ShowImage));
+
+        private Button _buttonClose;
+        private Panel _panel;
+        private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
+        private Button _buttonOk;
+        private Button _buttonCancel;
+        private Button _buttonYes;
+        private Button _buttonNo;
+
+        private EventHandler<RoutedEventArgs> _ConfirmCommand;
+        private EventHandler<RoutedEventArgs> _CancelCommand;
+        private EventHandler<RoutedEventArgs> _YesCommand;
+        private EventHandler<RoutedEventArgs> _NoCommand;
+
+        static MessageBox()
+        {
+            ThemeProperty.OverrideDefaultValue<MessageBox>(ResourceHelper.GetResource<ControlTheme>("DefaultMessageBoxStyle"));
+        }
+
+        /// <summary>
+        /// This constructor is private so people aren't tempted to try and create instances of these -- they should just use the static methods.
+        /// </summary>
+        private MessageBox()
+        {
+            _ConfirmCommand = (_, __) =>
+            {
+                _messageBoxResult = MessageBoxResult.OK;
+                Close();
+            };
+            _CancelCommand = (_, __) =>
+            {
+                _messageBoxResult = MessageBoxResult.Cancel;
+                Close();
+            };
+            _YesCommand = (_, __) =>
+            {
+                _messageBoxResult = MessageBoxResult.Yes;
+                Close();
+            };
+            _NoCommand = (_, __) =>
+            {
+                _messageBoxResult = MessageBoxResult.No;
+                Close();
+            };
+        }
+
+        public string Message
+        {
+            get => GetValue(MessageProperty);
+            set => SetValue(MessageProperty, value);
+        }
+
+        public Geometry Image
+        {
+            get => GetValue(ImageProperty);
+            set => SetValue(ImageProperty, value);
+        }
+
+        public Brush ImageBrush
+        {
+            get => GetValue(ImageBrushProperty);
+            set => SetValue(ImageBrushProperty, value);
+        }
+
+        public bool ShowImage
+        {
+            get => GetValue(ShowImageProperty);
+            set => SetValue(ShowImageProperty, ValueBoxes.BooleanBox(value));
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            _panel = e.NameScope.Find<Panel>(ElementPanel);
+            if (_panel != null)
+            {
+                if (_buttonOk != null)
+                {
+                    _panel.Children.Add(_buttonOk);
+                }
+
+                if (_buttonYes != null)
+                {
+                    _panel.Children.Add(_buttonYes);
+                }
+
+                if (_buttonNo != null)
+                {
+                    _panel.Children.Add(_buttonNo);
+                }
+
+                if (_buttonCancel != null)
+                {
+                    _panel.Children.Add(_buttonCancel);
+                }
+            }
+
+            _buttonClose = e.NameScope.Find<Button>(ElementButtonClose);
+            if (_buttonClose != null)
+            {
+                _buttonClose.Click += ButtonClose_Click;
+            }
+
+            var buttonIcon = e.NameScope.Find<Button>(ElementButtonIcon);
+            if (buttonIcon != null && buttonIcon.IsVisible)
+            {
+                buttonIcon.Click += ButtonClose_Click;
+            }
+        }
+
+        private void ButtonClose_Click(object? sender, RoutedEventArgs e) => Close();
+
+
+        public static async Task<MessageBoxResult> Success(string messageBoxText, string caption = null)
+        {
+            return await Success(owner: null, messageBoxText, caption);
+        }
+
+        public static async Task<MessageBoxResult> Success(Avalonia.Controls.Window owner, string messageBoxText, string caption = null)
+        {
+            MessageBox messageBox = null;
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                messageBox = CreateMessageBox(
+                    owner: owner,
+                    messageBoxText: messageBoxText,
+                    caption: caption,
+                    button: MessageBoxButton.OK,
+                    icon: MessageBoxImage.None,
+                    defaultResult: MessageBoxResult.OK
+                );
+                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+                messageBox.ShowImage = true;
+                messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
+                messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
+
+                await messageBox.ShowDialog(messageBox.Owner as Avalonia.Controls.Window);
+            });
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static async Task<MessageBoxResult> Info(string messageBoxText, string caption = null)
+        {
+            return await Info(owner: null, messageBoxText, caption);
+        }
+
+        public static async Task<MessageBoxResult> Info(Avalonia.Controls.Window owner, string messageBoxText, string caption = null)
+        {
+            MessageBox messageBox = null;
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                messageBox = CreateMessageBox(
+                    owner: owner,
+                    messageBoxText: messageBoxText,
+                    caption: caption,
+                    button: MessageBoxButton.OK,
+                    icon: MessageBoxImage.Information,
+                    defaultResult: MessageBoxResult.OK
+                );
+                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+                SetImage(messageBox, MessageBoxImage.Information);
+                await messageBox.ShowDialog(messageBox.Owner as Avalonia.Controls.Window);
+            });
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static async Task<MessageBoxResult> Warning(string messageBoxText, string caption = null)
+        {
+            return await Warning(owner: null, messageBoxText, caption);
+        }
+
+        public static async Task<MessageBoxResult> Warning(Avalonia.Controls.Window owner, string messageBoxText, string caption = null)
+        {
+            MessageBox messageBox = null;
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                messageBox = CreateMessageBox(
+                    owner: owner,
+                    messageBoxText: messageBoxText,
+                    caption: caption,
+                    button: MessageBoxButton.OK,
+                    icon: MessageBoxImage.Warning,
+                    defaultResult: MessageBoxResult.OK
+                );
+                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+                SetImage(messageBox, MessageBoxImage.Warning);
+                await messageBox.ShowDialog(messageBox.Owner as Avalonia.Controls.Window);
+            });
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static async Task<MessageBoxResult> Error(string messageBoxText, string caption = null)
+        {
+            return await Error(owner: null, messageBoxText, caption);
+        }
+
+        public static async Task<MessageBoxResult> Error(Avalonia.Controls.Window owner, string messageBoxText, string caption = null)
+        {
+            MessageBox messageBox = null;
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                messageBox = CreateMessageBox(
+                    owner: owner,
+                    messageBoxText: messageBoxText,
+                    caption: caption,
+                    button: MessageBoxButton.OK,
+                    icon: MessageBoxImage.Error,
+                    defaultResult: MessageBoxResult.OK
+                );
+                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+                SetImage(messageBox, MessageBoxImage.Error);
+                await messageBox.ShowDialog(messageBox.Owner as Avalonia.Controls.Window);
+            });
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static async Task<MessageBoxResult> Fatal(string messageBoxText, string caption = null)
+        {
+            return await Fatal(owner: null, messageBoxText, caption);
+        }
+
+        public static async Task<MessageBoxResult> Fatal(Avalonia.Controls.Window owner, string messageBoxText, string caption = null)
+        {
+            MessageBox messageBox = null;
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                messageBox = CreateMessageBox(
+                    owner: owner,
+                    messageBoxText: messageBoxText,
+                    caption: caption,
+                    button: MessageBoxButton.OK,
+                    icon: MessageBoxImage.None,
+                    defaultResult: MessageBoxResult.OK
+                );
+                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+                messageBox.ShowImage = true;
+                messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
+                messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
+                await messageBox.ShowDialog(messageBox.Owner as Avalonia.Controls.Window);
+            });
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static async Task<MessageBoxResult> Ask(string messageBoxText, string caption = null)
+        {
+            return await Ask(owner: null, messageBoxText, caption);
+        }
+
+        public static async Task<MessageBoxResult> Ask(Avalonia.Controls.Window owner, string messageBoxText, string caption = null)
+        {
+            MessageBox messageBox = null;
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                messageBox = CreateMessageBox(
+                    owner: owner,
+                    messageBoxText: messageBoxText,
+                    caption: caption,
+                    button: MessageBoxButton.OKCancel,
+                    icon: MessageBoxImage.Question,
+                    defaultResult: MessageBoxResult.Cancel
+                );
+                SetButtonStatus(messageBox, MessageBoxButton.OKCancel, MessageBoxResult.Cancel);
+                SetImage(messageBox, MessageBoxImage.Question);
+                await messageBox.ShowDialog(messageBox.Owner as Avalonia.Controls.Window);
+            });
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static async Task<MessageBoxResult> Show(MessageBoxInfo info)
+        {
+            MessageBox messageBox = null;
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                messageBox = CreateMessageBox(
+                    owner: info.Owner,
+                    messageBoxText: info.Message,
+                    caption: info.Caption,
+                    button: info.Button,
+                    icon: MessageBoxImage.None,
+                    defaultResult: info.DefaultResult
+                );
+                SetButtonStatus(messageBox, info.Button, info.DefaultResult);
+
+                if (!string.IsNullOrEmpty(info.IconKey))
+                {
+                    messageBox.ShowImage = true;
+                    messageBox.Image = ResourceHelper.GetResource<Geometry>(info.IconKey) ?? info.Icon;
+                    messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey) ?? info.IconBrush;
+                }
+
+                if (info.ControlThemeKey != null)
+                {
+                    messageBox.Theme = ResourceHelper.GetResource<ControlTheme>(info.ControlThemeKey) ?? info.ControlTheme;
+                }
+                await messageBox.ShowDialog(messageBox.Owner as Avalonia.Controls.Window);
+            });
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static async Task<MessageBoxResult> Show(
+            string messageBoxText,
+            string caption = null,
+            MessageBoxButton button = MessageBoxButton.OK,
+            MessageBoxImage icon = MessageBoxImage.None,
+            MessageBoxResult defaultResult = MessageBoxResult.None
+        )
+        {
+            return await Show(owner: null, messageBoxText, caption, button, icon, defaultResult);
+        }
+
+
+        public static async Task<MessageBoxResult> Show(
+            Avalonia.Controls.Window owner,
+            string messageBoxText,
+            string caption = null,
+            MessageBoxButton button = MessageBoxButton.OK,
+            MessageBoxImage icon = MessageBoxImage.None,
+            MessageBoxResult defaultResult = MessageBoxResult.None
+        )
+        {
+            MessageBox messageBox = null;
+            await Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
+                SetButtonStatus(messageBox, button, defaultResult);
+                SetImage(messageBox, icon);
+                await messageBox.ShowDialog(messageBox.Owner as Avalonia.Controls.Window);
+            });
+
+            return messageBox._messageBoxResult;
+        }
+
+        private static MessageBox CreateMessageBox(
+            Avalonia.Controls.Window owner,
+            string messageBoxText,
+            string caption,
+            MessageBoxButton button,
+            MessageBoxImage icon,
+            MessageBoxResult defaultResult
+        )
+        {
+            if (!IsValidMessageBoxButton(button))
+            {
+                throw new InvalidEnumArgumentException(nameof(button), (int)button, typeof(MessageBoxButton));
+            }
+
+            if (!IsValidMessageBoxImage(icon))
+            {
+                throw new InvalidEnumArgumentException(nameof(icon), (int)icon, typeof(MessageBoxImage));
+            }
+
+            if (!IsValidMessageBoxResult(defaultResult))
+            {
+                throw new InvalidEnumArgumentException(nameof(defaultResult), (int)defaultResult,
+                    typeof(MessageBoxResult));
+            }
+            Avalonia.Controls.Window ownerWindow = null;
+            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                ownerWindow = desktop.Windows.FirstOrDefault(w => w.IsActive);
+            }
+            var ownerIsNull = ownerWindow is null;
+
+            return new MessageBox
+            {
+                Message = messageBoxText,
+                Owner = ownerWindow,
+                WindowStartupLocation = ownerIsNull ? WindowStartupLocation.CenterScreen : WindowStartupLocation.CenterOwner,
+                Title = caption ?? string.Empty,
+                Topmost = ownerIsNull,
+                _messageBoxResult = defaultResult
+            };
+        }
+
+        private static void SetButtonStatus(
+            MessageBox messageBox,
+            MessageBoxButton messageBoxButton,
+            MessageBoxResult defaultResult
+        )
+        {
+            switch (messageBoxButton)
+            {
+                case MessageBoxButton.OK:
+                    messageBox._messageBoxResult = MessageBoxResult.Yes;
+                    messageBox._buttonOk = new Button
+                    {
+                        IsCancel = true,
+                        IsDefault = true,
+                        Content = Lang.Confirm,
+                        Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle")
+                    };
+                    messageBox._buttonOk.Click += messageBox._ConfirmCommand;
+                    break;
+                case MessageBoxButton.OKCancel:
+                    messageBox._messageBoxResult = MessageBoxResult.Cancel;
+                    messageBox._buttonOk = new Button
+                    {
+                        Content = Lang.Confirm,
+                    };
+                    messageBox._buttonOk.Click += messageBox._ConfirmCommand;
+                    messageBox._buttonCancel = new Button
+                    {
+                        IsCancel = true,
+                        Content = Lang.Cancel,
+                    };
+                    messageBox._buttonCancel.Click += messageBox._CancelCommand;
+                    if (defaultResult == MessageBoxResult.Cancel)
+                    {
+                        messageBox._buttonOk.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                        messageBox._buttonCancel.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonCancel.IsDefault = true;
+                    }
+                    else
+                    {
+                        messageBox._buttonOk.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonOk.IsDefault = true;
+                        messageBox._buttonCancel.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                    }
+
+                    break;
+                case MessageBoxButton.YesNo:
+                    messageBox._messageBoxResult = MessageBoxResult.Cancel;
+                    messageBox._buttonYes = new Button
+                    {
+                        Content = Lang.Yes,
+                    };
+                    messageBox._buttonYes.Click += messageBox._YesCommand;
+                    messageBox._buttonNo = new Button
+                    {
+                        Content = Lang.No,
+                    };
+                    messageBox._buttonNo.Click += messageBox._NoCommand;
+                    if (defaultResult == MessageBoxResult.No)
+                    {
+                        messageBox._buttonYes.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                        messageBox._buttonNo.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonNo.IsDefault = true;
+                    }
+                    else
+                    {
+                        messageBox._buttonYes.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonYes.IsDefault = true;
+                        messageBox._buttonNo.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                    }
+
+                    break;
+                case MessageBoxButton.YesNoCancel:
+                    messageBox._messageBoxResult = MessageBoxResult.Cancel;
+                    messageBox._buttonYes = new Button
+                    {
+                        Content = Lang.Yes,
+                    };
+                    messageBox._buttonYes.Click += messageBox._YesCommand;
+                    messageBox._buttonNo = new Button
+                    {
+                        Content = Lang.No,
+                    };
+                    messageBox._buttonNo.Click += messageBox._NoCommand;
+                    messageBox._buttonCancel = new Button
+                    {
+                        IsCancel = true,
+                        Content = Lang.Cancel,
+                    };
+                    messageBox._buttonCancel.Click += messageBox._CancelCommand;
+
+                    if (defaultResult == MessageBoxResult.No)
+                    {
+                        messageBox._buttonYes.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                        messageBox._buttonNo.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonNo.IsDefault = true;
+                        messageBox._buttonCancel.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                    }
+                    else if (defaultResult == MessageBoxResult.Cancel)
+                    {
+                        messageBox._buttonYes.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                        messageBox._buttonNo.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                        messageBox._buttonCancel.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonCancel.IsDefault = true;
+                    }
+                    else
+                    {
+                        messageBox._buttonYes.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonYes.IsDefault = true;
+                        messageBox._buttonNo.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                        messageBox._buttonCancel.Theme = ResourceHelper.GetResource<ControlTheme>("MessageBoxButtonStyle");
+                    }
+
+                    break;
+            }
+        }
+
+
+        private static void SetImage(MessageBox messageBox, MessageBoxImage messageBoxImage)
+        {
+            var iconKey = string.Empty;
+            var iconBrushKey = string.Empty;
+
+            switch (messageBoxImage)
+            {
+                case MessageBoxImage.Error:
+                    iconKey = ResourceToken.ErrorGeometry;
+                    iconBrushKey = ResourceToken.DangerBrush;
+                    break;
+                case MessageBoxImage.Question:
+                    iconKey = ResourceToken.AskGeometry;
+                    iconBrushKey = ResourceToken.AccentBrush;
+                    break;
+                case MessageBoxImage.Warning:
+                    iconKey = ResourceToken.WarningGeometry;
+                    iconBrushKey = ResourceToken.WarningBrush;
+                    break;
+                case MessageBoxImage.Information:
+                    iconKey = ResourceToken.InfoGeometry;
+                    iconBrushKey = ResourceToken.InfoBrush;
+                    break;
+            }
+
+            if (string.IsNullOrEmpty(iconKey))
+            {
+                return;
+            }
+
+            messageBox.ShowImage = true;
+            messageBox.Image = ResourceHelper.GetResource<Geometry>(iconKey);
+            messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(iconBrushKey);
+        }
+
+        private static bool IsValidMessageBoxButton(MessageBoxButton value)
+        {
+            return value
+                is MessageBoxButton.OK
+                or MessageBoxButton.OKCancel
+                or MessageBoxButton.YesNo
+                or MessageBoxButton.YesNoCancel;
+        }
+
+        private static bool IsValidMessageBoxImage(MessageBoxImage value)
+        {
+            return value
+                is MessageBoxImage.Asterisk
+                or MessageBoxImage.Error
+                or MessageBoxImage.Exclamation
+                or MessageBoxImage.Hand
+                or MessageBoxImage.Information
+                or MessageBoxImage.None
+                or MessageBoxImage.Question
+                or MessageBoxImage.Stop
+                or MessageBoxImage.Warning;
+        }
+
+        private static bool IsValidMessageBoxResult(MessageBoxResult value)
+        {
+            return value
+                is MessageBoxResult.Cancel
+                or MessageBoxResult.No
+                or MessageBoxResult.None
+                or MessageBoxResult.OK
+                or MessageBoxResult.Yes;
+        }
+
+    }
+
+}
diff --git a/src/Avalonia/HandyControl_Avalonia/Controls/Window/Windows.cs b/src/Avalonia/HandyControl_Avalonia/Controls/Window/Windows.cs
new file mode 100644
index 000000000..d376a6094
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Controls/Window/Windows.cs
@@ -0,0 +1,184 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Media;
+
+namespace HandyControl.Controls
+{
+    public class Window : Avalonia.Controls.Window
+    {
+        private const string ElementNonClientArea = "PART_NonClientArea";
+        private Grid _nonClientArea;
+        public Window()
+        {
+
+        }
+
+        #region Styled properties
+
+        public static readonly StyledProperty<object> NonClientAreaContentProperty =
+            AvaloniaProperty.Register<Window, object>(nameof(NonClientAreaContent), default);
+
+        public object NonClientAreaContent
+        {
+            get => GetValue(NonClientAreaContentProperty);
+            set => SetValue(NonClientAreaContentProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> CloseButtonHoverBackgroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(CloseButtonHoverBackground), null);
+
+        public IBrush CloseButtonHoverBackground
+        {
+            get => GetValue(CloseButtonHoverBackgroundProperty);
+            set => SetValue(CloseButtonHoverBackgroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> CloseButtonHoverForegroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(CloseButtonHoverForeground), null);
+
+        public IBrush CloseButtonHoverForeground
+        {
+            get => GetValue(CloseButtonHoverForegroundProperty);
+            set => SetValue(CloseButtonHoverForegroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> CloseButtonBackgroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(CloseButtonBackground), Brushes.Transparent);
+
+        public IBrush CloseButtonBackground
+        {
+            get => GetValue(CloseButtonBackgroundProperty);
+            set => SetValue(CloseButtonBackgroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> CloseButtonForegroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(CloseButtonForeground), Brushes.White);
+
+        public IBrush CloseButtonForeground
+        {
+            get => GetValue(CloseButtonForegroundProperty);
+            set => SetValue(CloseButtonForegroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> OtherButtonBackgroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(OtherButtonBackground), Brushes.Transparent);
+
+        public IBrush OtherButtonBackground
+        {
+            get => GetValue(OtherButtonBackgroundProperty);
+            set => SetValue(OtherButtonBackgroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> OtherButtonForegroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(OtherButtonForeground), Brushes.White);
+
+        public IBrush OtherButtonForeground
+        {
+            get => GetValue(OtherButtonForegroundProperty);
+            set => SetValue(OtherButtonForegroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> OtherButtonHoverBackgroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(OtherButtonHoverBackground), null);
+
+        public IBrush OtherButtonHoverBackground
+        {
+            get => GetValue(OtherButtonHoverBackgroundProperty);
+            set => SetValue(OtherButtonHoverBackgroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> OtherButtonHoverForegroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(OtherButtonHoverForeground), null);
+
+        public IBrush OtherButtonHoverForeground
+        {
+            get => GetValue(OtherButtonHoverForegroundProperty);
+            set => SetValue(OtherButtonHoverForegroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> NonClientAreaBackgroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(NonClientAreaBackground), null);
+
+        public IBrush NonClientAreaBackground
+        {
+            get => GetValue(NonClientAreaBackgroundProperty);
+            set => SetValue(NonClientAreaBackgroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> NonClientAreaForegroundProperty =
+            AvaloniaProperty.Register<Window, IBrush>(nameof(NonClientAreaForeground), null);
+
+        public IBrush NonClientAreaForeground
+        {
+            get => GetValue(NonClientAreaForegroundProperty);
+            set => SetValue(NonClientAreaForegroundProperty, value);
+        }
+
+        public static readonly StyledProperty<double> NonClientAreaHeightProperty =
+            AvaloniaProperty.Register<Window, double>(nameof(NonClientAreaHeight), 22.0);
+
+        public double NonClientAreaHeight
+        {
+            get => GetValue(NonClientAreaHeightProperty);
+            set => SetValue(NonClientAreaHeightProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> ShowNonClientAreaProperty =
+            AvaloniaProperty.Register<Window, bool>(nameof(ShowNonClientArea), true);
+
+        public bool ShowNonClientArea
+        {
+            get => GetValue(ShowNonClientAreaProperty);
+            set => SetValue(ShowNonClientAreaProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> ShowTitleProperty =
+            AvaloniaProperty.Register<Window, bool>(nameof(ShowTitle), true);
+
+        public bool ShowTitle
+        {
+            get => GetValue(ShowTitleProperty);
+            set => SetValue(ShowTitleProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> IsFullScreenProperty =
+            AvaloniaProperty.Register<Window, bool>(nameof(IsFullScreen), false);
+
+        public bool IsFullScreen
+        {
+            get => GetValue(IsFullScreenProperty);
+            set => SetValue(IsFullScreenProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> ShowIconProperty =
+            AvaloniaProperty.Register<Window, bool>(nameof(ShowIcon), true);
+
+        public bool ShowIcon
+        {
+            get => GetValue(ShowIconProperty);
+            set => SetValue(ShowIconProperty, value);
+        }
+
+        #endregion
+
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            _nonClientArea = e.NameScope.Find<Grid>(ElementNonClientArea);
+            if (_nonClientArea != null)
+            {
+                _nonClientArea.PointerPressed += (_, e) =>
+                {
+
+                    if (e.Pointer.Type == PointerType.Mouse && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+                    {
+                        this.BeginMoveDrag(e);
+                    }
+                };
+            }
+            base.OnApplyTemplate(e);
+        }
+    }
+}
diff --git a/src/Avalonia/HandyControl_Avalonia/Data/Args/FunctionEventArgs`1.cs b/src/Avalonia/HandyControl_Avalonia/Data/Args/FunctionEventArgs`1.cs
new file mode 100644
index 000000000..ba54570d6
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Data/Args/FunctionEventArgs`1.cs
@@ -0,0 +1,19 @@
+using System.Windows;
+using Avalonia.Interactivity;
+
+
+namespace HandyControl.Data;
+
+public class FunctionEventArgs<T> : RoutedEventArgs
+{
+    public FunctionEventArgs(T info)
+    {
+        Info = info;
+    }
+
+    public FunctionEventArgs(RoutedEvent routedEvent, object source) : base(routedEvent, source)
+    {
+    }
+
+    public T Info { get; set; }
+}
diff --git a/src/Avalonia/HandyControl_Avalonia/Data/Info/MessageBoxInfo.cs b/src/Avalonia/HandyControl_Avalonia/Data/Info/MessageBoxInfo.cs
new file mode 100644
index 000000000..19016475d
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Data/Info/MessageBoxInfo.cs
@@ -0,0 +1,126 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Styling;
+
+namespace HandyControl.Data;
+
+public class MessageBoxInfo
+{
+    public string Message { get; set; }
+
+    public string Caption { get; set; }
+
+    public MessageBoxButton Button { get; set; } = MessageBoxButton.OK;
+
+    public Geometry Icon { get; set; }
+
+    public string IconKey { get; set; }
+
+    public Brush IconBrush { get; set; }
+
+    public string IconBrushKey { get; set; }
+
+    public MessageBoxResult DefaultResult { get; set; } = MessageBoxResult.None;
+
+    public ControlTheme ControlTheme { get; set; }
+
+    public string ControlThemeKey { get; set; }
+
+    public Window Owner { get; set; }
+}
+
+
+public enum MessageBoxResult
+{
+    //
+    // Summary:
+    //     The message box returns no result.
+    None = 0,
+    //
+    // Summary:
+    //     The result value of the message box is OK.
+    OK = 1,
+    //
+    // Summary:
+    //     The result value of the message box is Cancel.
+    Cancel = 2,
+    //
+    // Summary:
+    //     The result value of the message box is Yes.
+    Yes = 6,
+    //
+    // Summary:
+    //     The result value of the message box is No.
+    No = 7
+}
+//
+// Summary:
+//     Specifies the buttons that are displayed on a message box. Used as an argument
+//     of the Overload:MessageBox.Show method.
+public enum MessageBoxButton
+{
+    //
+    // Summary:
+    //     The message box displays an OK button.
+    OK = 0,
+    //
+    // Summary:
+    //     The message box displays OK and Cancel buttons.
+    OKCancel = 1,
+    //
+    // Summary:
+    //     The message box displays Yes, No, and Cancel buttons.
+    YesNoCancel = 3,
+    //
+    // Summary:
+    //     The message box displays Yes and No buttons.
+    YesNo = 4
+}
+
+//
+// Summary:
+//     Specifies the icon that is displayed by a message box.
+public enum MessageBoxImage
+{
+    //
+    // Summary:
+    //     No icon is displayed.
+    None = 0,
+    //
+    // Summary:
+    //     The message box contains a symbol consisting of a white X in a circle with a
+    //     red background.
+    Hand = 16,
+    //
+    // Summary:
+    //     The message box contains a symbol consisting of a question mark in a circle.
+    Question = 32,
+    //
+    // Summary:
+    //     The message box contains a symbol consisting of an exclamation point in a triangle
+    //     with a yellow background.
+    Exclamation = 48,
+    //
+    // Summary:
+    //     The message box contains a symbol consisting of a lowercase letter i in a circle.
+    Asterisk = 64,
+    //
+    // Summary:
+    //     The message box contains a symbol consisting of white X in a circle with a red
+    //     background.
+    Stop = 16,
+    //
+    // Summary:
+    //     The message box contains a symbol consisting of white X in a circle with a red
+    //     background.
+    Error = 16,
+    //
+    // Summary:
+    //     The message box contains a symbol consisting of an exclamation point in a triangle
+    //     with a yellow background.
+    Warning = 48,
+    //
+    // Summary:
+    //     The message box contains a symbol consisting of a lowercase letter i in a circle.
+    Information = 64
+}
diff --git a/src/Avalonia/HandyControl_Avalonia/Data/Info/ValueBoxes.cs b/src/Avalonia/HandyControl_Avalonia/Data/Info/ValueBoxes.cs
new file mode 100644
index 000000000..4e81f6e1c
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Data/Info/ValueBoxes.cs
@@ -0,0 +1,52 @@
+using Avalonia.Layout;
+using System;
+using System.Windows;
+
+namespace HandyControl.Data;
+
+
+internal static class ValueBoxes
+{
+    public static object TrueBox = true;
+
+    public static object FalseBox = false;
+
+    public static object VerticalBox = Orientation.Vertical;
+
+    public static object HorizontalBox = Orientation.Horizontal;
+
+    public static object Double01Box = .1;
+
+    public static object Double0Box = .0;
+
+    public static object Double1Box = 1.0;
+
+    public static object Double10Box = 10.0;
+
+    public static object Double20Box = 20.0;
+
+    public static object Double100Box = 100.0;
+
+    public static object Double200Box = 200.0;
+
+    public static object Double300Box = 300.0;
+
+    public static object DoubleNeg1Box = -1.0;
+
+    public static object Int0Box = 0;
+
+    public static object Int1Box = 1;
+
+    public static object Int2Box = 2;
+
+    public static object Int5Box = 5;
+
+    public static object Int99Box = 99;
+
+    public static object BooleanBox(bool value) => value ? TrueBox : FalseBox;
+
+    public static object OrientationBox(Orientation value) =>
+        value == Orientation.Horizontal ? HorizontalBox : VerticalBox;
+
+ 
+}
diff --git a/src/Avalonia/HandyControl_Avalonia/HandyControl_Avalonia.csproj b/src/Avalonia/HandyControl_Avalonia/HandyControl_Avalonia.csproj
index 29b7f42bb..a251a7136 100644
--- a/src/Avalonia/HandyControl_Avalonia/HandyControl_Avalonia.csproj
+++ b/src/Avalonia/HandyControl_Avalonia/HandyControl_Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -23,4 +23,11 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Themes\Styles\SearchBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml
index e5fc211cf..1b30b13fb 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml
@@ -17,5 +17,6 @@
     <avalonia:MarginMultiplierConverter x:Key="LeftMarginConverter"
                                         Indent="16"
                                         Left="True" />
+    <hc:BooleanArr22BooleanConverter x:Key="BooleanArr22BooleanConverter" />
 
 </ResourceDictionary>
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/MergedStyles.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MergedStyles.axaml
index f5fceb1a6..15353723b 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MergedStyles.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MergedStyles.axaml
@@ -1,8 +1,9 @@
-<!-- ReSharper disable once Xaml.RedundantNamespaceAlias -->
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:ClassModifier="internal"
-        xmlns:hc="clr-namespace:HandyControl.Controls">
+<!--  ReSharper disable once Xaml.RedundantNamespaceAlias  -->
+<Styles
+    x:ClassModifier="internal"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:hc="clr-namespace:HandyControl.Controls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Styles.Resources>
         <ResourceDictionary>
@@ -57,6 +58,8 @@
                 <MergeResourceInclude Source="avares://HandyControl/Themes/Styles/ContextMenu.axaml" />
                 <MergeResourceInclude Source="avares://HandyControl/Themes/Styles/SelectableTextBlock.axaml" />
                 <MergeResourceInclude Source="avares://HandyControl/Themes/Styles/HeaderedContentControl.axaml" />
+                <MergeResourceInclude Source="avares://HandyControl/Themes/Styles/MessageBox.axaml" />
+                <MergeResourceInclude Source="avares://HandyControl/Themes/Styles/SearchBar.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MessageBox.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MessageBox.axaml
new file mode 100644
index 000000000..50f6df4ab
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MessageBox.axaml
@@ -0,0 +1,177 @@
+<ResourceDictionary
+    x:ClassModifier="internal"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:hc="clr-namespace:HandyControl.Controls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme
+        BasedOn="{StaticResource ButtonDefault}"
+        TargetType="Button"
+        x:Key="MessageBoxButtonStyle">
+        <Setter Property="MinWidth" Value="88" />
+        <Setter Property="IsVisible" Value="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" />
+        <Setter Property="Margin" Value="5,0" />
+    </ControlTheme>
+    <ControlTheme
+        BasedOn="{StaticResource ButtonPrimary}"
+        TargetType="Button"
+        x:Key="MessageBoxPrimaryButtonStyle">
+        <Setter Property="MinWidth" Value="88" />
+        <Setter Property="IsVisible" Value="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" />
+        <Setter Property="Margin" Value="5,0" />
+    </ControlTheme>
+
+    <ControlTemplate TargetType="hc:MessageBox" x:Key="DefaultMessageBoxControlTemplate">
+        <Border
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid Margin="{TemplateBinding Padding}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid
+                    Background="{DynamicResource RegionBrush}"
+                    Name="PART_NonClientArea"
+                    TextElement.Foreground="{DynamicResource PrimaryTextBrush}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <StackPanel
+                        Grid.Column="1"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal"
+                        UseLayoutRounding="True"
+                        VerticalAlignment="Top">
+                        <Button
+                            Background="Transparent"
+                            BorderThickness="1,0,0,0"
+                            Foreground="{DynamicResource PrimaryTextBrush}"
+                            Height="29"
+                            IsTabStop="False"
+                            Name="PART_ButtonClose"
+                            Theme="{StaticResource ButtonIcon}"
+                            Width="46"
+                            hc:IconElement.Geometry="{StaticResource CloseGeometry}"
+                            hc:IconElement.Height="10"
+                            hc:IconElement.Width="10" />
+                    </StackPanel>
+                    <Grid Grid.Column="0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Button
+                            Background="Transparent"
+                            IsVisible="{TemplateBinding Icon,
+                                                        Converter={x:Static ObjectConverters.IsNotNull}}"
+                            Margin="10,0,0,0"
+                            Name="PART_ButtonIcon"
+                            Theme="{StaticResource ButtonCustom}"
+                            VerticalAlignment="Center">
+                            <Image
+                                Height="16"
+                                IsHitTestVisible="False"
+                                Source="{TemplateBinding Icon}"
+                                VerticalAlignment="Center"
+                                Width="16" />
+                        </Button>
+
+                        <TextBlock
+                            Grid.Column="1"
+                            Padding="10,0,0,0"
+                            Text="{TemplateBinding Title}"
+                            VerticalAlignment="Center">
+                            <TextBlock.IsVisible>
+                                <MultiBinding Converter="{StaticResource BooleanArr22BooleanConverter}">
+                                    <MultiBinding.Bindings>
+                                        <Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
+                                        <Binding
+                                            Converter="{x:Static ObjectConverters.IsNotNull}"
+                                            Path="Title"
+                                            RelativeSource="{RelativeSource TemplatedParent}" />
+                                    </MultiBinding.Bindings>
+                                </MultiBinding>
+                            </TextBlock.IsVisible>
+                        </TextBlock>
+                        <ContentPresenter
+                            Content="{TemplateBinding NonClientAreaContent}"
+                            Grid.Column="2"
+                            x:Name="ContentPresenterMain" />
+                    </Grid>
+                </Grid>
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Path
+                        Data="{TemplateBinding Image}"
+                        Fill="{TemplateBinding ImageBrush}"
+                        Grid.Column="0"
+                        Grid.Row="0"
+                        Height="30"
+                        HorizontalAlignment="Center"
+                        IsVisible="{TemplateBinding ShowImage}"
+                        Margin="20,32,0,0"
+                        Stretch="Uniform"
+                        VerticalAlignment="Top"
+                        Width="30" />
+                    <ScrollViewer
+                        Grid.Column="1"
+                        Grid.Row="0"
+                        VerticalAlignment="Top">
+                        <Border
+                            HorizontalAlignment="Left"
+                            Margin="10,32,10,10"
+                            MinHeight="30">
+                            <TextBlock
+                                Text="{TemplateBinding Message}"
+                                TextWrapping="Wrap"
+                                VerticalAlignment="Center" />
+                        </Border>
+                    </ScrollViewer>
+                    <StackPanel
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Grid.Row="1"
+                        HorizontalAlignment="Center"
+                        Margin="0,10,0,16"
+                        Name="PART_Panel"
+                        Orientation="Horizontal" />
+                </Grid>
+            </Grid>
+        </Border>
+
+
+    </ControlTemplate>
+
+
+    <ControlTheme TargetType="{x:Type Window}" x:Key="DefaultMessageBoxStyle">
+        <Setter Property="MinHeight" Value="172" />
+        <Setter Property="ShowInTaskbar" Value="False" />
+        <Setter Property="MinWidth" Value="335" />
+        <Setter Property="MaxWidth" Value="476" />
+        <Setter Property="MaxHeight" Value="680" />
+        <Setter Property="CanResize" Value="False" />
+        <Setter Property="WindowDecorations" Value="None" />
+        <Setter Property="SizeToContent" Value="WidthAndHeight" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="#262e2f" />
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="Template" Value="{StaticResource DefaultMessageBoxControlTemplate}" />
+
+        <Style Selector="^ /template/Button#PART_ButtonClose:pointerover">
+            <Setter Property="Background" Value="#e81123" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
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/SearchBar.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/SearchBar.axaml
new file mode 100644
index 000000000..fd78a16a8
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/SearchBar.axaml
@@ -0,0 +1,603 @@
+<ResourceDictionary
+    x:ClassModifier="internal"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
+    xmlns:system="clr-namespace:System;assembly=mscorlib"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ControlTheme
+        BasedOn="{StaticResource TextBoxBaseStyle}"
+        TargetType="hc:SearchBar"
+        x:Key="SearchBarBaseStyle">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="hc:SearchBar">
+                    <hc:SimplePanel x:Name="root">
+                        <Border
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                            x:Name="border" />
+                        <Grid ColumnDefinitions="*,Auto">
+                            <ScrollViewer
+                                AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                                BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}"
+                                Grid.Column="0"
+                                Grid.Row="0"
+                                HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                                IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                                Margin="-2,0"
+                                Name="PART_ScrollViewer"
+                                VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                                <TextPresenter
+                                    CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
+                                    CaretBrush="{TemplateBinding CaretBrush}"
+                                    CaretIndex="{TemplateBinding CaretIndex}"
+                                    LetterSpacing="{TemplateBinding LetterSpacing}"
+                                    LineHeight="{TemplateBinding LineHeight}"
+                                    Margin="{TemplateBinding Padding}"
+                                    Name="PART_TextPresenter"
+                                    PasswordChar="{TemplateBinding PasswordChar}"
+                                    RevealPassword="{TemplateBinding RevealPassword}"
+                                    SelectionBrush="{TemplateBinding SelectionBrush}"
+                                    SelectionEnd="{TemplateBinding SelectionEnd}"
+                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                    SelectionStart="{TemplateBinding SelectionStart}"
+                                    Text="{TemplateBinding Text,
+                                                           Mode=TwoWay}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                <ScrollViewer.Styles>
+                                    <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                                        <Setter Property="Cursor" Value="IBeam" />
+                                    </Style>
+                                </ScrollViewer.Styles>
+                            </ScrollViewer>
+                            <Button
+                                Command="{TemplateBinding Command}"
+                                CommandParameter="{TemplateBinding CommandParameter}"
+                                Focusable="False"
+                                Foreground="{TemplateBinding BorderBrush}"
+                                Grid.Column="1"
+                                Grid.Row="0"
+                                HorizontalAlignment="Stretch"
+                                Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,0'}"
+                                Theme="{StaticResource ButtonIcon}"
+                                VerticalAlignment="Stretch"
+                                hc:IconElement.Geometry="{StaticResource SearchGeometry}"
+                                hc:IconElement.Width="14" />
+                        </Grid>
+                    </hc:SimplePanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style Selector="^:disabled">
+            <Setter Property="Opacity" Value="0.4" />
+        </Style>
+
+        <Style Selector="^:pointerover">
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+        </Style>
+
+        <Style Selector="^:focus">
+            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTemplate TargetType="hc:SearchBar" x:Key="SearchBarExtendTopTemplate">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="{Binding Path=(hc:InfoElement.ContentHeight), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Double2GridLengthConverter}}" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight), RelativeSource={RelativeSource TemplatedParent}}" />
+            </Grid.RowDefinitions>
+            <DockPanel
+                HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment), RelativeSource={RelativeSource TemplatedParent}}"
+                IsVisible="{Binding Path=(hc:TitleElement.Title), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                LastChildFill="True"
+                Margin="{Binding Path=(hc:TitleElement.MarginOnTheTop), RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter
+                    Content="{Binding Path=(hc:InfoElement.Symbol), RelativeSource={RelativeSource TemplatedParent}}"
+                    DockPanel.Dock="Right"
+                    IsVisible="{Binding Path=(hc:InfoElement.Necessary), RelativeSource={RelativeSource TemplatedParent}}"
+                    Margin="4,0,0,0"
+                    TextElement.Foreground="{DynamicResource DangerBrush}" />
+                <TextBlock
+                    Text="{Binding Path=(hc:TitleElement.Title), RelativeSource={RelativeSource TemplatedParent}}"
+                    TextTrimming="CharacterEllipsis"
+                    TextWrapping="NoWrap"
+                    hc:TextBlockAttach.AutoTooltip="True" />
+            </DockPanel>
+            <Border
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                Grid.Row="1"
+                x:Name="border" />
+            <Grid
+                ColumnDefinitions="*,Auto"
+                Grid.Row="1"
+                x:Name="root">
+                <TextBlock
+                    HorizontalAlignment="Stretch"
+                    IsVisible="{TemplateBinding Text,
+                                                Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                    Margin="{TemplateBinding Padding}"
+                    Text="{Binding Path=(hc:InfoElement.Placeholder), RelativeSource={RelativeSource TemplatedParent}}"
+                    Theme="{StaticResource TextBlockDefaultThiLight}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                <ScrollViewer
+                    AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                    BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}"
+                    Grid.Column="0"
+                    Grid.Row="0"
+                    HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                    IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                    Margin="-2,0"
+                    Name="PART_ScrollViewer"
+                    VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                    <TextPresenter
+                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
+                        CaretBrush="{TemplateBinding CaretBrush}"
+                        CaretIndex="{TemplateBinding CaretIndex}"
+                        LetterSpacing="{TemplateBinding LetterSpacing}"
+                        LineHeight="{TemplateBinding LineHeight}"
+                        Margin="{TemplateBinding Padding}"
+                        Name="PART_TextPresenter"
+                        PasswordChar="{TemplateBinding PasswordChar}"
+                        RevealPassword="{TemplateBinding RevealPassword}"
+                        SelectionBrush="{TemplateBinding SelectionBrush}"
+                        SelectionEnd="{TemplateBinding SelectionEnd}"
+                        SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                        SelectionStart="{TemplateBinding SelectionStart}"
+                        Text="{TemplateBinding Text,
+                                               Mode=TwoWay}"
+                        TextAlignment="{TemplateBinding TextAlignment}"
+                        TextWrapping="{TemplateBinding TextWrapping}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    <ScrollViewer.Styles>
+                        <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                            <Setter Property="Cursor" Value="IBeam" />
+                        </Style>
+                    </ScrollViewer.Styles>
+                </ScrollViewer>
+                <Button
+                    Command="{TemplateBinding Command}"
+                    CommandParameter="{TemplateBinding CommandParameter}"
+                    Foreground="{TemplateBinding BorderBrush}"
+                    Grid.Column="1"
+                    HorizontalAlignment="Stretch"
+                    Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,0'}"
+                    Theme="{StaticResource ButtonIcon}"
+                    VerticalAlignment="Stretch"
+                    hc:IconElement.Geometry="{StaticResource SearchGeometry}"
+                    hc:IconElement.Width="14" />
+            </Grid>
+        </Grid>
+
+
+    </ControlTemplate>
+
+    <ControlTemplate TargetType="hc:SearchBar" x:Key="SearchBarExtendLeftTemplate">
+        <Grid Height="{Binding Path=(hc:InfoElement.ContentHeight), RelativeSource={RelativeSource TemplatedParent}}" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight), RelativeSource={RelativeSource TemplatedParent}}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="{Binding Path=(hc:TitleElement.TitleWidth), RelativeSource={RelativeSource TemplatedParent}}" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <DockPanel
+                HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment), RelativeSource={RelativeSource TemplatedParent}}"
+                IsVisible="{Binding Path=(hc:TitleElement.Title), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                LastChildFill="True"
+                Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft), RelativeSource={RelativeSource TemplatedParent}}"
+                VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment), RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter
+                    Content="{Binding Path=(hc:InfoElement.Symbol), RelativeSource={RelativeSource TemplatedParent}}"
+                    DockPanel.Dock="Right"
+                    IsVisible="{Binding Path=(hc:InfoElement.Necessary), RelativeSource={RelativeSource TemplatedParent}}"
+                    Margin="4,0,0,0"
+                    TextElement.Foreground="{DynamicResource DangerBrush}" />
+                <TextBlock
+                    Text="{Binding Path=(hc:TitleElement.Title), RelativeSource={RelativeSource TemplatedParent}}"
+                    TextTrimming="CharacterEllipsis"
+                    TextWrapping="NoWrap"
+                    hc:TextBlockAttach.AutoTooltip="True" />
+            </DockPanel>
+            <Border
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                Grid.Column="1"
+                x:Name="border" />
+            <Grid
+                ColumnDefinitions="*,Auto"
+                Grid.Column="1"
+                x:Name="root">
+                <TextBlock
+                    HorizontalAlignment="Stretch"
+                    IsVisible="{TemplateBinding Text,
+                                                Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                    Margin="{TemplateBinding Padding}"
+                    Text="{Binding Path=(hc:InfoElement.Placeholder), RelativeSource={RelativeSource TemplatedParent}}"
+                    Theme="{StaticResource TextBlockDefaultThiLight}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                <ScrollViewer
+                    AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                    BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}"
+                    Grid.Column="0"
+                    Grid.Row="0"
+                    HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                    IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                    Margin="-2,0"
+                    Name="PART_ScrollViewer"
+                    VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                    <TextPresenter
+                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
+                        CaretBrush="{TemplateBinding CaretBrush}"
+                        CaretIndex="{TemplateBinding CaretIndex}"
+                        LetterSpacing="{TemplateBinding LetterSpacing}"
+                        LineHeight="{TemplateBinding LineHeight}"
+                        Margin="{TemplateBinding Padding}"
+                        Name="PART_TextPresenter"
+                        PasswordChar="{TemplateBinding PasswordChar}"
+                        RevealPassword="{TemplateBinding RevealPassword}"
+                        SelectionBrush="{TemplateBinding SelectionBrush}"
+                        SelectionEnd="{TemplateBinding SelectionEnd}"
+                        SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                        SelectionStart="{TemplateBinding SelectionStart}"
+                        Text="{TemplateBinding Text,
+                                               Mode=TwoWay}"
+                        TextAlignment="{TemplateBinding TextAlignment}"
+                        TextWrapping="{TemplateBinding TextWrapping}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    <ScrollViewer.Styles>
+                        <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                            <Setter Property="Cursor" Value="IBeam" />
+                        </Style>
+                    </ScrollViewer.Styles>
+                </ScrollViewer>
+                <Button
+                    Command="{TemplateBinding Command}"
+                    CommandParameter="{TemplateBinding CommandParameter}"
+                    Foreground="{TemplateBinding BorderBrush}"
+                    Grid.Column="1"
+                    HorizontalAlignment="Stretch"
+                    Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,0'}"
+                    Theme="{StaticResource ButtonIcon}"
+                    VerticalAlignment="Stretch"
+                    hc:IconElement.Geometry="{StaticResource SearchGeometry}"
+                    hc:IconElement.Width="14" />
+            </Grid>
+        </Grid>
+    </ControlTemplate>
+
+    <ControlTheme
+        BasedOn="{StaticResource SearchBarBaseStyle}"
+        TargetType="hc:SearchBar"
+        x:Key="SearchBarExtendBaseStyle">
+        <Setter Property="hc:InfoElement.Symbol" Value="●" />
+        <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+        <Setter Property="Template" Value="{StaticResource SearchBarExtendTopTemplate}" />
+
+        <Style Selector="^[(hc|TitleElement.TitlePlacement)=Left]">
+            <Setter Property="Template" Value="{StaticResource SearchBarExtendLeftTemplate}" />
+        </Style>
+        <Style Selector="^:disabled /template/Border#border">
+            <Setter Property="Opacity" Value="0.4" />
+        </Style>
+        <Style Selector="^:disabled /template/Grid#root">
+            <Setter Property="Opacity" Value="0.4" />
+        </Style>
+
+        <Style Selector="^:pointerover">
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+        </Style>
+
+        <Style Selector="^:focus">
+            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTemplate TargetType="hc:SearchBar" x:Key="SearchBarPlusTopTemplate">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="{Binding Path=(hc:InfoElement.ContentHeight), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Double2GridLengthConverter}}" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight), RelativeSource={RelativeSource TemplatedParent}}" />
+            </Grid.RowDefinitions>
+            <DockPanel
+                HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment), RelativeSource={RelativeSource TemplatedParent}}"
+                IsVisible="{Binding Path=(hc:TitleElement.Title), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                LastChildFill="True"
+                Margin="{Binding Path=(hc:TitleElement.MarginOnTheTop), RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter
+                    Content="{Binding Path=(hc:InfoElement.Symbol), RelativeSource={RelativeSource TemplatedParent}}"
+                    DockPanel.Dock="Right"
+                    IsVisible="{Binding Path=(hc:InfoElement.Necessary), RelativeSource={RelativeSource TemplatedParent}}"
+                    Margin="4,0,0,0"
+                    TextElement.Foreground="{DynamicResource DangerBrush}" />
+                <TextBlock
+                    Text="{Binding Path=(hc:TitleElement.Title), RelativeSource={RelativeSource TemplatedParent}}"
+                    TextTrimming="CharacterEllipsis"
+                    TextWrapping="NoWrap"
+                    hc:TextBlockAttach.AutoTooltip="True" />
+            </DockPanel>
+            <Border
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                Grid.Row="1"
+                x:Name="border" />
+            <Grid
+                ColumnDefinitions="* auto auto"
+                Grid.Row="1"
+                x:Name="root">
+                <Button
+                    Command="{Binding $parent[TextBox].Clear}"
+                    Focusable="False"
+                    Foreground="{TemplateBinding BorderBrush}"
+                    Grid.Column="1"
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Left"
+                    IsVisible="False"
+                    Name="ButtonClear"
+                    Padding="0,0,2,0"
+                    Theme="{StaticResource ButtonIcon}"
+                    VerticalAlignment="Stretch"
+                    hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}"
+                    hc:IconElement.Width="14" />
+                <Button
+                    Command="{TemplateBinding Command}"
+                    CommandParameter="{TemplateBinding CommandParameter}"
+                    Focusable="False"
+                    Foreground="{TemplateBinding BorderBrush}"
+                    Grid.Column="2"
+                    Grid.Row="0"
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Left"
+                    Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,0'}"
+                    Theme="{StaticResource ButtonIcon}"
+                    VerticalAlignment="Stretch"
+                    hc:IconElement.Geometry="{StaticResource SearchGeometry}"
+                    hc:IconElement.Width="14" />
+                <TextBlock
+                    Grid.Column="0"
+                    Grid.Row="0"
+                    HorizontalAlignment="Stretch"
+                    IsVisible="{TemplateBinding Text,
+                                                Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                    Margin="{TemplateBinding Padding}"
+                    Text="{Binding Path=(hc:InfoElement.Placeholder), RelativeSource={RelativeSource TemplatedParent}}"
+                    Theme="{StaticResource TextBlockDefaultThiLight}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                <ScrollViewer
+                    AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                    BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}"
+                    Grid.Column="0"
+                    Grid.Row="0"
+                    HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                    IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                    Margin="-2,0"
+                    Name="PART_ScrollViewer"
+                    VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                    <TextPresenter
+                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
+                        CaretBrush="{TemplateBinding CaretBrush}"
+                        CaretIndex="{TemplateBinding CaretIndex}"
+                        LetterSpacing="{TemplateBinding LetterSpacing}"
+                        LineHeight="{TemplateBinding LineHeight}"
+                        Margin="{TemplateBinding Padding}"
+                        Name="PART_TextPresenter"
+                        PasswordChar="{TemplateBinding PasswordChar}"
+                        RevealPassword="{TemplateBinding RevealPassword}"
+                        SelectionBrush="{TemplateBinding SelectionBrush}"
+                        SelectionEnd="{TemplateBinding SelectionEnd}"
+                        SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                        SelectionStart="{TemplateBinding SelectionStart}"
+                        Text="{TemplateBinding Text,
+                                               Mode=TwoWay}"
+                        TextAlignment="{TemplateBinding TextAlignment}"
+                        TextWrapping="{TemplateBinding TextWrapping}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    <ScrollViewer.Styles>
+                        <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                            <Setter Property="Cursor" Value="IBeam" />
+                        </Style>
+                    </ScrollViewer.Styles>
+                </ScrollViewer>
+            </Grid>
+        </Grid>
+    </ControlTemplate>
+
+    <ControlTemplate TargetType="hc:SearchBar" x:Key="SearchBarPlusLeftTemplate">
+        <Grid Height="{Binding Path=(hc:InfoElement.ContentHeight), RelativeSource={RelativeSource TemplatedParent}}" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight), RelativeSource={RelativeSource TemplatedParent}}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="{Binding Path=(hc:TitleElement.TitleWidth), RelativeSource={RelativeSource TemplatedParent}}" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <DockPanel
+                HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment), RelativeSource={RelativeSource TemplatedParent}}"
+                IsVisible="{Binding Path=(hc:TitleElement.Title), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                LastChildFill="True"
+                Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft), RelativeSource={RelativeSource TemplatedParent}}"
+                VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment), RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter
+                    Content="{Binding Path=(hc:InfoElement.Symbol), RelativeSource={RelativeSource TemplatedParent}}"
+                    DockPanel.Dock="Right"
+                    IsVisible="{Binding Path=(hc:InfoElement.Necessary), RelativeSource={RelativeSource TemplatedParent}}"
+                    Margin="4,0,0,0"
+                    TextElement.Foreground="{DynamicResource DangerBrush}" />
+                <TextBlock
+                    Text="{Binding Path=(hc:TitleElement.Title), RelativeSource={RelativeSource TemplatedParent}}"
+                    TextTrimming="CharacterEllipsis"
+                    TextWrapping="NoWrap"
+                    hc:TextBlockAttach.AutoTooltip="True" />
+            </DockPanel>
+            <Border
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                Grid.Column="1"
+                x:Name="border" />
+            <Grid Grid.Column="1" x:Name="root">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Button
+                    Command="{Binding $parent[TextBox].Clear}"
+                    Focusable="False"
+                    Foreground="{TemplateBinding BorderBrush}"
+                    Grid.Column="1"
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Left"
+                    IsVisible="False"
+                    Name="ButtonClear"
+                    Padding="0,0,2,0"
+                    Theme="{StaticResource ButtonIcon}"
+                    VerticalAlignment="Stretch"
+                    hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}"
+                    hc:IconElement.Width="14" />
+                <Button
+                    Command="{TemplateBinding Command}"
+                    CommandParameter="{TemplateBinding CommandParameter}"
+                    Focusable="False"
+                    Foreground="{TemplateBinding BorderBrush}"
+                    Grid.Column="2"
+                    Grid.Row="0"
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Left"
+                    Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,0'}"
+                    Theme="{StaticResource ButtonIcon}"
+                    VerticalAlignment="Stretch"
+                    hc:IconElement.Geometry="{StaticResource SearchGeometry}"
+                    hc:IconElement.Width="14" />
+                <TextBlock
+                    Grid.Column="0"
+                    Grid.Row="0"
+                    HorizontalAlignment="Stretch"
+                    IsVisible="{TemplateBinding Text,
+                                                Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                    Margin="{TemplateBinding Padding}"
+                    Text="{Binding Path=(hc:InfoElement.Placeholder), RelativeSource={RelativeSource TemplatedParent}}"
+                    Theme="{StaticResource TextBlockDefaultThiLight}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                <ScrollViewer
+                    AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                    BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}"
+                    Grid.Column="0"
+                    Grid.Row="0"
+                    HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                    IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                    Margin="-2,0"
+                    Name="PART_ScrollViewer"
+                    VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                    <TextPresenter
+                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
+                        CaretBrush="{TemplateBinding CaretBrush}"
+                        CaretIndex="{TemplateBinding CaretIndex}"
+                        LetterSpacing="{TemplateBinding LetterSpacing}"
+                        LineHeight="{TemplateBinding LineHeight}"
+                        Margin="{TemplateBinding Padding}"
+                        Name="PART_TextPresenter"
+                        PasswordChar="{TemplateBinding PasswordChar}"
+                        RevealPassword="{TemplateBinding RevealPassword}"
+                        SelectionBrush="{TemplateBinding SelectionBrush}"
+                        SelectionEnd="{TemplateBinding SelectionEnd}"
+                        SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                        SelectionStart="{TemplateBinding SelectionStart}"
+                        Text="{TemplateBinding Text,
+                                               Mode=TwoWay}"
+                        TextAlignment="{TemplateBinding TextAlignment}"
+                        TextWrapping="{TemplateBinding TextWrapping}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    <ScrollViewer.Styles>
+                        <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                            <Setter Property="Cursor" Value="IBeam" />
+                        </Style>
+                    </ScrollViewer.Styles>
+                </ScrollViewer>
+            </Grid>
+        </Grid>
+    </ControlTemplate>
+
+    <ControlTheme
+        BasedOn="{StaticResource SearchBarExtendBaseStyle}"
+        TargetType="hc:SearchBar"
+        x:Key="SearchBarPlusBaseStyle">
+        <Setter Property="Template" Value="{StaticResource SearchBarPlusTopTemplate}" />
+        <Style Selector="^[(hc|TitleElement.TitlePlacement)=Left]">
+            <Setter Property="Template" Value="{StaticResource SearchBarPlusLeftTemplate}" />
+        </Style>
+        <Style Selector="^:disabled /template/Border#border">
+            <Setter Property="Opacity" Value="0.4" />
+        </Style>
+        <Style Selector="^:disabled /template/Grid#root">
+            <Setter Property="Opacity" Value="0.4" />
+        </Style>
+
+        <Style Selector="^/template/Grid#root:pointerover ^">
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            <Style Selector="^[(hc|InfoElement.ShowClearButton)=True] /template/Button#ButtonClear">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+        </Style>
+        <Style Selector="^:focus">
+            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme
+        BasedOn="{StaticResource SearchBarBaseStyle}"
+        TargetType="hc:SearchBar"
+        x:Key="{x:Type hc:SearchBar}" />
+
+    <ControlTheme
+        BasedOn="{StaticResource SearchBarBaseStyle}"
+        TargetType="hc:SearchBar"
+        x:Key="SearchBar.Small">
+        <Setter Property="MinHeight" Value="20" />
+        <Setter Property="Padding" Value="6,0" />
+    </ControlTheme>
+
+    <ControlTheme
+        BasedOn="{StaticResource SearchBarExtendBaseStyle}"
+        TargetType="hc:SearchBar"
+        x:Key="SearchBarExtend" />
+
+    <ControlTheme
+        BasedOn="{StaticResource SearchBarExtend}"
+        TargetType="hc:SearchBar"
+        x:Key="SearchBarExtend.Small">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+        <Setter Property="hc:TitleElement.MarginOnTheTop" Value="6,0,0,1" />
+        <Setter Property="Padding" Value="6,0" />
+        <Setter Property="MinHeight" Value="20" />
+    </ControlTheme>
+
+    <ControlTheme
+        BasedOn="{StaticResource SearchBarPlusBaseStyle}"
+        TargetType="hc:SearchBar"
+        x:Key="SearchBarPlus" />
+
+    <ControlTheme
+        BasedOn="{StaticResource SearchBarPlus}"
+        TargetType="hc:SearchBar"
+        x:Key="SearchBarPlus.Small">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+        <Setter Property="hc:TitleElement.MarginOnTheTop" Value="6,0,0,1" />
+        <Setter Property="Padding" Value="6,0" />
+        <Setter Property="MinHeight" Value="20" />
+    </ControlTheme>
+
+</ResourceDictionary>
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}"
diff --git a/src/Avalonia/HandyControl_Avalonia/Tools/Converter/BooleanArr22BooleanConverter.cs b/src/Avalonia/HandyControl_Avalonia/Tools/Converter/BooleanArr22BooleanConverter.cs
new file mode 100644
index 000000000..17d76a0b0
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Tools/Converter/BooleanArr22BooleanConverter.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Data.Converters;
+
+namespace HandyControl.Tools.Converter;
+
+public class BooleanArr22BooleanConverter : IMultiValueConverter
+{
+    public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return values?.All(x => x is bool && (bool)x == true) == true;
+    }
+}