diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
index 104e746..3a0d2ac 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
+++ b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
@@ -5,6 +5,7 @@
              xmlns:local="clr-namespace:Ursa.Demo.Dialogs"
              x:DataType="local:DialogWithActionViewModel"
              x:CompileBindings="True"
+             Background="{DynamicResource SemiYellow1}"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Dialogs.DialogWithAction">
     <StackPanel Margin="24">
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
index 2f0565e..89dbb0d 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
@@ -3,6 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             xmlns:local="clr-namespace:Ursa.Demo.Dialogs"
+             x:DataType="local:PlainDialogViewModel"
+             x:CompileBindings="True"
              x:Class="Ursa.Demo.Dialogs.PlainDialog">
     <StackPanel>
         <Calendar SelectedDate="{Binding Date}" ></Calendar>
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
index e7105f2..2e199a6 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
+++ b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
@@ -1,8 +1,15 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Ursa.Demo.Dialogs;
 
 public class PlainDialogViewModel: ObservableObject
 {
-    
+    private DateTime? _date;
+
+    public DateTime? Date
+    {
+        get => _date;
+        set => SetProperty(ref _date, value);
+    }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index d6ddd48..f5f24e9 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -12,29 +12,62 @@
     x:DataType="vm:DialogDemoViewModel"
     mc:Ignorable="d">
     <Grid ColumnDefinitions="Auto, *">
-        <StackPanel Grid.Column="0">
-            <TextBlock>
-                <Run Text="Result: "></Run>
-                <Run Text="{Binding Result}"></Run>
-            </TextBlock>
-            <TextBlock>
-                <Run Text="Date: "></Run>
-                <Run Text="{Binding DialogViewModel.Date}"></Run>
-            </TextBlock>
-            <Button Command="{Binding ShowDefaultWindowCommand}">Show Default Modal Dialog</Button>
-            <Button Command="{Binding ShowGlobalModalDialogCommand}">Show Custom Modal Dialog</Button>
-            <Button Command="{Binding ShowLocalOverlayModalDialogCommand}">Show Local Overlay Modal Dialog</Button>
-            <Button Command="{Binding ShowGlobalOverlayModalDialogCommand}"> Show Global Overlay Modal Dialog </Button>
-            <Button Command="{Binding ShowGlobalOverlayDialogCommand}">Show Global Overlay Dialog</Button>
-        </StackPanel>
+        <TabControl Grid.Column="0" Width="300">
+            <TabItem Header="Default">
+                <StackPanel>
+                    <ToggleSwitch
+                        Name="overlay"
+                        IsChecked="{Binding IsWindow}"
+                        OffContent="Overlay"
+                        OnContent="Window" />
+                    <ToggleSwitch
+                        IsVisible="{Binding !#overlay.IsChecked}"
+                        IsChecked="{Binding IsGlobal}"
+                        OffContent="Local"
+                        OnContent="Global" />
+                    <ToggleSwitch
+                        IsVisible="{Binding !#overlay.IsChecked}"
+                        IsChecked="{Binding IsModal}"
+                        OffContent="Regular"
+                        OnContent="Modal" />
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="Buttons" />
+                        <ComboBox ItemsSource="{Binding Buttons}" SelectedItem="{Binding SelectedButton}" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="Mode" />
+                        <ComboBox ItemsSource="{Binding Modes}" SelectedItem="{Binding SelectedMode}"/>
+                    </StackPanel>
+                    <Button Content="Show Dialog" Command="{Binding ShowDialogCommand}" />
+                    <TextBlock>
+                        <Run Text="Default Result: "></Run>
+                        <Run Text="{Binding DefaultResult}"/>
+                    </TextBlock>
+                    <TextBlock>
+                        <Run Text="Dialog Date: "></Run>
+                        <Run Text="{Binding Date}"/>
+                    </TextBlock>
+                </StackPanel>
+            </TabItem>
+            <TabItem Header="Custom">
+                <StackPanel>
+                    <ToggleSwitch OffContent="Overlay" OnContent="Window" IsChecked="{Binding IsWindow}" Name="overlay2" />
+                    <ToggleSwitch IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Local" OnContent="Global" IsChecked="{Binding IsGlobal}" />
+                    <ToggleSwitch IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Regular" OnContent="Modal" IsChecked="{Binding IsModal}" />
+                    <Button Content="Show Dialog" Command="{Binding ShowCustomDialogCommand}" />
+                    <TextBlock>
+                        <Run Text="Custom Result: "></Run>
+                        <Run Text="{Binding Result}"/>
+                    </TextBlock>
+                    <TextBlock>
+                        <Run Text="Dialog Date: "></Run>
+                        <Run Text="{Binding Date}"/>
+                    </TextBlock>
+                </StackPanel>
+            </TabItem>
+        </TabControl>
         <Grid Grid.Column="1">
-            <Button
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Command="{Binding ShowLocalOverlayModalDialogCommand}">
-                Show Local Overlay Dialog
-            </Button>
-            <Border CornerRadius="20" ClipToBounds="True">
+            <Border ClipToBounds="True" CornerRadius="20" BorderThickness="1" BorderBrush="{DynamicResource SemiGrey1}">
                 <u:OverlayDialogHost HostId="LocalHost" />
             </Border>
         </Grid>
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index ec6126f..163e7b7 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -12,68 +13,140 @@ namespace Ursa.Demo.ViewModels;
 
 public class DialogDemoViewModel: ObservableObject
 {
-    public ICommand ShowLocalOverlayModalDialogCommand { get; }
-    public ICommand ShowGlobalOverlayModalDialogCommand { get; }
-    public ICommand ShowGlobalModalDialogCommand { get; }
-    public ICommand ShowGlobalOverlayDialogCommand { get; }
-    public ICommand ShowDefaultWindowCommand { get; }
+    public ICommand ShowDialogCommand { get; set; }
+    public ICommand ShowCustomDialogCommand { get; set; }
 
-    private object? _result;
-    public object? Result
+    private DialogMode _selectedMode;
+    public DialogMode SelectedMode
+    {
+        get => _selectedMode;
+        set => SetProperty(ref _selectedMode, value);
+    }
+    
+    public ObservableCollection<DialogMode> Modes { get; set; }
+    
+    private DialogButton _selectedButton;
+    public DialogButton SelectedButton
+    {
+        get => _selectedButton;
+        set => SetProperty(ref _selectedButton, value);
+    }
+    
+    public ObservableCollection<DialogButton> Buttons { get; set; }
+
+    private bool _isWindow;
+    public bool IsWindow
+    {
+        get => _isWindow;
+        set => SetProperty(ref _isWindow, value);
+    }
+    
+    private bool _isGlobal;
+    public bool IsGlobal
+    {
+        get => _isGlobal;
+        set => SetProperty(ref _isGlobal, value);
+    }
+
+    private bool _isModal;
+    public bool IsModal
+    {
+        get => _isModal;
+        set => SetProperty(ref _isModal, value);
+    }
+
+    private DialogResult? _defaultResult;
+    public DialogResult? DefaultResult
+    {
+        get => _defaultResult;
+        set => SetProperty(ref _defaultResult, value);
+    }
+
+    private bool _result;
+    public bool Result
     {
         get => _result;
         set => SetProperty(ref _result, value);
     }
 
-    private DateTime _date;
-
-    public DateTime Date
+    private DateTime? _date;
+    public DateTime? Date
     {
         get => _date;
         set => SetProperty(ref _date, value);
     }
-
-    public DialogWithActionViewModel DialogViewModel { get; set; } = new DialogWithActionViewModel();
-
+    
+    
     public DialogDemoViewModel()
     {
-        ShowLocalOverlayModalDialogCommand = new AsyncRelayCommand(ShowLocalOverlayModalDialog);
-        ShowGlobalOverlayModalDialogCommand = new AsyncRelayCommand(ShowGlobalOverlayModalDialog);
-        ShowGlobalModalDialogCommand = new AsyncRelayCommand(ShowGlobalModalDialog);
-        ShowGlobalOverlayDialogCommand = new RelayCommand(ShowGlobalOverlayDialog);
-        ShowDefaultWindowCommand = new AsyncRelayCommand(ShowDefaultWindow);
+        ShowDialogCommand = new AsyncRelayCommand(ShowDialog);
+        ShowCustomDialogCommand = new AsyncRelayCommand(ShowCustomDialog);
+        Modes = new ObservableCollection<DialogMode>(Enum.GetValues<DialogMode>());
+        Buttons = new ObservableCollection<DialogButton>(Enum.GetValues<DialogButton>());
     }
-
-    private async Task ShowDefaultWindow()
+    
+    private async Task ShowDialog()
     {
-        var result = await Dialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(new PlainDialogViewModel(),
-            mode: DialogMode.Error, buttons: DialogButton.OKCancel, title:"确定取消预约吗？");
-        Result = result;
-        return;
+        var vm = new PlainDialogViewModel();
+        if (IsWindow)
+        {
+            DefaultResult = await Dialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(
+                vm,
+                "Please select a date",
+                SelectedMode,
+                SelectedButton);
+            Date = vm.Date;
+        }
+        else
+        {
+            if (IsModal)
+            {
+                DefaultResult = await OverlayDialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(
+                    vm,
+                    IsGlobal ? null : "LocalHost",
+                    "Please select a date",
+                    SelectedMode,
+                    SelectedButton
+                );
+                Date = vm.Date;
+            }
+            else
+            {
+                OverlayDialog.Show<PlainDialog, PlainDialogViewModel>(
+                    new PlainDialogViewModel(),
+                    IsGlobal ? null : "LocalHost",
+                    "Please select a date",
+                    SelectedMode,
+                    SelectedButton);
+            }
+        }
+        
     }
-
-    private void ShowGlobalOverlayDialog()
-    {
-        OverlayDialog.ShowCustom<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel());
-    }
-
-    private async Task ShowGlobalModalDialog()
-    {
-        var result = await Dialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
-        Result = result;
-    }
-
-    private async Task ShowGlobalOverlayModalDialog()
-    {
-        Result = await OverlayDialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(new PlainDialogViewModel(),
-            title: "Please select a date", mode: DialogMode.Error, buttons: DialogButton.YesNoCancel);
-    }
-
-    private async Task ShowLocalOverlayModalDialog()
+    
+    private async Task ShowCustomDialog()
     {
         var vm = new DialogWithActionViewModel();
-        var result = await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-            vm, "LocalHost");
-        Result = result;
+        if (IsWindow)
+        {
+            
+            Result = await Dialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+                vm);
+            Date = vm.Date;
+        }
+        else
+        {
+            if (IsModal)
+            {
+                Result = await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+                    vm, IsGlobal ? null : "LocalHost");
+                Date = vm.Date;
+            }
+            else
+            {
+                OverlayDialog.ShowCustom<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel(),
+                    IsGlobal ? null : "LocalHost");
+            }
+        }
+        
     }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 8307975..08338af 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -129,6 +129,7 @@
                                 VerticalAlignment="Center"
                                 Height="16" />
                             <TextBlock
+                                Name="PART_Title"
                                 Grid.Column="1"
                                 Margin="0 24 0 0 "
                                 FontWeight="Bold"
@@ -183,6 +184,9 @@
             <Style Selector="^ /template/ PathIcon#PART_Icon">
                 <Setter Property="IsVisible" Value="False"></Setter>
             </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Title">
+                <Setter Property="Margin" Value="24 24 0 0"></Setter>
+            </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
                 <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
             </Style>
@@ -386,7 +390,7 @@
                         <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
                             <TextBlock
                                 Grid.Column="0"
-                                Margin="8,8,0,0"
+                                Margin="24, 24,0,0"
                                 FontSize="14"
                                 FontWeight="Bold"
                                 Text="{TemplateBinding Title}"
@@ -429,7 +433,7 @@
         </Setter>
         <Setter Property="CanResize" Value="False" />
         <Setter Property="Template">
-            <ControlTemplate TargetType="u:DialogWindow">
+            <ControlTemplate TargetType="u:DefaultDialogWindow">
                 <Panel>
                     <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                     <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
@@ -455,6 +459,7 @@
                                 VerticalAlignment="Center"
                                 Height="16" />
                             <TextBlock
+                                Name="PART_Title"
                                 Grid.Column="1"
                                 Margin="0 24 0 0 "
                                 FontWeight="Bold"
@@ -505,10 +510,13 @@
                 </Panel>
             </ControlTemplate>
         </Setter>
-                <Style Selector="^[Mode=None]">
+        <Style Selector="^[Mode=None]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
                 <Setter Property="IsVisible" Value="False"></Setter>
             </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Title">
+                <Setter Property="Margin" Value="24 24 0 0"></Setter>
+            </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
                 <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
             </Style>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 80d3ebd..3b146fd 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -41,6 +41,7 @@
                                 Grid.Column="0"
                                 Width="24"
                                 Height="24"
+                                Margin="0 0 8 0"
                                 IsHitTestVisible="False"
                                 VerticalAlignment="Center" />
                             <TextBlock
@@ -48,6 +49,7 @@
                                 FontSize="16"
                                 FontWeight="Bold"
                                 IsHitTestVisible="False"
+                                VerticalAlignment="Center"
                                 Text="{TemplateBinding Title}"
                                 TextTrimming="CharacterEllipsis"
                                 TextWrapping="NoWrap" />