diff --git a/HandyControl/Controls/Button/ContextMenuButton.cs b/HandyControl/Controls/Button/ContextMenuButton.cs
index a1136b2f..e4d9a84d 100644
--- a/HandyControl/Controls/Button/ContextMenuButton.cs
+++ b/HandyControl/Controls/Button/ContextMenuButton.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     /// <summary>
diff --git a/HandyControl/Controls/Button/ContextMenuToggleButton.cs b/HandyControl/Controls/Button/ContextMenuToggleButton.cs
index 4af71b2a..47116649 100644
--- a/HandyControl/Controls/Button/ContextMenuToggleButton.cs
+++ b/HandyControl/Controls/Button/ContextMenuToggleButton.cs
@@ -1,7 +1,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     /// <summary>
diff --git a/HandyControl/Controls/Image/ImageViewer.cs b/HandyControl/Controls/Image/ImageViewer.cs
index e1bfc805..4422a932 100644
--- a/HandyControl/Controls/Image/ImageViewer.cs
+++ b/HandyControl/Controls/Image/ImageViewer.cs
@@ -197,7 +197,7 @@ namespace HandyControl.Controls
             }
             catch
             {
-                PopupWindow.ShowDialog(Lang.ErrorImgPath);
+                MessageBox.Show(Lang.ErrorImgPath);
             }
         }
 
@@ -464,7 +464,7 @@ namespace HandyControl.Controls
 
             if (Math.Abs(height - 0) < 0.001 || Math.Abs(width - 0) < 0.001)
             {
-                PopupWindow.ShowDialog(Lang.ErrorImgSize);
+                MessageBox.Show(Lang.ErrorImgSize);
                 return;
             }
 
@@ -544,7 +544,7 @@ namespace HandyControl.Controls
             }
             catch (Exception exception)
             {
-                PopupWindow.ShowDialog(exception.Message);
+                MessageBox.Show(exception.Message);
             }
         }
 
diff --git a/HandyControl/Controls/Input/IDataInput.cs b/HandyControl/Controls/Input/IDataInput.cs
index 8ea26c94..697a6b91 100644
--- a/HandyControl/Controls/Input/IDataInput.cs
+++ b/HandyControl/Controls/Input/IDataInput.cs
@@ -1,7 +1,7 @@
 using System;
 using HandyControl.Data;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     /// <summary>
diff --git a/HandyControl/Controls/Loading/LoadingBase.cs b/HandyControl/Controls/Loading/LoadingBase.cs
index 9c8d0455..07d9acf2 100644
--- a/HandyControl/Controls/Loading/LoadingBase.cs
+++ b/HandyControl/Controls/Loading/LoadingBase.cs
@@ -6,7 +6,7 @@ using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 using HandyControl.Data;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     public abstract class LoadingBase : ContentControl
diff --git a/HandyControl/Controls/Loading/LoadingCircle.cs b/HandyControl/Controls/Loading/LoadingCircle.cs
index 1f373fe7..b4ef744d 100644
--- a/HandyControl/Controls/Loading/LoadingCircle.cs
+++ b/HandyControl/Controls/Loading/LoadingCircle.cs
@@ -5,7 +5,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     public class LoadingCircle : LoadingBase
diff --git a/HandyControl/Controls/Loading/LoadingLine.cs b/HandyControl/Controls/Loading/LoadingLine.cs
index 6edbf977..ae81b51e 100644
--- a/HandyControl/Controls/Loading/LoadingLine.cs
+++ b/HandyControl/Controls/Loading/LoadingLine.cs
@@ -4,7 +4,7 @@ using System.Windows.Data;
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     public class LoadingLine : LoadingBase
diff --git a/HandyControl/Controls/Slider/CompareSlider.cs b/HandyControl/Controls/Slider/CompareSlider.cs
index 347a3790..07bd98af 100644
--- a/HandyControl/Controls/Slider/CompareSlider.cs
+++ b/HandyControl/Controls/Slider/CompareSlider.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     public class CompareSlider : Slider
diff --git a/HandyControl/Controls/Slider/PreviewSlider.cs b/HandyControl/Controls/Slider/PreviewSlider.cs
index fd27b38e..c5efece0 100644
--- a/HandyControl/Controls/Slider/PreviewSlider.cs
+++ b/HandyControl/Controls/Slider/PreviewSlider.cs
@@ -6,7 +6,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     [TemplatePart(Name = PreviewContentKey, Type = typeof(ContentControl))]
diff --git a/HandyControl/Controls/Tag/Tag.cs b/HandyControl/Controls/Text/Tag/Tag.cs
similarity index 100%
rename from HandyControl/Controls/Tag/Tag.cs
rename to HandyControl/Controls/Text/Tag/Tag.cs
diff --git a/HandyControl/Controls/Tag/TagPanel.cs b/HandyControl/Controls/Text/Tag/TagPanel.cs
similarity index 100%
rename from HandyControl/Controls/Tag/TagPanel.cs
rename to HandyControl/Controls/Text/Tag/TagPanel.cs
diff --git a/HandyControl/Controls/Time/Clock/ClockRadioButton.cs b/HandyControl/Controls/Time/Clock/ClockRadioButton.cs
index e08a0bce..6c14245a 100644
--- a/HandyControl/Controls/Time/Clock/ClockRadioButton.cs
+++ b/HandyControl/Controls/Time/Clock/ClockRadioButton.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     public class ClockRadioButton : RadioButton
diff --git a/HandyControl/Controls/Time/TimeBar/SpeTextBlock.cs b/HandyControl/Controls/Time/TimeBar/SpeTextBlock.cs
index d91ab67b..2dbf5b65 100644
--- a/HandyControl/Controls/Time/TimeBar/SpeTextBlock.cs
+++ b/HandyControl/Controls/Time/TimeBar/SpeTextBlock.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Controls;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     /// <summary>
diff --git a/HandyControl/Controls/Time/TimeBar/TimeBar.cs b/HandyControl/Controls/Time/TimeBar/TimeBar.cs
index c7ec532a..fcc658bf 100644
--- a/HandyControl/Controls/Time/TimeBar/TimeBar.cs
+++ b/HandyControl/Controls/Time/TimeBar/TimeBar.cs
@@ -8,7 +8,7 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Controls
 {
     /// <summary>
diff --git a/HandyControl/Controls/Window/ImageBrowser.cs b/HandyControl/Controls/Window/ImageBrowser.cs
index f5af1a8d..f711ff54 100644
--- a/HandyControl/Controls/Window/ImageBrowser.cs
+++ b/HandyControl/Controls/Window/ImageBrowser.cs
@@ -66,7 +66,7 @@ namespace HandyControl.Controls
                 }
                 catch
                 {
-                    PopupWindow.ShowDialog(Properties.Langs.Lang.ErrorImgPath);
+                    MessageBox.Show(Properties.Langs.Lang.ErrorImgPath);
                 }
             };
         }
diff --git a/HandyControl/Controls/Window/MessageBox.cs b/HandyControl/Controls/Window/MessageBox.cs
new file mode 100644
index 00000000..a31ef8c9
--- /dev/null
+++ b/HandyControl/Controls/Window/MessageBox.cs
@@ -0,0 +1,328 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using HandyControl.Data;
+using HandyControl.Interactivity;
+using HandyControl.Tools;
+using HandyControl.Tools.Extension;
+
+namespace HandyControl.Controls
+{
+    /// <summary>
+    ///     消息框
+    /// </summary>
+    public sealed class MessageBox : Window
+    {
+        #region Constants
+
+        private const string ElementImage = "PART_Image";
+
+        private const string ElementMessage = "PART_Message";
+
+        #endregion Constants
+
+        private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
+
+        private bool _showOK;
+
+        private bool _showCancel;
+
+        private bool _showYes;
+
+        private bool _showNo;
+
+        private string _message;
+
+        private Geometry _image;
+
+        private Brush _imageBrush;
+
+        private bool _showImage;
+
+        private MessageBox()
+        {
+            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) =>
+            {
+                _messageBoxResult = MessageBoxResult.OK;
+                Close();
+            }, (s, e) => e.CanExecute = _showOK));
+            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
+            {
+                _messageBoxResult = MessageBoxResult.Cancel;
+                Close();
+            }, (s, e) => e.CanExecute = _showCancel));
+            CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) =>
+            {
+                _messageBoxResult = MessageBoxResult.Yes;
+                Close();
+            }, (s, e) => e.CanExecute = _showYes));
+            CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) =>
+            {
+                _messageBoxResult = MessageBoxResult.No;
+                Close();
+            }, (s, e) => e.CanExecute = _showNo));
+        }
+
+        protected override void OnSourceInitialized(EventArgs e)
+        {
+            base.OnSourceInitialized(e);
+
+            if (LogicalTreeHelper.FindLogicalNode(this, ElementMessage) is TextBlock message) message.Text = _message;
+
+            if (_showImage)
+            {
+                if (LogicalTreeHelper.FindLogicalNode(this, ElementImage) is Path image)
+                {
+                    image.Data = _image;
+                    image.Fill = _imageBrush;
+                    image.Show();
+                }
+            }
+        }
+
+        /// <summary>
+        ///     成功
+        /// </summary>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        public static MessageBoxResult Success(string messageBoxText, string caption = null)
+        {
+            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK);
+            messageBox._showImage = true;
+            messageBox._image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
+            messageBox._imageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
+            messageBox.ShowDialog();
+
+            return messageBox._messageBoxResult;
+        }
+
+        /// <summary>
+        ///     消息
+        /// </summary>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        public static MessageBoxResult Info(string messageBoxText, string caption = null)
+        {
+            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK);
+            SetImage(messageBox, MessageBoxImage.Information);
+            messageBox.ShowDialog();
+
+            return messageBox._messageBoxResult;
+        }
+
+        /// <summary>
+        ///     警告
+        /// </summary>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        public static MessageBoxResult Warning(string messageBoxText, string caption = null)
+        {
+            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK);
+            SetImage(messageBox, MessageBoxImage.Warning);
+            messageBox.ShowDialog();
+
+            return messageBox._messageBoxResult;
+        }
+
+        /// <summary>
+        ///     错误
+        /// </summary>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        public static MessageBoxResult Error(string messageBoxText, string caption = null)
+        {
+            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK);
+            SetImage(messageBox, MessageBoxImage.Error);
+            messageBox.ShowDialog();
+
+            return messageBox._messageBoxResult;
+        }
+
+        /// <summary>
+        ///     严重
+        /// </summary>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
+        {
+            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK);
+            messageBox._showImage = true;
+            messageBox._image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
+            messageBox._imageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
+            messageBox.ShowDialog();
+
+            return messageBox._messageBoxResult;
+        }
+
+        /// <summary>
+        ///     询问
+        /// </summary>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        public static MessageBoxResult Ask(string messageBoxText, string caption = null)
+        {
+            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
+            SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
+            SetImage(messageBox, MessageBoxImage.Question);
+            messageBox.ShowDialog();
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static MessageBoxResult CustomShow(string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, string iconKey = "", string iconBrushKey = "", MessageBoxResult defaultResult = MessageBoxResult.None)
+        {
+            var messageBox = CreateMessageBox(null, messageBoxText, caption, button, MessageBoxImage.None, defaultResult);
+            messageBox._showImage = true;
+            messageBox._image = ResourceHelper.GetResource<Geometry>(iconKey);
+            messageBox._imageBrush = ResourceHelper.GetResource<Brush>(iconBrushKey);
+            messageBox.ShowDialog();
+
+            return messageBox._messageBoxResult;
+        }
+
+        public static MessageBoxResult Show(string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None)
+        {
+            return Show(null, messageBoxText, caption, button, icon, defaultResult);
+        }
+
+        public static MessageBoxResult Show(System.Windows.Window owner, string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None)
+        {
+            var messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
+            SetButtonStatus(messageBox, button);
+            SetImage(messageBox, icon);
+            messageBox.ShowDialog();
+
+            return messageBox._messageBoxResult;
+        }
+
+        private static MessageBox CreateMessageBox(
+            System.Windows.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));
+            }
+
+            var ownerWindow = owner ?? Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
+            var ownerIsNull = ownerWindow is null;
+
+            return new MessageBox
+            {
+                _message = messageBoxText,
+                Owner = ownerWindow,
+                WindowStartupLocation = ownerIsNull ? WindowStartupLocation.CenterScreen : WindowStartupLocation.CenterOwner,
+                ShowTitle = true,
+                Title = caption,
+                Topmost = ownerIsNull,
+                _messageBoxResult = defaultResult
+            };
+        }
+
+        private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton messageBoxButton)
+        {
+            switch (messageBoxButton)
+            {
+                case MessageBoxButton.OK:
+                    messageBox._showOK = true;
+                    break;
+                case MessageBoxButton.OKCancel:
+                    messageBox._showOK = true;
+                    messageBox._showCancel = true;
+                    break;
+                case MessageBoxButton.YesNo:
+                    messageBox._showYes = true;
+                    messageBox._showNo = true;
+                    break;
+                case MessageBoxButton.YesNoCancel:
+                    messageBox._showYes = true;
+                    messageBox._showNo = true;
+                    messageBox._showCancel = true;
+                    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 == MessageBoxButton.OK
+                   || value == MessageBoxButton.OKCancel
+                   || value == MessageBoxButton.YesNo
+                   || value == MessageBoxButton.YesNoCancel;
+        }
+
+        private static bool IsValidMessageBoxImage(MessageBoxImage value)
+        {
+            return value == MessageBoxImage.Asterisk
+                   || value == MessageBoxImage.Error
+                   || value == MessageBoxImage.Exclamation
+                   || value == MessageBoxImage.Hand
+                   || value == MessageBoxImage.Information
+                   || value == MessageBoxImage.None
+                   || value == MessageBoxImage.Question
+                   || value == MessageBoxImage.Stop
+                   || value == MessageBoxImage.Warning;
+        }
+
+        private static bool IsValidMessageBoxResult(MessageBoxResult value)
+        {
+            return value == MessageBoxResult.Cancel
+                   || value == MessageBoxResult.No
+                   || value == MessageBoxResult.None
+                   || value == MessageBoxResult.OK
+                   || value == MessageBoxResult.Yes;
+        }
+    }
+}
\ No newline at end of file
diff --git a/HandyControl/Controls/Window/PopupWindow.cs b/HandyControl/Controls/Window/PopupWindow.cs
index f28418b9..c37ab0f5 100644
--- a/HandyControl/Controls/Window/PopupWindow.cs
+++ b/HandyControl/Controls/Window/PopupWindow.cs
@@ -7,7 +7,6 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-// ReSharper disable once CheckNamespace
 namespace HandyControl.Controls
 {
     /// <summary>
diff --git a/HandyControl/Data/Enum/InfoType.cs b/HandyControl/Data/Enum/InfoType.cs
index e71b29dd..1ae8e43d 100644
--- a/HandyControl/Data/Enum/InfoType.cs
+++ b/HandyControl/Data/Enum/InfoType.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Data
 {
     public enum InfoType
diff --git a/HandyControl/Data/Enum/IpType.cs b/HandyControl/Data/Enum/IpType.cs
index bbf4af19..374fa1c9 100644
--- a/HandyControl/Data/Enum/IpType.cs
+++ b/HandyControl/Data/Enum/IpType.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Data
 {
     /// <summary>
diff --git a/HandyControl/Data/Enum/ResultType.cs b/HandyControl/Data/Enum/ResultType.cs
index 1b75f89a..4340a902 100644
--- a/HandyControl/Data/Enum/ResultType.cs
+++ b/HandyControl/Data/Enum/ResultType.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Data
 {
     /// <summary>
diff --git a/HandyControl/Data/Enum/SkinType.cs b/HandyControl/Data/Enum/SkinType.cs
index dc182f24..30805b00 100644
--- a/HandyControl/Data/Enum/SkinType.cs
+++ b/HandyControl/Data/Enum/SkinType.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Data
 {
     public enum SkinType
diff --git a/HandyControl/Data/Enum/TextType.cs b/HandyControl/Data/Enum/TextType.cs
index b73bc771..19e51c3f 100644
--- a/HandyControl/Data/Enum/TextType.cs
+++ b/HandyControl/Data/Enum/TextType.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Data
 {
     /// <summary>
diff --git a/HandyControl/Data/Enum/TipPlacement.cs b/HandyControl/Data/Enum/TipPlacement.cs
index f459e9ce..c6c2fff3 100644
--- a/HandyControl/Data/Enum/TipPlacement.cs
+++ b/HandyControl/Data/Enum/TipPlacement.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Data
 {
     public enum TipPlacement
diff --git a/HandyControl/Data/Enum/TitleAlignment.cs b/HandyControl/Data/Enum/TitleAlignment.cs
index d17f8f1c..d130df89 100644
--- a/HandyControl/Data/Enum/TitleAlignment.cs
+++ b/HandyControl/Data/Enum/TitleAlignment.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControl.Data
 {
     /// <summary>
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 102d35b2..e32fe891 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -152,8 +152,8 @@
     <Compile Include="Controls\Text\OutlineText.cs" />
     <Compile Include="Controls\Image\GifImage.cs" />
     <Compile Include="Controls\Input\SearchBar.cs" />
-    <Compile Include="Controls\Tag\TagPanel.cs" />
-    <Compile Include="Controls\Tag\Tag.cs" />
+    <Compile Include="Controls\Text\Tag\TagPanel.cs" />
+    <Compile Include="Controls\Text\Tag\Tag.cs" />
     <Compile Include="Controls\Time\CalendarWithClock.cs" />
     <Compile Include="Controls\Time\Clock\Clock.cs" />
     <Compile Include="Controls\Time\Clock\ClockRadioButton.cs" />
@@ -183,6 +183,7 @@
     <Compile Include="Controls\Time\FlipClock\FlipClock.cs" />
     <Compile Include="Controls\Time\FlipClock\FlipNumber.cs" />
     <Compile Include="Controls\Window\BlurWindow.cs" />
+    <Compile Include="Controls\Window\MessageBox.cs" />
     <Compile Include="Data\Args\CancelRoutedEventArgs.cs" />
     <Compile Include="Data\Enum\InfoType.cs" />
     <Compile Include="Data\Enum\ResultType.cs" />
@@ -618,6 +619,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\MessageBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\NumericUpDown.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -630,6 +635,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\PopupWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\ProgressBar.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/HandyControl/Interactivity/ControlCommands.cs b/HandyControl/Interactivity/ControlCommands.cs
index 2054ff5b..5a1471f8 100644
--- a/HandyControl/Interactivity/ControlCommands.cs
+++ b/HandyControl/Interactivity/ControlCommands.cs
@@ -77,6 +77,16 @@ namespace HandyControl.Interactivity
         /// </summary>
         public static RoutedCommand Confirm { get; } = new RoutedCommand(nameof(Confirm), typeof(ControlCommands));
 
+        /// <summary>
+        ///     是
+        /// </summary>
+        public static RoutedCommand Yes { get; } = new RoutedCommand(nameof(Yes), typeof(ControlCommands));
+
+        /// <summary>
+        ///     否
+        /// </summary>
+        public static RoutedCommand No { get; } = new RoutedCommand(nameof(No), typeof(ControlCommands));
+
         /// <summary>
         ///     关闭所有
         /// </summary>
diff --git a/HandyControl/Properties/Langs/Lang.Designer.cs b/HandyControl/Properties/Langs/Lang.Designer.cs
index 37f04b41..e8b9af71 100644
--- a/HandyControl/Properties/Langs/Lang.Designer.cs
+++ b/HandyControl/Properties/Langs/Lang.Designer.cs
@@ -240,6 +240,15 @@ namespace HandyControl.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 否 的本地化字符串。
+        /// </summary>
+        public static string No {
+            get {
+                return ResourceManager.GetString("No", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 不在范围内 的本地化字符串。
         /// </summary>
@@ -302,5 +311,14 @@ namespace HandyControl.Properties.Langs {
                 return ResourceManager.GetString("UnknownSize", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   查找类似 是 的本地化字符串。
+        /// </summary>
+        public static string Yes {
+            get {
+                return ResourceManager.GetString("Yes", resourceCulture);
+            }
+        }
     }
 }
diff --git a/HandyControl/Properties/Langs/Lang.en.resx b/HandyControl/Properties/Langs/Lang.en.resx
index ee8c3009..b5f9a98b 100644
--- a/HandyControl/Properties/Langs/Lang.en.resx
+++ b/HandyControl/Properties/Langs/Lang.en.resx
@@ -197,4 +197,10 @@
   <data name="CannotRegisterSameCommandTwice" xml:space="preserve">
     <value>Cannot Register Same Command Twice</value>
   </data>
+  <data name="Yes" xml:space="preserve">
+    <value>Yes</value>
+  </data>
+  <data name="No" xml:space="preserve">
+    <value>No</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControl/Properties/Langs/Lang.resx b/HandyControl/Properties/Langs/Lang.resx
index 078dabdf..75b1787a 100644
--- a/HandyControl/Properties/Langs/Lang.resx
+++ b/HandyControl/Properties/Langs/Lang.resx
@@ -178,4 +178,10 @@
   <data name="CannotRegisterSameCommandTwice" xml:space="preserve">
     <value>不能注册同一命令两次</value>
   </data>
+  <data name="Yes" xml:space="preserve">
+    <value>是</value>
+  </data>
+  <data name="No" xml:space="preserve">
+    <value>否</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index afa7a89f..ad9487c0 100644
--- a/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -54,7 +54,7 @@
                         </Grid.ColumnDefinitions>
                         <Border x:Name="templateRoot" Grid.ColumnSpan="2" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true"/>
                         <Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Margin="7" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5"/>
-                        <TextBlock Grid.Column="0" VerticalAlignment="{Binding VerticalContentAlignment,RelativeSource={RelativeSource FindAncestor,AncestorType=ComboBox}}" Margin="8,7,8,8" Visibility="{Binding Text,RelativeSource={RelativeSource FindAncestor,AncestorType=ComboBox},Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource FindAncestor,AncestorType=ComboBox}}"/>
+                        <TextBlock Grid.Column="0" VerticalAlignment="{Binding VerticalContentAlignment,RelativeSource={RelativeSource AncestorType=ComboBox}}" Margin="8,7,8,8" Visibility="{Binding Text,RelativeSource={RelativeSource AncestorType=ComboBox},Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource AncestorType=ComboBox}}"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
diff --git a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
index b853b01a..739f7941 100644
--- a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
@@ -203,6 +203,7 @@
     <Style x:Key="ContextMenuBaseStyle" TargetType="ContextMenu">
         <Setter Property="MaxHeight" Value="199"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ContextMenu">
diff --git a/HandyControl/Themes/Styles/Base/CoverFlowBaseStyle.xaml b/HandyControl/Themes/Styles/Base/CoverFlowBaseStyle.xaml
index e0817918..b0194dd4 100644
--- a/HandyControl/Themes/Styles/Base/CoverFlowBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/CoverFlowBaseStyle.xaml
@@ -3,8 +3,8 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <!--<Style x:Key="CoverFlowItemBaseStyle" TargetType="controls:CoverFlowItem">
-        <Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:CoverFlow}}"/>
-        <Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:CoverFlow}}"/>
+        <Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource  AncestorType=controls:CoverFlow}}"/>
+        <Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource  AncestorType=controls:CoverFlow}}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:CoverFlowItem">
diff --git a/HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml b/HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml
index f82af0c0..92d44f56 100644
--- a/HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml
@@ -3,9 +3,9 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="CoverViewItemBaseStyle" TargetType="controls:CoverViewItem">
-        <Setter Property="Margin" Value="{Binding ItemMargin,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:CoverView}}"/>
-        <Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:CoverView}}"/>
-        <Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:CoverView}}"/>
+        <Setter Property="Margin" Value="{Binding ItemMargin,RelativeSource={RelativeSource  AncestorType=controls:CoverView}}"/>
+        <Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource  AncestorType=controls:CoverView}}"/>
+        <Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource  AncestorType=controls:CoverView}}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:CoverViewItem">
diff --git a/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml b/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
index 125bc1ae..13968444 100644
--- a/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
@@ -18,7 +18,7 @@
                 <ControlTemplate TargetType="DatePickerTextBox">
                     <Grid x:Name="WatermarkContent">
                         <Border x:Name="ContentElement"/>
-                        <ContentControl VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="7,6" Content="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource FindAncestor,AncestorType=DatePicker}}" TextElement.Foreground="{DynamicResource ThirdlyTextBrush}" Focusable="False" IsHitTestVisible="False" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
+                        <ContentControl VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="7,6" Content="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource AncestorType=DatePicker}}" TextElement.Foreground="{DynamicResource ThirdlyTextBrush}" Focusable="False" IsHitTestVisible="False" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
                         <ScrollViewer x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Grid>
                 </ControlTemplate>
diff --git a/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
index 34a0d79e..d22d0ad5 100644
--- a/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
@@ -9,7 +9,7 @@
         <Setter Property="Padding" Value="10,0"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="Height" Value="32"/>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
diff --git a/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml
index 771c7a1a..f4b4f825 100644
--- a/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml
@@ -187,7 +187,7 @@
             <Trigger Property="IsChecked" Value="True">
                 <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}"/>
             </Trigger>
-            <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:RadioGroup}}" Value="Vertical">
+            <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=controls:RadioGroup}}" Value="Vertical">
                 <Setter Property="Margin" Value="0,-1,0,0"/>
             </DataTrigger>
         </Style.Triggers>
diff --git a/HandyControl/Themes/Styles/Base/RateBaseStyle.xaml b/HandyControl/Themes/Styles/Base/RateBaseStyle.xaml
index 2d327fe2..2d2c7854 100644
--- a/HandyControl/Themes/Styles/Base/RateBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/RateBaseStyle.xaml
@@ -8,14 +8,14 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="RateRateItemBaseStyle" TargetType="controls:RateItem">
-        <Setter Property="Margin" Value="{Binding ItemMargin,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
-        <Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
-        <Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
-        <Setter Property="AllowHalf" Value="{Binding AllowHalf,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
-        <Setter Property="AllowClear" Value="{Binding AllowClear,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
-        <Setter Property="Icon" Value="{Binding Icon,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
-        <Setter Property="IsReadOnly" Value="{Binding IsReadOnly,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
-        <Setter Property="Background" Value="{Binding Background,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
+        <Setter Property="Margin" Value="{Binding ItemMargin,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
+        <Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
+        <Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
+        <Setter Property="AllowHalf" Value="{Binding AllowHalf,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
+        <Setter Property="AllowClear" Value="{Binding AllowClear,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
+        <Setter Property="Icon" Value="{Binding Icon,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
+        <Setter Property="IsReadOnly" Value="{Binding IsReadOnly,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
+        <Setter Property="Background" Value="{Binding Background,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RateItem">
diff --git a/HandyControl/Themes/Styles/Base/StepBarBaseStyle.xaml b/HandyControl/Themes/Styles/Base/StepBarBaseStyle.xaml
index 32b383fc..8334c712 100644
--- a/HandyControl/Themes/Styles/Base/StepBarBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/StepBarBaseStyle.xaml
@@ -31,7 +31,7 @@
                         <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
                             <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}"/>
                         </Border>
-                        <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource FindAncestor,AncestorType=controls:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0"/>
+                        <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=controls:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0"/>
                     </StackPanel>
                 </ControlTemplate>
             </Setter.Value>
@@ -44,7 +44,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="controls:StepBarItem">
                     <StackPanel>
-                        <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource FindAncestor,AncestorType=controls:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,0,0,4"/>
+                        <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=controls:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,0,0,4"/>
                         <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
                             <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}"/>
                         </Border>
@@ -63,7 +63,7 @@
                         <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
                             <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}"/>
                         </Border>
-                        <ContentPresenter HorizontalAlignment="Left" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource FindAncestor,AncestorType=controls:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,4,0,0"/>
+                        <ContentPresenter HorizontalAlignment="Left" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=controls:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,4,0,0"/>
                     </StackPanel>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
index 02c46958..88d089f5 100644
--- a/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
@@ -22,23 +22,23 @@
                 <ControlTemplate TargetType="TabItem">
                     <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
                         <Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" Margin="0"/>
-                        <ContentPresenter x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{DynamicResource PrimaryTextBrush}" ContentSource="Header" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Top"/>
                             </MultiDataTrigger.Conditions>
                             <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,0"/>
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Top"/>
                             </MultiDataTrigger.Conditions>
                             <Setter Property="Panel.ZIndex" Value="1"/>
-                            <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter"/>
                             <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,3"/>
                         </MultiDataTrigger>
                     </ControlTemplate.Triggers>
diff --git a/HandyControl/Themes/Styles/Base/TreeViewBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 63d2d8ab..5816676b 100644
--- a/HandyControl/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -17,7 +17,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
                     <Border Background="Transparent" Height="16" Padding="4" Width="16">
-                        <Path x:Name="ExpandPath" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Data="{StaticResource TreeArrow}" Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}}">
+                        <Path x:Name="ExpandPath" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Data="{StaticResource TreeArrow}" Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=TreeViewItem}}">
                             <Path.RenderTransform>
                                 <RotateTransform Angle="-90"/>
                             </Path.RenderTransform>
@@ -53,7 +53,7 @@
                             <RowDefinition/>
                         </Grid.RowDefinitions>
                         <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <StackPanel Orientation="Horizontal" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type TreeViewItem}}}">
+                            <StackPanel Orientation="Horizontal" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource  AncestorLevel=1, AncestorType=TreeViewItem}}">
                                 <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
                                 <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             </StackPanel>
diff --git a/HandyControl/Themes/Styles/Calendar.xaml b/HandyControl/Themes/Styles/Calendar.xaml
index f8af46b9..1201bb18 100644
--- a/HandyControl/Themes/Styles/Calendar.xaml
+++ b/HandyControl/Themes/Styles/Calendar.xaml
@@ -214,11 +214,11 @@
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Year">
+                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Year">
                             <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden"/>
                             <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible"/>
                         </DataTrigger>
-                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Decade">
+                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Decade">
                             <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden"/>
                             <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible"/>
                         </DataTrigger>
diff --git a/HandyControl/Themes/Styles/ContextMenu.xaml b/HandyControl/Themes/Styles/ContextMenu.xaml
index 1d4d1b6b..b7c0c75d 100644
--- a/HandyControl/Themes/Styles/ContextMenu.xaml
+++ b/HandyControl/Themes/Styles/ContextMenu.xaml
@@ -1,5 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Base/ContextMenuBaseStyle.xaml"/>
diff --git a/HandyControl/Themes/Styles/DataGrid.xaml b/HandyControl/Themes/Styles/DataGrid.xaml
index 20e171a4..0bc76fe9 100644
--- a/HandyControl/Themes/Styles/DataGrid.xaml
+++ b/HandyControl/Themes/Styles/DataGrid.xaml
@@ -79,8 +79,8 @@
                         </SelectiveScrollingGrid.RowDefinitions>
                         <Border CornerRadius="4" Grid.ColumnSpan="2" x:Name="DGR_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
                         <DataGridCellsPresenter MinHeight="{TemplateBinding MinHeight}" VerticalContentAlignment="Center" Grid.Row="0" Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        <DataGridDetailsPresenter Margin="0,6" Grid.Column="1" Grid.Row="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Visibility="{TemplateBinding DetailsVisibility}"/>
-                        <DataGridRowHeader Grid.Row="0" Grid.Column="0" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                        <DataGridDetailsPresenter Margin="0,6" Grid.Column="1" Grid.Row="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Visibility="{TemplateBinding DetailsVisibility}"/>
+                        <DataGridRowHeader Grid.Row="0" Grid.Column="0" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                     </SelectiveScrollingGrid>
                 </ControlTemplate>
             </Setter.Value>
@@ -237,13 +237,13 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
-                                        <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
+                                        <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                                         <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1"/>
                                         <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding VerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
                                         <Grid Grid.Column="1" Grid.Row="1">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                                <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
                                             <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" VerticalAlignment="Bottom" x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" Visibility="{TemplateBinding HorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
diff --git a/HandyControl/Themes/Styles/Growl.xaml b/HandyControl/Themes/Styles/Growl.xaml
index 75b56874..7df6ea78 100644
--- a/HandyControl/Themes/Styles/Growl.xaml
+++ b/HandyControl/Themes/Styles/Growl.xaml
@@ -38,7 +38,7 @@
                         <Path Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}"/>
                         <StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
                             <TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap"/>
-                            <TextBlock Visibility="{Binding ShowDateTime,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Text="{Binding Time,RelativeSource={RelativeSource FindAncestor,AncestorType=controls:Growl},StringFormat=yyyy/MM/dd HH:mm:ss}" Style="{StaticResource TextBlockDefault}" Foreground="{DynamicResource SecondaryTextBrush}" HorizontalAlignment="Left" Margin="0,4,0,0"/>
+                            <TextBlock Visibility="{Binding ShowDateTime,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Text="{Binding Time,RelativeSource={RelativeSource AncestorType=controls:Growl},StringFormat=yyyy/MM/dd HH:mm:ss}" Style="{StaticResource TextBlockDefault}" Foreground="{DynamicResource SecondaryTextBrush}" HorizontalAlignment="Left" Margin="0,4,0,0"/>
                         </StackPanel>
                         <Button Grid.Row="0" Visibility="Collapsed" Margin="11,0" Name="PART_ButtonClose" Command="interactivity:ControlCommands.Close" Grid.Column="2" Background="Transparent" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center" HorizontalAlignment="Center" Width="18" Height="18">
                             <Path Data="{StaticResource ErrorGeometry}" Stretch="Uniform" Fill="{DynamicResource SecondaryTextBrush}"/>
diff --git a/HandyControl/Themes/Styles/ListBox.xaml b/HandyControl/Themes/Styles/ListBox.xaml
index 85937b3d..14125635 100644
--- a/HandyControl/Themes/Styles/ListBox.xaml
+++ b/HandyControl/Themes/Styles/ListBox.xaml
@@ -12,7 +12,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}"/>
         <Setter Property="VerticalContentAlignment" Value="Top"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
@@ -29,7 +29,7 @@
     <Style x:Key="ListBoxItemFullStyle" BasedOn="{StaticResource ListBoxItemStyle}" TargetType="ListBoxItem">
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-        <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+        <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=ItemsControl}}"/>
     </Style>
 
     <ItemsPanelTemplate x:Key="WrapPanelItemsPanelTemplate">
diff --git a/HandyControl/Themes/Styles/MessageBox.xaml b/HandyControl/Themes/Styles/MessageBox.xaml
new file mode 100644
index 00000000..f2f30ce0
--- /dev/null
+++ b/HandyControl/Themes/Styles/MessageBox.xaml
@@ -0,0 +1,46 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls"
+                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs"
+                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Window.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style TargetType="controls:MessageBox" BasedOn="{StaticResource WindowWin10}">
+        <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="BorderThickness" Value="1"/>
+        <Setter Property="ResizeMode" Value="NoResize"/>
+        <Setter Property="SizeToContent" Value="WidthAndHeight"/>
+        <Setter Property="Content">
+            <Setter.Value>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    <Path x:Name="PART_Image" HorizontalAlignment="Center" Visibility="Collapsed" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform"/>
+                    <ScrollViewer Grid.Column="1" Grid.Row="0">
+                        <TextBlock Margin="10,39,10,10" x:Name="PART_Message" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    </ScrollViewer>
+                    <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
+                        <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Margin="5,0"/>
+                        <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsDefault="True" MinWidth="88" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Margin="5,0" Style="{StaticResource ButtonPrimary}"/>
+                        <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsCancel="True" MinWidth="88" Command="interactivity:ControlCommands.No" Content="{x:Static langs:Lang.No}" Margin="5,0"/>
+                        <Button Visibility="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" IsDefault="True" MinWidth="88" Command="interactivity:ControlCommands.Yes" Content="{x:Static langs:Lang.Yes}" Margin="5,0" Style="{StaticResource ButtonPrimary}"/>
+                    </StackPanel>
+                </Grid>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/PopupWindow.xaml b/HandyControl/Themes/Styles/PopupWindow.xaml
new file mode 100644
index 00000000..d1d5180c
--- /dev/null
+++ b/HandyControl/Themes/Styles/PopupWindow.xaml
@@ -0,0 +1,73 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls"
+                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity"
+                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Button.xaml"/>
+        <ResourceDictionary Source="../Basic/Converters.xaml"/>
+        <ResourceDictionary Source="../Basic/Paths.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style TargetType="controls:PopupWindow">
+        <Setter Property="WindowStyle" Value="None"/>
+        <Setter Property="MinHeight" Value="220"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="BorderThickness" Value="20"/>
+        <Setter Property="ShowInTaskbar" Value="False"/>
+        <Setter Property="MinWidth" Value="300"/>
+        <Setter Property="ResizeMode" Value="NoResize"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="SizeToContent" Value="WidthAndHeight"/>
+        <Setter Property="Effect">
+            <Setter.Value>
+                <DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:PopupWindow">
+                    <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="10,6" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
+                                <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" Padding="9">
+                                    <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}"/>
+                                </Button>
+                            </Grid>
+                            <Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
+                                <StackPanel>
+                                    <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}"/>
+                                    <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
+                                        <Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0"/>
+                                        <Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Style="{StaticResource ButtonPrimary}"/>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Border>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="ShowBorder" Value="True">
+                            <Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder"/>
+                        </Trigger>
+                        <Trigger Property="ShowTitle" Value="False">
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid"/>
+                            <Setter Property="Background" Value="Transparent"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/RichTextBox.xaml b/HandyControl/Themes/Styles/RichTextBox.xaml
index 43cd73ee..068f3069 100644
--- a/HandyControl/Themes/Styles/RichTextBox.xaml
+++ b/HandyControl/Themes/Styles/RichTextBox.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
-    <Style x:Key="TextBoxBaseBaseStyle" TargetType="{x:Type TextBoxBase}">
+    <Style x:Key="TextBoxBaseBaseStyle" TargetType="TextBoxBase">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
@@ -20,7 +20,7 @@
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBoxBase}">
+                <ControlTemplate TargetType="TextBoxBase">
                     <Border x:Name="border" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                         <ScrollViewer x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" Focusable="false" HorizontalScrollBarVisibility="{Binding Path=(ScrollViewer.HorizontalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" VerticalScrollBarVisibility="{Binding Path=(ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}"/>
                     </Border>
diff --git a/HandyControl/Themes/Styles/Slider.xaml b/HandyControl/Themes/Styles/Slider.xaml
index 5d4f88e2..27fd0b4f 100644
--- a/HandyControl/Themes/Styles/Slider.xaml
+++ b/HandyControl/Themes/Styles/Slider.xaml
@@ -504,7 +504,7 @@
 
     <ControlTemplate x:Key="TipSliderThumbHorizontalTop" TargetType="Thumb">
         <controls:InternalCanvas>
-            <Label Name="LabelValue" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource FindAncestor,AncestorType=Slider}}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}"/>
             <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -535,7 +535,7 @@
 
     <ControlTemplate x:Key="TipSliderThumbHorizontalBottom" TargetType="Thumb">
         <controls:InternalCanvas>
-            <Label Name="LabelValue" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource FindAncestor,AncestorType=Slider}}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}"/>
             <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -566,7 +566,7 @@
 
     <ControlTemplate x:Key="TipSliderThumbVerticalLeft" TargetType="Thumb">
         <controls:InternalCanvas Orientation="Vertical">
-            <Label Name="LabelValue" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource FindAncestor,AncestorType=Slider}}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}"/>
             <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
@@ -597,7 +597,7 @@
 
     <ControlTemplate x:Key="TipSliderThumbVerticalRight" TargetType="Thumb">
         <controls:InternalCanvas Orientation="Vertical">
-            <Label Name="LabelValue" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource FindAncestor,AncestorType=Slider}}"/>
+            <Label Name="LabelValue" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}"/>
             <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9"/>
         </controls:InternalCanvas>
         <ControlTemplate.Triggers>
diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml
index bf83dc78..8ec2be6a 100644
--- a/HandyControl/Themes/Styles/Style.xaml
+++ b/HandyControl/Themes/Styles/Style.xaml
@@ -2,6 +2,8 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Window.xaml"/>
+        <ResourceDictionary Source="PopupWindow.xaml"/>
+        <ResourceDictionary Source="MessageBox.xaml"/>
         <ResourceDictionary Source="Button.xaml"/>
         <ResourceDictionary Source="ToggleButton.xaml"/>
         <ResourceDictionary Source="TextBlock.xaml"/>
diff --git a/HandyControl/Themes/Styles/TabControl.xaml b/HandyControl/Themes/Styles/TabControl.xaml
index e10e91cb..cd4c2354 100644
--- a/HandyControl/Themes/Styles/TabControl.xaml
+++ b/HandyControl/Themes/Styles/TabControl.xaml
@@ -26,7 +26,7 @@
         <Setter Property="HeaderTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <TextBlock Background="Transparent" Text="{Binding Header,RelativeSource={RelativeSource FindAncestor,AncestorType=controls:TabItem}}"/>
+                    <TextBlock Background="Transparent" Text="{Binding Header,RelativeSource={RelativeSource AncestorType=controls:TabItem}}"/>
                 </DataTemplate>
             </Setter.Value>
         </Setter>
@@ -56,7 +56,7 @@
                                 </LinearGradientBrush>
                             </ContentPresenter.OpacityMask>
                         </ContentPresenter>
-                        <Button Grid.Column="1" Command="interactivity:ControlCommands.Close" Visibility="{Binding ShowCloseButton,RelativeSource={RelativeSource FindAncestor,AncestorType=controls:TabControl},Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
+                        <Button Grid.Column="1" Command="interactivity:ControlCommands.Close" Visibility="{Binding ShowCloseButton,RelativeSource={RelativeSource AncestorType=controls:TabControl},Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
                             <Path Fill="{DynamicResource PrimaryTextBrush}" Width="8" Height="8" Style="{StaticResource ClosePathStyle}"/>
                         </Button>
                     </Grid>
diff --git a/HandyControl/Themes/Styles/Window-net40.tt b/HandyControl/Themes/Styles/Window-net40.tt
index 4c0aec27..b127b56e 100644
--- a/HandyControl/Themes/Styles/Window-net40.tt
+++ b/HandyControl/Themes/Styles/Window-net40.tt
@@ -1,17 +1,13 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs"
                     xmlns:interactivity="clr-namespace:HandyControl.Interactivity"
                     xmlns:shell="http://schemas.microsoft.com/winfx/2006/xaml/presentation/shell">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="Button.xaml"/>
-    <ResourceDictionary Source="TextBlock.xaml"/>
-    <ResourceDictionary Source="Border.xaml"/>
-    <ResourceDictionary Source="ToggleButton.xaml"/>
     <ResourceDictionary Source="../Basic/Converters.xaml"/>
-    <ResourceDictionary Source="../Basic/Paths.xaml"/>
+    <ResourceDictionary Source="../Basic/Geometries.xaml"/>
   </ResourceDictionary.MergedDictionaries>
 
   <Style x:Key="WindowDefault" BasedOn="{x:Null}" TargetType="Window">
@@ -127,66 +123,6 @@
     <Setter Property="Background" Value="Transparent"/>
   </Style>
 
-  <Style TargetType="controls:PopupWindow">
-    <Setter Property="WindowStyle" Value="None"/>
-    <Setter Property="MinHeight" Value="220"/>
-    <Setter Property="UseLayoutRounding" Value="True"/>
-    <Setter Property="BorderThickness" Value="20"/>
-    <Setter Property="ShowInTaskbar" Value="False"/>
-    <Setter Property="MinWidth" Value="300"/>
-    <Setter Property="ResizeMode" Value="NoResize"/>
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-    <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-    <Setter Property="Effect">
-      <Setter.Value>
-        <DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15"/>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="controls:PopupWindow">
-          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition/>
-                <RowDefinition Height="Auto"/>
-              </Grid.RowDefinitions>
-              <Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition/>
-                  <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="10,6" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
-                <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" controls:IconElement.Geometry="{StaticResource CloseGeometry}" Padding="9">
-                  <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}"/>
-                </Button>
-              </Grid>
-              <Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
-                <StackPanel>
-                  <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}"/>
-                  <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
-                    <Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0"/>
-                    <Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Style="{StaticResource ButtonPrimary}"/>
-                  </StackPanel>
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="ShowBorder" Value="True">
-              <Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder"/>
-            </Trigger>
-            <Trigger Property="ShowTitle" Value="False">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid"/>
-              <Setter Property="Background" Value="Transparent"/>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
   <Style TargetType="controls:ImageBrowser">
     <Setter Property="Background" Value="Transparent"/>
     <Setter Property="MinWidth" Value="400"/>
diff --git a/HandyControl/Themes/Styles/Window-netgt40.tt b/HandyControl/Themes/Styles/Window-netgt40.tt
index 5568199b..ae33178a 100644
--- a/HandyControl/Themes/Styles/Window-netgt40.tt
+++ b/HandyControl/Themes/Styles/Window-netgt40.tt
@@ -1,16 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs"
                     xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="Button.xaml"/>
-    <ResourceDictionary Source="TextBlock.xaml"/>
-    <ResourceDictionary Source="Border.xaml"/>
-    <ResourceDictionary Source="ToggleButton.xaml"/>
     <ResourceDictionary Source="../Basic/Converters.xaml"/>
-    <ResourceDictionary Source="../Basic/Paths.xaml"/>
+    <ResourceDictionary Source="../Basic/Geometries.xaml"/>
   </ResourceDictionary.MergedDictionaries>
 
   <Style x:Key="WindowDefault" BasedOn="{x:Null}" TargetType="Window">
@@ -126,66 +122,6 @@
     <Setter Property="Background" Value="Transparent"/>
   </Style>
 
-  <Style TargetType="controls:PopupWindow">
-    <Setter Property="WindowStyle" Value="None"/>
-    <Setter Property="MinHeight" Value="220"/>
-    <Setter Property="UseLayoutRounding" Value="True"/>
-    <Setter Property="BorderThickness" Value="20"/>
-    <Setter Property="ShowInTaskbar" Value="False"/>
-    <Setter Property="MinWidth" Value="300"/>
-    <Setter Property="ResizeMode" Value="NoResize"/>
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-    <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-    <Setter Property="Effect">
-      <Setter.Value>
-        <DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15"/>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="controls:PopupWindow">
-          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition/>
-                <RowDefinition Height="Auto"/>
-              </Grid.RowDefinitions>
-              <Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition/>
-                  <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="10,6" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
-                <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" controls:IconElement.Geometry="{StaticResource CloseGeometry}" Padding="9">
-                  <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}"/>
-                </Button>
-              </Grid>
-              <Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
-                <StackPanel>
-                  <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}"/>
-                  <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
-                    <Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0"/>
-                    <Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Style="{StaticResource ButtonPrimary}"/>
-                  </StackPanel>
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="ShowBorder" Value="True">
-              <Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder"/>
-            </Trigger>
-            <Trigger Property="ShowTitle" Value="False">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid"/>
-              <Setter Property="Background" Value="Transparent"/>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
   <Style TargetType="controls:ImageBrowser">
     <Setter Property="Background" Value="Transparent"/>
     <Setter Property="MinWidth" Value="400"/>
diff --git a/HandyControl/Themes/Styles/Window.xaml b/HandyControl/Themes/Styles/Window.xaml
index 5568199b..ae33178a 100644
--- a/HandyControl/Themes/Styles/Window.xaml
+++ b/HandyControl/Themes/Styles/Window.xaml
@@ -1,16 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs"
                     xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="Button.xaml"/>
-    <ResourceDictionary Source="TextBlock.xaml"/>
-    <ResourceDictionary Source="Border.xaml"/>
-    <ResourceDictionary Source="ToggleButton.xaml"/>
     <ResourceDictionary Source="../Basic/Converters.xaml"/>
-    <ResourceDictionary Source="../Basic/Paths.xaml"/>
+    <ResourceDictionary Source="../Basic/Geometries.xaml"/>
   </ResourceDictionary.MergedDictionaries>
 
   <Style x:Key="WindowDefault" BasedOn="{x:Null}" TargetType="Window">
@@ -126,66 +122,6 @@
     <Setter Property="Background" Value="Transparent"/>
   </Style>
 
-  <Style TargetType="controls:PopupWindow">
-    <Setter Property="WindowStyle" Value="None"/>
-    <Setter Property="MinHeight" Value="220"/>
-    <Setter Property="UseLayoutRounding" Value="True"/>
-    <Setter Property="BorderThickness" Value="20"/>
-    <Setter Property="ShowInTaskbar" Value="False"/>
-    <Setter Property="MinWidth" Value="300"/>
-    <Setter Property="ResizeMode" Value="NoResize"/>
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-    <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-    <Setter Property="Effect">
-      <Setter.Value>
-        <DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15"/>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="controls:PopupWindow">
-          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition/>
-                <RowDefinition Height="Auto"/>
-              </Grid.RowDefinitions>
-              <Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition/>
-                  <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="10,6" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
-                <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" controls:IconElement.Geometry="{StaticResource CloseGeometry}" Padding="9">
-                  <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}"/>
-                </Button>
-              </Grid>
-              <Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
-                <StackPanel>
-                  <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}"/>
-                  <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
-                    <Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0"/>
-                    <Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Style="{StaticResource ButtonPrimary}"/>
-                  </StackPanel>
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="ShowBorder" Value="True">
-              <Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder"/>
-            </Trigger>
-            <Trigger Property="ShowTitle" Value="False">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid"/>
-              <Setter Property="Background" Value="Transparent"/>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
   <Style TargetType="controls:ImageBrowser">
     <Setter Property="Background" Value="Transparent"/>
     <Setter Property="MinWidth" Value="400"/>
diff --git a/HandyControlDemo/Data/Enum/DemoType.cs b/HandyControlDemo/Data/Enum/DemoType.cs
index f6805aa1..09c3039c 100644
--- a/HandyControlDemo/Data/Enum/DemoType.cs
+++ b/HandyControlDemo/Data/Enum/DemoType.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.Data
 {
     public enum DemoType
diff --git a/HandyControlDemo/Data/Model/ContributorModel.cs b/HandyControlDemo/Data/Model/ContributorModel.cs
index 97ce9b6b..8fe9934f 100644
--- a/HandyControlDemo/Data/Model/ContributorModel.cs
+++ b/HandyControlDemo/Data/Model/ContributorModel.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.Data
 {
     public class ContributorModel
diff --git a/HandyControlDemo/Data/Model/DemoDataModel.cs b/HandyControlDemo/Data/Model/DemoDataModel.cs
index e547c85e..9be6e383 100644
--- a/HandyControlDemo/Data/Model/DemoDataModel.cs
+++ b/HandyControlDemo/Data/Model/DemoDataModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.Data
 {
     public class DemoDataModel
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index 7713303f..057c4a16 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -591,6 +591,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 消息框 的本地化字符串。
+        /// </summary>
+        public static string MessageBox {
+            get {
+                return ResourceManager.GetString("MessageBox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 名称 的本地化字符串。
         /// </summary>
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index d1b851b1..fe2050ca 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -468,4 +468,7 @@
   <data name="DragHere" xml:space="preserve">
     <value>Drag here</value>
   </data>
+  <data name="MessageBox" xml:space="preserve">
+    <value>MessageBox</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index 3e84d31b..0bdbf91c 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -468,4 +468,7 @@
   <data name="DragHere" xml:space="preserve">
     <value>在这里拖拽</value>
   </data>
+  <data name="MessageBox" xml:space="preserve">
+    <value>消息框</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/UserControl/Basic/Avatar.xaml b/HandyControlDemo/UserControl/Basic/Avatar.xaml
index ba26d220..915ee832 100644
--- a/HandyControlDemo/UserControl/Basic/Avatar.xaml
+++ b/HandyControlDemo/UserControl/Basic/Avatar.xaml
@@ -14,8 +14,8 @@
                     <RowDefinition/>
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
-                <Image Source="{Binding Source,RelativeSource={RelativeSource FindAncestor,AncestorType=UserControl}}" Height="120" Width="120" Stretch="Uniform" Margin="10"/>
-                <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" Margin="0,0,0,10" Grid.Row="1" Style="{StaticResource TextBlockDefault}" Text="{Binding UserName,RelativeSource={RelativeSource FindAncestor,AncestorType=UserControl}}"></TextBlock>
+                <Image Source="{Binding Source,RelativeSource={RelativeSource AncestorType=UserControl}}" Height="120" Width="120" Stretch="Uniform" Margin="10"/>
+                <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" Margin="0,0,0,10" Grid.Row="1" Style="{StaticResource TextBlockDefault}" Text="{Binding UserName,RelativeSource={RelativeSource AncestorType=UserControl}}"></TextBlock>
             </Grid>
         </Border>
     </Button>
diff --git a/HandyControlDemo/UserControl/Basic/Avatar.xaml.cs b/HandyControlDemo/UserControl/Basic/Avatar.xaml.cs
index 68510040..88727b94 100644
--- a/HandyControlDemo/UserControl/Basic/Avatar.xaml.cs
+++ b/HandyControlDemo/UserControl/Basic/Avatar.xaml.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Media.Imaging;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class Avatar
diff --git a/HandyControlDemo/UserControl/Controls/AnimationPathDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
index 051e84ab..0b63c95e 100644
--- a/HandyControlDemo/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class AnimationPathDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml.cs
index 5da1be02..51545d68 100644
--- a/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class CarouselDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml.cs
index 5ef9d276..3190976f 100644
--- a/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class CircleProgressBarDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml.cs
index 4966caa7..2f4b2dcc 100644
--- a/HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class ClockDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
index 8a3a4688..16863a27 100644
--- a/HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class ColorPickerDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/CompareSliderDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
index 8e95d831..4ae9ffa1 100644
--- a/HandyControlDemo/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class CompareSliderDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml.cs
index 6afc4816..cbf99957 100644
--- a/HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     /// <summary>
diff --git a/HandyControlDemo/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
index 5c030a49..d40e1b88 100644
--- a/HandyControlDemo/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     /// <summary>
diff --git a/HandyControlDemo/UserControl/Controls/LoadingDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/LoadingDemoCtl.xaml.cs
index 4b48ed98..005ed41a 100644
--- a/HandyControlDemo/UserControl/Controls/LoadingDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/LoadingDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class LoadingDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
index 5005c44b..ae0e08bf 100644
--- a/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
@@ -1,6 +1,6 @@
 using HandyControl.Data;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class NumericUpDownDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml
index 7e6ad9fb..ac0ead50 100644
--- a/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml
@@ -22,7 +22,7 @@
             <DataGrid IsReadOnly="True" Width="600" Margin="0,16,0,0" Grid.Row="1" HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
                 <DataGrid.RowHeaderTemplate>
                     <DataTemplate>
-                        <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGridRow}}"/>
+                        <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
                     </DataTemplate>
                 </DataGrid.RowHeaderTemplate>
                 <DataGrid.Columns>
diff --git a/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml.cs
index 468fe6ae..054499d8 100644
--- a/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class PaginationDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
index 734758b1..9869b2ca 100644
--- a/HandyControlDemo/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class PreviewSliderDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
index eb473476..56df29a7 100644
--- a/HandyControlDemo/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class ScrollViewerDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/StepBarDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/StepBarDemoCtl.xaml.cs
index 73c1d6e9..cadb827f 100644
--- a/HandyControlDemo/UserControl/Controls/StepBarDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/StepBarDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     /// <summary>
diff --git a/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml.cs
index ea2987d3..32d10ea9 100644
--- a/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class TabControlDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/TimeBarDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/TimeBarDemoCtl.xaml.cs
index b4da06a3..5b91583c 100644
--- a/HandyControlDemo/UserControl/Controls/TimeBarDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/TimeBarDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class TimeBarDemoCtl
diff --git a/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml.cs
index bef667ec..c24022b7 100644
--- a/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml.cs
@@ -1,8 +1,9 @@
 using System.Windows;
 using HandyControl.Controls;
 using HandyControl.Tools;
+using MessageBox = HandyControl.Controls.MessageBox;
+
 
-// ReSharper disable once CheckNamespace
 namespace HandyControlDemo.UserControl
 {
     public partial class WindowDemoCtl
@@ -14,7 +15,7 @@ namespace HandyControlDemo.UserControl
 
         private void ButtonMessage_OnClick(object sender, RoutedEventArgs e)
         {
-            PopupWindow.ShowDialog(Properties.Langs.Lang.GrowlAsk, showCancel: true);
+            MessageBox.Show(Properties.Langs.Lang.GrowlAsk, Properties.Langs.Lang.Title, MessageBoxButton.YesNo, MessageBoxImage.Question);
         }
 
         private void ButtonMouseFollow_OnClick(object sender, RoutedEventArgs e)
diff --git a/HandyControlDemo/UserControl/Main/ContributorsView.xaml.cs b/HandyControlDemo/UserControl/Main/ContributorsView.xaml.cs
index d4d825b9..435b5770 100644
--- a/HandyControlDemo/UserControl/Main/ContributorsView.xaml.cs
+++ b/HandyControlDemo/UserControl/Main/ContributorsView.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class ContributorsView
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index c7abc8a1..0da4e052 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -4,7 +4,7 @@
         x:Class="HandyControlDemo.UserControl.LeftMainContent"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:data="clr-namespace:HandyControlDemo.Data"
-        Background="{Binding Background,RelativeSource={RelativeSource FindAncestor,AncestorType=Window}}"
+        Background="{Binding Background,RelativeSource={RelativeSource AncestorType=Window}}"
         xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
@@ -315,7 +315,7 @@
                         <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
-                <ListBoxItem Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
+                <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
                     <controls:EdgeElement.LeftContent>
                         <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>
                     </controls:EdgeElement.LeftContent>
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml.cs b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml.cs
index e7073b17..61fcfa75 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml.cs
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     /// <summary>
diff --git a/HandyControlDemo/UserControl/Main/MainContent.xaml.cs b/HandyControlDemo/UserControl/Main/MainContent.xaml.cs
index c83584a1..253c684e 100644
--- a/HandyControlDemo/UserControl/Main/MainContent.xaml.cs
+++ b/HandyControlDemo/UserControl/Main/MainContent.xaml.cs
@@ -3,7 +3,7 @@ using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Tools.Extension;
 using HandyControlDemo.Data;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     /// <summary>
diff --git a/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs b/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
index efa015e0..f765a014 100644
--- a/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
+++ b/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
@@ -10,7 +10,7 @@ using HandyControlDemo.Data;
 using HandyControlDemo.Tools;
 using HandyControlDemo.Window;
 
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class NoUserContent
diff --git a/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml.cs
index 0fc0dbfc..101e7a91 100644
--- a/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class BorderDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml.cs
index 29803a5d..2b757c25 100644
--- a/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class BrushDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml.cs
index 8fef6cc9..b0fe1afe 100644
--- a/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     /// <summary>
diff --git a/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml.cs
index 9c4fdb7e..42e98aa2 100644
--- a/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class CalendarDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
index 305143c2..e0270dc3 100644
--- a/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class CheckBoxDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml
index da9007c0..0dc1bc15 100644
--- a/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml
@@ -11,7 +11,7 @@
                 <DataGrid HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
                     <DataGrid.RowHeaderTemplate>
                         <DataTemplate>
-                            <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGridRow}}"/>
+                            <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
                         </DataTemplate>
                     </DataGrid.RowHeaderTemplate>
                     <DataGrid.Columns>
diff --git a/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml.cs
index 37c7f72e..b87c46e0 100644
--- a/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class DataGridDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml.cs
index 72e4d42a..31cb303c 100644
--- a/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 
 namespace HandyControlDemo.UserControl
 {
diff --git a/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml.cs
index ae86a8d4..3b53333b 100644
--- a/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class ListBoxDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml.cs
index 4c0fc652..3077306d 100644
--- a/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class MenuDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml.cs
index 88577726..0093afc5 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class NaiveScrollViewerDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml.cs
index 4fd7333e..ccc35e13 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class NaiveTabControlDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml.cs
index 6f3bf49b..f73ae25c 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class NaiveTextBoxDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml.cs
index 32b303ac..eb096c94 100644
--- a/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class ProgressBarDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
index d3b076f9..67a4cf20 100644
--- a/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class RadioButtonDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/SliderDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/SliderDemoCtl.xaml.cs
index dcdae3aa..500e9430 100644
--- a/HandyControlDemo/UserControl/Styles/SliderDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/SliderDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class SliderDemoCtl
diff --git a/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml.cs
index 3bffb2c6..fc1ac558 100644
--- a/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     /// <summary>
diff --git a/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
index 0a1e5e54..f4889ca3 100644
--- a/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     /// <summary>
diff --git a/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml.cs
index 20658efb..23563efe 100644
--- a/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml.cs
@@ -1,4 +1,4 @@
-// ReSharper disable once CheckNamespace
+
 namespace HandyControlDemo.UserControl
 {
     public partial class TreeViewDemoCtl