diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 08338af..750722b 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -3,44 +3,46 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:theme="clr-namespace:Ursa.Themes.Semi"
     xmlns:u="https://irihi.tech/ursa">
-    
+
     <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
         <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}" />
     </ControlTheme>
     <ControlTheme x:Key="{x:Type u:DialogControl}" TargetType="u:DialogControl">
-        <Setter Property="CornerRadius" Value="12"></Setter>
+        <Setter Property="CornerRadius" Value="12" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DialogControl">
                 <Border
+                    Margin="8"
                     Padding="0"
-                    Margin="4"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Shadow"
+                    ClipToBounds="False"
                     CornerRadius="{TemplateBinding CornerRadius}"
-                    ClipToBounds="True"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
-                    <Grid RowDefinitions="Auto, *">
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            Grid.Row="0"
-                            Grid.RowSpan="2"
-                            Content="{TemplateBinding Content}" />
-                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
-                            <Panel
-                                Name="{x:Static u:DialogControl.PART_TitleArea}"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="2"
-                                Background="Transparent" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="1"
-                                Margin="0,24,24,0"
-                                DockPanel.Dock="Right"
-                                Theme="{DynamicResource CloseButton}" />
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Background="Transparent" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="1"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
                         </Grid>
-                    </Grid>
+                    </Border>
                 </Border>
             </ControlTemplate>
         </Setter>
@@ -95,207 +97,211 @@
             </Setter>
         </Style>
     </ControlTheme>
-    
+
     <ControlTheme x:Key="{x:Type u:DefaultDialogControl}" TargetType="u:DefaultDialogControl">
-        <Setter Property="CornerRadius" Value="12"></Setter>
+        <Setter Property="CornerRadius" Value="12" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DefaultDialogControl">
                 <Border
+                    Margin="10"
                     Padding="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
+                    BoxShadow="0 0 8 0 #1A000000"
                     Classes="Shadow"
+                    ClipToBounds="False"
                     CornerRadius="{TemplateBinding CornerRadius}"
-                    ClipToBounds="True"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
-                    <Grid RowDefinitions="Auto, *, Auto">
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            Grid.Row="1"
-                            Margin="24 8"
-                            Content="{TemplateBinding Content}" />
-                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
-                            <Panel
-                                Name="{x:Static u:DialogControl.PART_TitleArea}"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="3"
-                                Background="Transparent" />
-                            <PathIcon
-                                Name="PART_Icon"
-                                Grid.Column="0"
-                                Margin="24 24 8 0"
-                                Width="16"
-                                VerticalAlignment="Center"
-                                Height="16" />
-                            <TextBlock
-                                Name="PART_Title"
-                                Grid.Column="1"
-                                Margin="0 24 0 0 "
-                                FontWeight="Bold"
-                                FontSize="16"
-                                TextWrapping="Wrap"
-                                VerticalAlignment="Center"
-                                IsHitTestVisible="False"
-                                IsVisible="{TemplateBinding Title,
-                                                            Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Text="{TemplateBinding Title}" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="2"
-                                Margin="0 24 24 0"
-                                DockPanel.Dock="Right"
-                                Theme="{DynamicResource CloseButton}" />
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Row="1"
+                                Margin="24,8"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    Background="Transparent" />
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="24,24,8,0"
+                                    VerticalAlignment="Center" />
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="0,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    IsVisible="{TemplateBinding Title,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Text="{TemplateBinding Title}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="2"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="取消" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="否"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="是"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="确认"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
                         </Grid>
-                        <StackPanel
-                            Grid.Row="2"
-                            Margin="24 0 24 24"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
-                                Margin="8,0,0,0"
-                                Classes="Tertiary"
-                                Content="取消" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
-                                Margin="8,0,0,0"
-                                Classes="Danger"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="否" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="是" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="确认" />
-                        </StackPanel>
-                    </Grid>
+                    </Border>
                 </Border>
             </ControlTemplate>
         </Setter>
         <Style Selector="^[Mode=None]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="False"></Setter>
+                <Setter Property="IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_Title">
-                <Setter Property="Margin" Value="24 24 0 0"></Setter>
+                <Setter Property="Margin" Value="24 24 0 0" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Info]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Warning]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Error]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Question]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Success]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
 
@@ -390,7 +396,7 @@
                         <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
                             <TextBlock
                                 Grid.Column="0"
-                                Margin="24, 24,0,0"
+                                Margin="24,24,0,0"
                                 FontSize="14"
                                 FontWeight="Bold"
                                 Text="{TemplateBinding Title}"
@@ -443,7 +449,7 @@
                         <ContentPresenter
                             Name="PART_ContentPresenter"
                             Grid.Row="1"
-                            Margin="24 8"
+                            Margin="24,8"
                             Content="{TemplateBinding Content}" />
                         <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
                             <Panel
@@ -454,32 +460,32 @@
                             <PathIcon
                                 Name="PART_Icon"
                                 Grid.Column="0"
-                                Margin="24 24 8 0"
                                 Width="16"
-                                VerticalAlignment="Center"
-                                Height="16" />
+                                Height="16"
+                                Margin="24,24,8,0"
+                                VerticalAlignment="Center" />
                             <TextBlock
                                 Name="PART_Title"
                                 Grid.Column="1"
-                                Margin="0 24 0 0 "
-                                FontWeight="Bold"
-                                FontSize="16"
-                                TextWrapping="Wrap"
+                                Margin="0,24,0,0"
                                 VerticalAlignment="Center"
+                                FontSize="16"
+                                FontWeight="Bold"
                                 IsHitTestVisible="False"
                                 IsVisible="{TemplateBinding Title,
                                                             Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Text="{TemplateBinding Title}" />
+                                Text="{TemplateBinding Title}"
+                                TextWrapping="Wrap" />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                 Grid.Column="2"
-                                Margin="0 24 24 0"
+                                Margin="0,24,24,0"
                                 DockPanel.Dock="Right"
                                 Theme="{DynamicResource CloseButton}" />
                         </Grid>
                         <StackPanel
                             Grid.Row="2"
-                            Margin="24 0 24 24"
+                            Margin="24,0,24,24"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">
                             <Button
@@ -491,20 +497,20 @@
                                 Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
                                 Margin="8,0,0,0"
                                 Classes="Danger"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="否" />
+                                Content="否"
+                                Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="是" />
+                                Content="是"
+                                Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="确认" />
+                                Content="确认"
+                                Theme="{DynamicResource SolidButton}" />
                         </StackPanel>
                     </Grid>
                 </Panel>
@@ -512,120 +518,120 @@
         </Setter>
         <Style Selector="^[Mode=None]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="False"></Setter>
+                <Setter Property="IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_Title">
-                <Setter Property="Margin" Value="24 24 0 0"></Setter>
+                <Setter Property="Margin" Value="24 24 0 0" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Info]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Warning]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Error]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Question]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Success]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 3b146fd..a5aa865 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -35,21 +35,24 @@
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                     <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto" Margin="24 24 24 0">
+                        <Grid
+                            Grid.Row="0"
+                            Margin="24,24,24,0"
+                            ColumnDefinitions="Auto, *, Auto">
                             <PathIcon
                                 Name="PART_Icon"
                                 Grid.Column="0"
                                 Width="24"
                                 Height="24"
-                                Margin="0 0 8 0"
-                                IsHitTestVisible="False"
-                                VerticalAlignment="Center" />
+                                Margin="0,0,8,0"
+                                VerticalAlignment="Center"
+                                IsHitTestVisible="False" />
                             <TextBlock
                                 Grid.Column="1"
+                                VerticalAlignment="Center"
                                 FontSize="16"
                                 FontWeight="Bold"
                                 IsHitTestVisible="False"
-                                VerticalAlignment="Center"
                                 Text="{TemplateBinding Title}"
                                 TextTrimming="CharacterEllipsis"
                                 TextWrapping="NoWrap" />
@@ -146,7 +149,7 @@
 
     <ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl">
         <Setter Property="CornerRadius" Value="12" />
-        <Setter Property="Padding" Value="48 24"></Setter>
+        <Setter Property="Padding" Value="48 24" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:MessageBoxControl">
                 <Border
@@ -154,88 +157,90 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Shadow"
-                    ClipToBounds="True"
+                    ClipToBounds="False"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
-                    <Grid RowDefinitions="Auto, *, Auto">
-                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
-                            <Panel
-                                Name="{x:Static u:DialogControl.PART_TitleArea}"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="3"
-                                Background="Transparent" />
-                            <PathIcon
-                                Name="PART_Icon"
-                                Grid.Column="0"
-                                Width="24"
-                                Height="24"
-                                Margin="24,24,8,0"
-                                IsHitTestVisible="False"
-                                VerticalAlignment="Center" />
-                            <TextBlock
-                                Name="PART_Title"
-                                Grid.Column="1"
-                                Margin="0,24,0,0"
-                                FontSize="16"
-                                VerticalAlignment="Center"
-                                FontWeight="Bold"
-                                Text="{TemplateBinding Title}"
-                                IsHitTestVisible="False"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="NoWrap" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="2"
-                                Margin="0,24,24,0"
-                                Theme="{DynamicResource CloseButton}" />
-                        </Grid>
-                        <Grid
-                            Grid.Row="1"
-                            MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
-                            Margin="{TemplateBinding Padding}">
-                            <ScrollViewer
-                                MaxHeight="300"
-                                HorizontalScrollBarVisibility="Disabled"
-                                VerticalScrollBarVisibility="Auto">
-                                <TextBlock
-                                    Name="PART_ContentPresenter"
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    Background="Transparent" />
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Grid.Column="0"
+                                    Width="24"
+                                    Height="24"
+                                    Margin="24,24,8,0"
                                     VerticalAlignment="Center"
-                                    Text="{TemplateBinding Content}"
-                                    TextAlignment="Left"
-                                    TextWrapping="Wrap" />
-                            </ScrollViewer>
+                                    IsHitTestVisible="False" />
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="0,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    Text="{TemplateBinding Title}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="2"
+                                    Margin="0,24,24,0"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
+                            <Grid
+                                Grid.Row="1"
+                                MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
+                                Margin="{TemplateBinding Padding}">
+                                <ScrollViewer
+                                    MaxHeight="300"
+                                    HorizontalScrollBarVisibility="Disabled"
+                                    VerticalScrollBarVisibility="Auto">
+                                    <TextBlock
+                                        Name="PART_ContentPresenter"
+                                        VerticalAlignment="Center"
+                                        Text="{TemplateBinding Content}"
+                                        TextAlignment="Left"
+                                        TextWrapping="Wrap" />
+                                </ScrollViewer>
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="Cancel" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="No"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="Yes"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="OK"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
                         </Grid>
-                        <StackPanel
-                            Grid.Row="2"
-                            Margin="24,0,24,24"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-                            <Button
-                                Name="{x:Static u:MessageBoxControl.PART_CancelButton}"
-                                Margin="8,0,0,0"
-                                Classes="Tertiary"
-                                Content="Cancel" />
-                            <Button
-                                Name="{x:Static u:MessageBoxControl.PART_NoButton}"
-                                Margin="8,0,0,0"
-                                Classes="Danger"
-                                Content="No"
-                                Theme="{DynamicResource SolidButton}" />
-                            <Button
-                                Name="{x:Static u:MessageBoxControl.PART_YesButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Content="Yes"
-                                Theme="{DynamicResource SolidButton}" />
-                            <Button
-                                Name="{x:Static u:MessageBoxControl.PART_OKButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Content="OK"
-                                Theme="{DynamicResource SolidButton}" />
-                        </StackPanel>
-                    </Grid>
+                    </Border>
                 </Border>
             </ControlTemplate>
         </Setter>