diff --git a/HandyControl/Controls/Image/ImageViewer.cs b/HandyControl/Controls/Image/ImageViewer.cs
index 4422a932..08ffd909 100644
--- a/HandyControl/Controls/Image/ImageViewer.cs
+++ b/HandyControl/Controls/Image/ImageViewer.cs
@@ -16,7 +16,7 @@ using Microsoft.Win32;
 
 namespace HandyControl.Controls
 {
-    [TemplatePart(Name = ElementGridMain, Type = typeof(Grid))]
+    [TemplatePart(Name = ElementPanelMain, Type = typeof(Panel))]
     [TemplatePart(Name = ElementCanvasSmallImg, Type = typeof(Canvas))]
     [TemplatePart(Name = ElementBorderMove, Type = typeof(Border))]
     [TemplatePart(Name = ElementBorderBottom, Type = typeof(Border))]
@@ -25,7 +25,7 @@ namespace HandyControl.Controls
     {
         #region Constants
 
-        private const string ElementGridMain = "PART_GridMain";
+        private const string ElementPanelMain = "PART_PanelMain";
 
         private const string ElementCanvasSmallImg = "PART_CanvasSmallImg";
 
@@ -52,7 +52,7 @@ namespace HandyControl.Controls
             Filter = $"{Lang.PngImg}|*.png"
         };
 
-        private Grid _gridMain;
+        private Panel _panelMain;
 
         private Canvas _canvasSmallImg;
 
@@ -401,7 +401,7 @@ namespace HandyControl.Controls
 
             base.OnApplyTemplate();
 
-            _gridMain = GetTemplateChild(ElementGridMain) as Grid;
+            _panelMain = GetTemplateChild(ElementPanelMain) as Panel;
             _canvasSmallImg = GetTemplateChild(ElementCanvasSmallImg) as Canvas;
             _borderMove = GetTemplateChild(ElementBorderMove) as Border;
             _imageMain = GetTemplateChild(ElementImageMain) as Image;
@@ -610,7 +610,7 @@ namespace HandyControl.Controls
 
         private void ImageMain_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            _imgMouseDownPoint = Mouse.GetPosition(_gridMain);
+            _imgMouseDownPoint = Mouse.GetPosition(_panelMain);
             _imgMouseDownMargin = ImageMargin;
             _imgIsMouseLeftButtonDown = true;
         }
@@ -705,7 +705,7 @@ namespace HandyControl.Controls
 
             ImageScale = tempScale;
 
-            var posCanvas = Mouse.GetPosition(_gridMain);
+            var posCanvas = Mouse.GetPosition(_panelMain);
             var posImg = new Point(posCanvas.X - _imgActualMargin.Left, posCanvas.Y - _imgActualMargin.Top);
 
             var marginX = .5 * _scaleInternalWidth;
@@ -789,7 +789,7 @@ namespace HandyControl.Controls
         /// </summary>
         private void MoveImg()
         {
-            _imgCurrentPoint = Mouse.GetPosition(_gridMain);
+            _imgCurrentPoint = Mouse.GetPosition(_panelMain);
             ShowCloseButton = _imgCurrentPoint.Y < 200;
             ShowBorderBottom = _imgCurrentPoint.Y > ActualHeight - 200;
 
diff --git a/HandyControl/Controls/Window/ImageBrowser.cs b/HandyControl/Controls/Window/ImageBrowser.cs
index f711ff54..c9741b62 100644
--- a/HandyControl/Controls/Window/ImageBrowser.cs
+++ b/HandyControl/Controls/Window/ImageBrowser.cs
@@ -12,13 +12,13 @@ namespace HandyControl.Controls
     /// <summary>
     ///     图片浏览器
     /// </summary>
-    [TemplatePart(Name = ElementGridTop, Type = typeof(Grid))]
+    [TemplatePart(Name = ElementPanelTop, Type = typeof(Panel))]
     [TemplatePart(Name = ElementImageViewer, Type = typeof(ImageViewer))]
     public class ImageBrowser : Window
     {
         #region Constants
 
-        private const string ElementGridTop = "PART_GridTop";
+        private const string ElementPanelTop = "PART_PanelTop";
 
         private const string ElementImageViewer = "PART_ImageViewer";
 
@@ -26,7 +26,7 @@ namespace HandyControl.Controls
 
         #region Data
 
-        private Grid _gridTop;
+        private Panel _panelTop;
 
         private ImageViewer _imageViewer;
 
@@ -82,9 +82,9 @@ namespace HandyControl.Controls
 
         public override void OnApplyTemplate()
         {
-            if (_gridTop != null)
+            if (_panelTop != null)
             {
-                _gridTop.MouseLeftButtonDown -= GridTop_OnMouseLeftButtonDown;
+                _panelTop.MouseLeftButtonDown -= PanelTopOnMouseLeftButtonDown;
             }
 
             if (_imageViewer != null)
@@ -94,12 +94,12 @@ namespace HandyControl.Controls
 
             base.OnApplyTemplate();
 
-            _gridTop = GetTemplateChild(ElementGridTop) as Grid;
+            _panelTop = GetTemplateChild(ElementPanelTop) as Panel;
             _imageViewer = GetTemplateChild(ElementImageViewer) as ImageViewer;
 
-            if (_gridTop != null)
+            if (_panelTop != null)
             {
-                _gridTop.MouseLeftButtonDown += GridTop_OnMouseLeftButtonDown;
+                _panelTop.MouseLeftButtonDown += PanelTopOnMouseLeftButtonDown;
             }
 
             if (_imageViewer != null)
@@ -110,7 +110,7 @@ namespace HandyControl.Controls
 
         private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
 
-        private void GridTop_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void PanelTopOnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (e.LeftButton == MouseButtonState.Pressed)
             {
diff --git a/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml
index ba892a86..e8a2237e 100644
--- a/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml
@@ -12,7 +12,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <Grid>
+                    <controls:SimplePanel>
                         <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"/>
                         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
@@ -20,7 +20,7 @@
                                 <ContentPresenter x:Name="ContentPresenterMain" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             </StackPanel>
                         </Border>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Content" Value="{x:Null}">
                             <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain"/>
diff --git a/HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
index 4a1b11f3..d13f74d9 100644
--- a/HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
@@ -9,12 +9,12 @@
     </ResourceDictionary.MergedDictionaries>
 
     <ControlTemplate x:Key="ChatBubbleStringBaseTemplate" TargetType="controls:ChatBubble">
-        <Grid>
+        <controls:SimplePanel>
             <Path Name="Tail"  Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5"/>
             <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
                 <TextBlock TextWrapping="Wrap" Text="{TemplateBinding Content}" VerticalAlignment="Center" Margin="{TemplateBinding Padding}"/>
             </Border>
-        </Grid>
+        </controls:SimplePanel>
         <ControlTemplate.Triggers>
             <Trigger Property="Role" Value="Receiver">
                 <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left"/>
@@ -31,15 +31,15 @@
     </ControlTemplate>
 
     <ControlTemplate x:Key="ChatBubbleImageBaseTemplate" TargetType="controls:ChatBubble">
-        <Grid>
+        <controls:SimplePanel>
             <Path Name="Tail"  Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5"/>
             <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-                <Grid>
+                <controls:SimplePanel>
                     <Image Margin="{TemplateBinding Padding}" VerticalAlignment="Center" Source="{TemplateBinding Content}"/>
                     <Border BorderThickness="{TemplateBinding Padding}" BorderBrush="{TemplateBinding Background}" Background="{x:Null}" CornerRadius="15"/>
-                </Grid>
+                </controls:SimplePanel>
             </Border>
-        </Grid>
+        </controls:SimplePanel>
         <ControlTemplate.Triggers>
             <Trigger Property="Role" Value="Receiver">
                 <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left"/>
@@ -112,12 +112,12 @@
     </ControlTemplate>
 
     <ControlTemplate x:Key="ChatBubbleCustomBaseTemplate" TargetType="controls:ChatBubble">
-        <Grid>
+        <controls:SimplePanel>
             <Path Name="Tail"  Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5"/>
             <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
                 <ContentPresenter VerticalAlignment="Center" Margin="{TemplateBinding Padding}"/>
             </Border>
-        </Grid>
+        </controls:SimplePanel>
         <ControlTemplate.Triggers>
             <Trigger Property="Role" Value="Receiver">
                 <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left"/>
diff --git a/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml
index fe118f00..d76c9d47 100644
--- a/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="CheckBoxBaseStyle" TargetType="CheckBox">
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
@@ -32,10 +33,10 @@
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
                         <Border Height="18" Width="18" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
-                        <Grid Grid.Column="0" Height="18" Width="18" x:Name="markGrid">
+                        <controls:SimplePanel Grid.Column="0" Height="18" Width="18" x:Name="markGrid">
                             <Path UseLayoutRounding="True" x:Name="path" StrokeDashOffset="8" StrokeDashArray="8,8" Width="12" Height="12" Data="M 0,2 3,5 8,0" StrokeThickness="2" Stretch="Uniform" Stroke="White"/>
                             <Rectangle x:Name="indeterminateMark" RadiusX="2" RadiusY="2" Fill="{DynamicResource PrimaryBrush}" Margin="2" Opacity="0"/>
-                        </Grid>
+                        </controls:SimplePanel>
                         <ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Grid>
                     <ControlTemplate.Triggers>
diff --git a/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index c3654c56..b2b2c7b0 100644
--- a/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -82,12 +82,12 @@
             <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -145,12 +145,12 @@
             <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -206,12 +206,12 @@
             <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -281,12 +281,12 @@
             <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -347,12 +347,12 @@
             <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -411,12 +411,12 @@
             <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -583,12 +583,12 @@
             <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -684,12 +684,12 @@
             <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -788,12 +788,12 @@
             <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
@@ -910,12 +910,12 @@
             <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                        <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                        <controls:SimplePanel x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
                                 <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
                             </Canvas>
                             <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </ScrollViewer>
                 </Border>
             </Popup>
diff --git a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
index 739f7941..3b0f934c 100644
--- a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
@@ -65,14 +65,14 @@
                                     </Border>
                                     <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                                     <Popup Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=templateRoot}" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Bottom">
-                                        <Grid>
+                                        <controls:SimplePanel>
                                             <Border CornerRadius="0,0,2,2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
                                                 <controls:ScrollViewer VerticalScrollBarVisibility="Auto" x:Name="SubMenuScrollViewer" Margin="0,6">
                                                     <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle"/>
                                                 </controls:ScrollViewer>
                                             </Border>
                                             <Border Height="1" Background="{DynamicResource RegionBrush}" VerticalAlignment="Top" BorderThickness="1,0" BorderBrush="{DynamicResource BorderBrush}" HorizontalAlignment="Left" Width="{Binding ActualWidth,ElementName=templateRoot}"/>
-                                        </Grid>
+                                        </controls:SimplePanel>
                                     </Popup>
                                 </Grid>
                             </Border>
diff --git a/HandyControl/Themes/Styles/Base/CoverFlowBaseStyle.xaml b/HandyControl/Themes/Styles/Base/CoverFlowBaseStyle.xaml
index b0194dd4..c342021b 100644
--- a/HandyControl/Themes/Styles/Base/CoverFlowBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/CoverFlowBaseStyle.xaml
@@ -2,22 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
-    <!--<Style x:Key="CoverFlowItemBaseStyle" TargetType="controls:CoverFlowItem">
-        <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">
-                    <Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-                        <ContentPresenter Margin="{TemplateBinding Padding}"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>-->
-
     <Style x:Key="CoverFlowBaseStyle" TargetType="controls:CoverFlow">
-        <!--<Setter Property="ItemContainerStyle" Value="{StaticResource CoverFlowItemBaseStyle}"/>-->
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:CoverFlow">
diff --git a/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml b/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
index 13968444..7fc69e40 100644
--- a/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
@@ -16,11 +16,11 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DatePickerTextBox">
-                    <Grid x:Name="WatermarkContent">
+                    <controls:SimplePanel x:Name="WatermarkContent">
                         <Border x:Name="ContentElement"/>
                         <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>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
index 865a5575..016e673b 100644
--- a/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
@@ -141,11 +141,11 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="PasswordBox">
-                    <Grid>
+                    <controls:SimplePanel>
                         <Border x:Name="border" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
                         <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="8,7,8,8" x:Name="placeholder" Visibility="Collapsed" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
                         <ScrollViewer Padding="{TemplateBinding Padding}" Margin="0,1,0,2" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="controls:PasswordBoxMonitor.PasswordLength" Value="0">
                             <Setter Property="Visibility" TargetName="placeholder" Value="Visible"/>
diff --git a/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
index 1619a5a2..9d9003f1 100644
--- a/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
@@ -24,18 +24,18 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ProgressBar">
-                    <Grid x:Name="TemplateRoot">
+                    <controls:SimplePanel x:Name="TemplateRoot">
                         <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
                         <Rectangle x:Name="PART_Track"/>
-                        <Grid HorizontalAlignment="Left">
+                        <controls:SimplePanel HorizontalAlignment="Left">
                             <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
                                 <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="Animation" ClipToBounds="true" Background="{TemplateBinding Foreground}">
                                     <Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100"/>
                                 </Border>
                             </Decorator>
                             <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Value,RelativeSource={RelativeSource TemplatedParent},StringFormat={}{0} %}"/>
-                        </Grid>
-                    </Grid>
+                        </controls:SimplePanel>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -53,13 +53,13 @@
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <Grid x:Name="TemplateRoot" SnapsToDevicePixels="true">
+                    <controls:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true">
                         <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
                         <Rectangle x:Name="PART_Track"/>
                         <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left" Margin="1">
                             <Border x:Name="Indicator" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Foreground}"/>
                         </Decorator>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="Indicator">
                             <BeginStoryboard Storyboard="{StaticResource OnLoaded}"/>
@@ -80,11 +80,11 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:CircleProgressBar">
-                    <Grid x:Name="TemplateRoot">
+                    <controls:SimplePanel x:Name="TemplateRoot">
                         <shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0"/>
                         <shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="PART_Indicator" Fill="{TemplateBinding Foreground}"/>
                         <TextBlock Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}"/>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/HandyControl/Themes/Styles/Base/ProgressButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ProgressButtonBaseStyle.xaml
index 33ffb71f..4f7000b0 100644
--- a/HandyControl/Themes/Styles/Base/ProgressButtonBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ProgressButtonBaseStyle.xaml
@@ -31,11 +31,11 @@
             <Setter.Value>
                 <ControlTemplate TargetType="controls:ProgressButton">
                     <Border x:Name="Chrome" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                        <Grid>
+                        <controls:SimplePanel>
                             <ProgressBar x:Name="ProgressBar" Height="{x:Static system:Double.NaN}" Value="{TemplateBinding Progress}" Maximum="100" Visibility="Collapsed" Style="{TemplateBinding ProgressStyle}"/>
                             <ContentPresenter Name="UnCheckedElement"  Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(controls:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
diff --git a/HandyControl/Themes/Styles/Base/RadioGroupBaseStyle.xaml b/HandyControl/Themes/Styles/Base/RadioGroupBaseStyle.xaml
index f531d865..721d683b 100644
--- a/HandyControl/Themes/Styles/Base/RadioGroupBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/RadioGroupBaseStyle.xaml
@@ -1,7 +1,6 @@
 <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:tools="clr-namespace:HandyControl.Tools">
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <ItemsPanelTemplate x:Key="RadioGroupHorizontalItemsPanelTemplate">
         <UniformGrid FocusVisualStyle="{x:Null}" Rows="1"/>
diff --git a/HandyControl/Themes/Styles/Base/ScrollViewerBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
index 9f207633..b3321e30 100644
--- a/HandyControl/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
@@ -68,7 +68,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ScrollBar">
-                    <Grid x:Name="Bg" SnapsToDevicePixels="true">
+                    <controls:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
                         <Border Background="{TemplateBinding Background}" />
                         <Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}">
                             <Track.DecreaseRepeatButton>
@@ -81,7 +81,7 @@
                                 <Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbVertical}"/>
                             </Track.Thumb>
                         </Track>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -95,7 +95,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="ScrollBar">
-                            <Grid x:Name="Bg" SnapsToDevicePixels="true">
+                            <controls:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
                                 <Border Background="{TemplateBinding Background}" />
                                 <Track x:Name="PART_Track" IsEnabled="{TemplateBinding IsMouseOver}">
                                     <Track.DecreaseRepeatButton>
@@ -108,7 +108,7 @@
                                         <Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbHorizontal}"/>
                                     </Track.Thumb>
                                 </Track>
-                            </Grid>
+                            </controls:SimplePanel>
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
diff --git a/HandyControl/Themes/Styles/Base/StepBarBaseStyle.xaml b/HandyControl/Themes/Styles/Base/StepBarBaseStyle.xaml
index 8334c712..b1469330 100644
--- a/HandyControl/Themes/Styles/Base/StepBarBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/StepBarBaseStyle.xaml
@@ -86,14 +86,14 @@
     </ControlTemplate>
 
     <ControlTemplate x:Key="StepBarHorizontalBottomControlTemplate" TargetType="controls:StepBar">
-        <Grid>
+        <controls:SimplePanel>
             <ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Bottom" Margin="0,0,0,10" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}"/>
             <ItemsPresenter VerticalAlignment="Bottom"/>
-        </Grid>
+        </controls:SimplePanel>
     </ControlTemplate>
 
     <ControlTemplate x:Key="StepBarVerticalLeftControlTemplate" TargetType="controls:StepBar">
-        <Grid>
+        <controls:SimplePanel>
             <ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5">
                 <ProgressBar.RenderTransform>
                     <TransformGroup>
@@ -102,7 +102,7 @@
                 </ProgressBar.RenderTransform>
             </ProgressBar>
             <ItemsPresenter/>
-        </Grid>
+        </controls:SimplePanel>
     </ControlTemplate>
 
     <Style x:Key="StepBarBaseStyle" TargetType="controls:StepBar">
diff --git a/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
index 88d089f5..02e42af1 100644
--- a/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
@@ -20,10 +20,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TabItem">
-                    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+                    <controls:SimplePanel x:Name="templateRoot" SnapsToDevicePixels="true">
                         <Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" Margin="0"/>
                         <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>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
diff --git a/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
index f801dc4f..8120f64b 100644
--- a/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
@@ -20,12 +20,12 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:WatermarkTextBox">
-                    <Grid x:Name="WatermarkContent">
+                    <controls:SimplePanel x:Name="WatermarkContent">
                         <Border x:Name="watermark_decorator">
                             <ContentControl VerticalAlignment="{TemplateBinding VerticalContentAlignment}" TextElement.Foreground="{DynamicResource ThirdlyTextBrush}" Margin="7,6" x:Name="PART_Watermark" Focusable="False" IsHitTestVisible="False" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" Padding="0"/>
                         </Border>
                         <ScrollViewer x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
index 65d7ca3b..86a687e0 100644
--- a/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
@@ -13,7 +13,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
-                    <Grid>
+                    <controls:SimplePanel>
                         <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"/>
                         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
@@ -22,7 +22,7 @@
                             </StackPanel>
                         </Border>
                         <Border Visibility="Collapsed" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}"/>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="true">
                             <Setter TargetName="BorderChecked" Property="Visibility" Value="Visible"/>
@@ -176,7 +176,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
-                    <Grid>
+                    <controls:SimplePanel>
                         <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"/>
                         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
                             <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
@@ -184,7 +184,7 @@
                             </ContentControl>
                         </Border>
                         <Border Visibility="Collapsed" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}"/>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
                             <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(controls:IconSwitchElement.GeometrySelected)}"/>
diff --git a/HandyControl/Themes/Styles/Base/ToolBarBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ToolBarBaseStyle.xaml
index fcfb3343..ecdd240d 100644
--- a/HandyControl/Themes/Styles/Base/ToolBarBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ToolBarBaseStyle.xaml
@@ -140,14 +140,14 @@
                             <ColumnDefinition/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <Grid x:Name="OverflowGrid" Grid.Column="1">
+                        <controls:SimplePanel x:Name="OverflowGrid" Grid.Column="1">
                             <ToggleButton Margin="4,0,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarHorizontalOverflowButtonStyle}"/>
                             <Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom" StaysOpen="false">
                                 <Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
                                     <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200"/>
                                 </Border>
                             </Popup>
-                        </Grid>
+                        </controls:SimplePanel>
                         <Border x:Name="MainPanelBorder" Grid.Column="0" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
                             <DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
                                 <Thumb x:Name="ToolBarThumb" Style="{StaticResource ToolBarThumbStyle}" Width="10"/>
diff --git a/HandyControl/Themes/Styles/Calendar.xaml b/HandyControl/Themes/Styles/Calendar.xaml
index 1201bb18..e3525efa 100644
--- a/HandyControl/Themes/Styles/Calendar.xaml
+++ b/HandyControl/Themes/Styles/Calendar.xaml
@@ -19,7 +19,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarButton">
-                    <Grid>
+                    <controls:SimplePanel>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="SelectionStates">
                                 <VisualStateGroup.Transitions>
@@ -53,7 +53,7 @@
                             </TextElement.Foreground>
                         </ContentPresenter>
                         <Rectangle x:Name="CalendarButtonFocusVisual" IsHitTestVisible="false" RadiusY="16" RadiusX="16" Stroke="{DynamicResource PrimaryBrush}" Visibility="Collapsed"/>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter Property="Visibility" TargetName="CalendarButtonFocusVisual" Value="Visible"/>
@@ -76,7 +76,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarDayButton">
-                    <Grid>
+                    <controls:SimplePanel>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualStateGroup.Transitions>
@@ -132,7 +132,7 @@
                                 <SolidColorBrush Color="{DynamicResource PrimaryTextColor}"/>
                             </TextElement.Foreground>
                         </ContentPresenter>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -149,7 +149,7 @@
                             <TextBlock Foreground="#FF333333" FontWeight="Bold" FontSize="12" HorizontalAlignment="Center" Margin="0,6,0,6" Text="{Binding}" VerticalAlignment="Center"/>
                         </DataTemplate>
                     </ControlTemplate.Resources>
-                    <Grid x:Name="PART_Root">
+                    <controls:SimplePanel x:Name="PART_Root">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal"/>
@@ -212,7 +212,7 @@
                                 </Grid>
                             </Border>
                         </Border>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Year">
                             <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden"/>
diff --git a/HandyControl/Themes/Styles/Carousel.xaml b/HandyControl/Themes/Styles/Carousel.xaml
index 04e1a78e..1686a0a6 100644
--- a/HandyControl/Themes/Styles/Carousel.xaml
+++ b/HandyControl/Themes/Styles/Carousel.xaml
@@ -44,9 +44,9 @@
                             </BeginStoryboard>
                         </EventTrigger>
                     </ControlTemplate.Triggers>
-                    <Grid ClipToBounds="True">
+                    <controls:SimplePanel ClipToBounds="True">
                         <ItemsPresenter x:Name="PART_ItemsControl" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" HorizontalAlignment="Left"/>
-                        <Grid Name="GridTop" Opacity="0">
+                        <controls:SimplePanel Name="GridTop" Opacity="0">
                             <Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
                                 <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
                                     <Path Margin="16" Fill="White" Style="{StaticResource LeftPathStyle}"/>
@@ -57,9 +57,9 @@
                                     <Path Margin="16" Fill="White" Style="{StaticResource RightPathStyle}"/>
                                 </Border>
                             </Button>
-                        </Grid>
+                        </controls:SimplePanel>
                         <StackPanel Name="PART_PanelPage" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20"/>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/HandyControl/Themes/Styles/Clock.xaml b/HandyControl/Themes/Styles/Clock.xaml
index a54dd92c..21f81b18 100644
--- a/HandyControl/Themes/Styles/Clock.xaml
+++ b/HandyControl/Themes/Styles/Clock.xaml
@@ -32,10 +32,10 @@
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+                    <controls:SimplePanel x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
                         <Ellipse x:Name="optionMark" Fill="{TemplateBinding Background}" MinWidth="6" MinHeight="6" Opacity="0"/>
                         <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="true">
                             <Trigger.EnterActions>
diff --git a/HandyControl/Themes/Styles/ColorPicker.xaml b/HandyControl/Themes/Styles/ColorPicker.xaml
index af6a06c7..63917319 100644
--- a/HandyControl/Themes/Styles/ColorPicker.xaml
+++ b/HandyControl/Themes/Styles/ColorPicker.xaml
@@ -26,7 +26,7 @@
                             <RowDefinition Height="62"/>
                         </Grid.RowDefinitions>
                         <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Grid.RowSpan="4" Background="{TemplateBinding Background}"/>
-                        <Grid Margin="1" Grid.Row="0">
+                        <controls:SimplePanel Margin="1" Grid.Row="0">
                             <Border Background="{TemplateBinding BackColor}"/>
                             <Border>
                                 <Border.Background>
@@ -46,7 +46,7 @@
                                     </LinearGradientBrush>
                                 </Border.Background>
                             </Border>
-                        </Grid>
+                        </controls:SimplePanel>
                         <Border Name="PART_BorderColor" Grid.Row="0" CornerRadius="2,2,0,0" ClipToBounds="True">
                             <Canvas Margin="-6">
                                 <Border Name="PART_BorderPicker" Background="Transparent" Height="12" CornerRadius="6" Width="12" BorderThickness="1" BorderBrush="White">
diff --git a/HandyControl/Themes/Styles/DataGrid.xaml b/HandyControl/Themes/Styles/DataGrid.xaml
index 5ef354a8..b3371c59 100644
--- a/HandyControl/Themes/Styles/DataGrid.xaml
+++ b/HandyControl/Themes/Styles/DataGrid.xaml
@@ -112,7 +112,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridColumnHeader">
-                    <Grid>
+                    <controls:SimplePanel>
                         <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
                             <StackPanel Orientation="Horizontal">
                                 <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
@@ -121,7 +121,7 @@
                         </Border>
                         <Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource ColumnHeaderGripperStyle}"/>
                         <Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource ColumnHeaderGripperStyle}"/>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="SortDirection" Value="{x:Null}">
                             <Setter Property="Visibility" Value="Collapsed" TargetName="ToggleButtonSortDirection"/>
@@ -150,7 +150,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGridRowHeader">
-                    <Grid HorizontalAlignment="Center">
+                    <controls:SimplePanel HorizontalAlignment="Center">
                         <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}" >
                             <StackPanel Orientation="Horizontal">
                                 <ContentPresenter RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
@@ -158,7 +158,7 @@
                         </Border>
                         <Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top"/>
                         <Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom"/>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/HandyControl/Themes/Styles/ImageViewer.xaml b/HandyControl/Themes/Styles/ImageViewer.xaml
index fac2c558..4d3798f1 100644
--- a/HandyControl/Themes/Styles/ImageViewer.xaml
+++ b/HandyControl/Themes/Styles/ImageViewer.xaml
@@ -27,11 +27,11 @@
                                 <RowDefinition/>
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
-                            <Grid x:Name="PART_GridMain" ClipToBounds="True" Grid.RowSpan="2">
+                            <controls:SimplePanel x:Name="PART_PanelMain" ClipToBounds="True" Grid.RowSpan="2">
                                 <Border HorizontalAlignment="Left" VerticalAlignment="Top" Height="{TemplateBinding ImageHeight}" Width="{TemplateBinding ImageWidth}" Margin="{TemplateBinding ImageMargin}">
-                                    <Image Name="PART_ImageMain" RenderTransformOrigin="0.5,0.5" Source="{TemplateBinding ImageSource}"/>
+                                    <Image Name="PART_ImageMain" RenderOptions.BitmapScalingMode="NearestNeighbor" RenderTransformOrigin="0.5,0.5" Source="{TemplateBinding ImageSource}"/>
                                 </Border>
-                            </Grid>
+                            </controls:SimplePanel>
                             <Border Grid.Row="0" Grid.RowSpan="2" Width="252" Height="162" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="{DynamicResource DarkOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
                                 <Border.Visibility>
                                     <MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
diff --git a/HandyControl/Themes/Styles/ListView.xaml b/HandyControl/Themes/Styles/ListView.xaml
index f5ec8276..dd97cbbd 100644
--- a/HandyControl/Themes/Styles/ListView.xaml
+++ b/HandyControl/Themes/Styles/ListView.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Base/ScrollViewerBaseStyle.xaml"/>
@@ -31,7 +32,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GridViewColumnHeader">
-                    <Grid SnapsToDevicePixels="true">
+                    <controls:SimplePanel SnapsToDevicePixels="true">
                         <Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
                             <Grid>
                                 <Grid.RowDefinitions>
@@ -46,7 +47,7 @@
                         <Canvas>
                             <Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}"/>
                         </Canvas>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -163,7 +164,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <!--<Style.Triggers>
+        <Style.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsGrouping" Value="true"/>
@@ -171,7 +172,7 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
             </MultiTrigger>
-        </Style.Triggers>-->
+        </Style.Triggers>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/ProgressBar.xaml b/HandyControl/Themes/Styles/ProgressBar.xaml
index 117fc66b..dba2c685 100644
--- a/HandyControl/Themes/Styles/ProgressBar.xaml
+++ b/HandyControl/Themes/Styles/ProgressBar.xaml
@@ -223,12 +223,12 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ProgressBar">
-                    <Grid x:Name="TemplateRoot" SnapsToDevicePixels="true">
+                    <controls:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true">
                         <Rectangle x:Name="PART_Track" Fill="{TemplateBinding Background}" StrokeThickness="0" Stroke="{TemplateBinding BorderBrush}"/>
                         <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
                             <Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}"/>
                         </Decorator>
-                    </Grid>
+                    </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Orientation" Value="Vertical">
                             <Setter Property="LayoutTransform" TargetName="TemplateRoot">
diff --git a/HandyControl/Themes/Styles/Slider.xaml b/HandyControl/Themes/Styles/Slider.xaml
index 2fceabbd..9deb9000 100644
--- a/HandyControl/Themes/Styles/Slider.xaml
+++ b/HandyControl/Themes/Styles/Slider.xaml
@@ -28,7 +28,7 @@
     </ControlTemplate>
 
     <ControlTemplate x:Key="ColorPickerSliderHorizontal" TargetType="Slider">
-        <Grid>
+        <controls:SimplePanel>
             <Border Margin="7,0" Background="{TemplateBinding Background}" MaxHeight="11" CornerRadius="2"/>
             <Border Margin="7,0" Background="{TemplateBinding Foreground}" MaxHeight="11" CornerRadius="2">
                 <Border.OpacityMask>
@@ -53,11 +53,11 @@
                     </Thumb>
                 </Track.Thumb>
             </Track>
-        </Grid>
+        </controls:SimplePanel>
     </ControlTemplate>
 
     <ControlTemplate x:Key="ColorPickerSliderVertical" TargetType="Slider">
-        <Grid >
+        <controls:SimplePanel>
             <Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Background}"/>
             <Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Foreground}">
                 <Border.OpacityMask>
@@ -82,7 +82,7 @@
                     </Thumb>
                 </Track.Thumb>
             </Track>
-        </Grid>
+        </controls:SimplePanel>
     </ControlTemplate>
 
     <Style x:Key="ColorPickerSlider" TargetType="Slider">
@@ -162,7 +162,7 @@
                 </DoubleAnimationUsingKeyFrames>
             </Storyboard>
         </ControlTemplate.Resources>
-        <Grid>
+        <controls:SimplePanel>
             <Border Width="1" HorizontalAlignment="Center">
                 <Border.Background>
                     <DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,1,8" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
@@ -181,7 +181,7 @@
                 </Border.Background>
             </Border>
             <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
-                <Grid Width="30" Height="30" Margin="-1,-1,0,0">
+                <controls:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
                     <Path x:Name="PathLeft" Data="{StaticResource LeftGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Left" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
                         <Path.RenderTransform>
                             <TransformGroup>
@@ -196,9 +196,9 @@
                             </TransformGroup>
                         </Path.RenderTransform>
                     </Path>
-                </Grid>
+                </controls:SimplePanel>
             </Border>
-        </Grid>
+        </controls:SimplePanel>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="true">
                 <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}"/>
@@ -263,7 +263,7 @@
                 </DoubleAnimationUsingKeyFrames>
             </Storyboard>
         </ControlTemplate.Resources>
-        <Grid>
+        <controls:SimplePanel>
             <Border Height="1" VerticalAlignment="Center">
                 <Border.Background>
                     <DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,8,1" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
@@ -282,7 +282,7 @@
                 </Border.Background>
             </Border>
             <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
-                <Grid Width="30" Height="30" Margin="-1,-1,0,0">
+                <controls:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
                     <Path x:Name="PathUp" Data="{StaticResource UpGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Top" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
                         <Path.RenderTransform>
                             <TransformGroup>
@@ -297,9 +297,9 @@
                             </TransformGroup>
                         </Path.RenderTransform>
                     </Path>
-                </Grid>
+                </controls:SimplePanel>
             </Border>
-        </Grid>
+        </controls:SimplePanel>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="true" SourceName="grip">
                 <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/HandyControl/Themes/Styles/TimeBar.xaml b/HandyControl/Themes/Styles/TimeBar.xaml
index 2845bf2a..c63a94c1 100644
--- a/HandyControl/Themes/Styles/TimeBar.xaml
+++ b/HandyControl/Themes/Styles/TimeBar.xaml
@@ -38,7 +38,7 @@
                         </EventTrigger>
                     </ControlTemplate.Triggers>
                     <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                        <Grid ClipToBounds="True">
+                        <controls:SimplePanel ClipToBounds="True">
                             <Border BorderThickness="0,0,0,4" BorderBrush="White" VerticalAlignment="Top" Height="52">
                                 <TextBlock FontSize="16" Name="PART_TextBlockSelected" VerticalAlignment="Top" Margin="0,14,0,0" HorizontalAlignment="Center"/>
                             </Border>
@@ -47,7 +47,7 @@
                             <Border Width="1" Background="{DynamicResource DangerBrush}"/>
                             <Canvas Name="PART_CanvasSpe" VerticalAlignment="Bottom" Height="28"/>
                             <Border Name="PART_BorderTop" Background="Transparent" Cursor="Hand"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/HandyControl/Themes/Styles/ToggleButton.xaml b/HandyControl/Themes/Styles/ToggleButton.xaml
index 2e249be7..2a26e635 100644
--- a/HandyControl/Themes/Styles/ToggleButton.xaml
+++ b/HandyControl/Themes/Styles/ToggleButton.xaml
@@ -118,10 +118,10 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
                     <Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                        <Grid>
+                        <controls:SimplePanel>
                             <ContentPresenter Name="UnCheckedElement"  Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(controls:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}"/>
-                        </Grid>
+                        </controls:SimplePanel>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
diff --git a/HandyControl/Themes/Styles/TransitioningContentControl.xaml b/HandyControl/Themes/Styles/TransitioningContentControl.xaml
index 15cbee50..dac6c0a9 100644
--- a/HandyControl/Themes/Styles/TransitioningContentControl.xaml
+++ b/HandyControl/Themes/Styles/TransitioningContentControl.xaml
@@ -76,7 +76,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Grid>
+                        <controls:SimplePanel>
                             <ContentPresenter x:Name="PreviousContentPresentationSite" Content="{x:Null}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                                 <ContentPresenter.RenderTransform>
                                     <TransformGroup>
@@ -97,7 +97,7 @@
                                     </TransformGroup>
                                 </ContentPresenter.RenderTransform>
                             </ContentPresenter>
-                        </Grid>
+                        </controls:SimplePanel>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/HandyControl/Themes/Styles/Window.xaml b/HandyControl/Themes/Styles/Window.xaml
index 7588f39f..c31413e4 100644
--- a/HandyControl/Themes/Styles/Window.xaml
+++ b/HandyControl/Themes/Styles/Window.xaml
@@ -24,7 +24,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ResizeGrip">
-                    <Grid Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                    <controls:SimplePanel Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
                         <Path Width="11" Height="11" Data="M 9,0 L 11,0 L 11,11 L 0,11 L 0,9 L 3,9 L 3,6 L 6,6 L 6,3 L 9,3 z" HorizontalAlignment="Right" VerticalAlignment="Bottom">
                             <Path.Fill>
                                 <DrawingBrush TileMode="Tile" Viewbox="0,0,3,3" Viewport="0,0,3,3" ViewportUnits="Absolute" ViewboxUnits="Absolute">
@@ -40,7 +40,7 @@
                                 </DrawingBrush>
                             </Path.Fill>
                         </Path>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -175,12 +175,12 @@
                 <ControlTemplate TargetType="controls:ImageBrowser">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="Storyboard1">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_GridTop">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
                                 <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="1"/>
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                         <Storyboard x:Key="Storyboard2">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_GridTop">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
                                 <EasingDoubleKeyFrame KeyTime="0:0:.4" Value="0"/>
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
@@ -191,13 +191,13 @@
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <controls:ImageViewer x:Name="PART_ImageViewer" ShowImgMap="True" BorderThickness="0" Background="#dd000000"/>
-                        <Grid Name="PART_GridTop" Opacity="0" Background="{DynamicResource DarkOpacityBrush}" VerticalAlignment="Top" Grid.Row="0">
+                        <controls:SimplePanel x:Name="PART_PanelTop" Opacity="0" Background="{DynamicResource DarkOpacityBrush}" VerticalAlignment="Top" Grid.Row="0">
                             <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal">
                                 <TextBlock Text="{Binding ImgPath,ElementName=PART_ImageViewer}" Foreground="White" Margin="10,0,0,0"/>
                                 <TextBlock Text="{Binding ImgSize,ElementName=PART_ImageViewer,Converter={StaticResource Long2FileSizeConverter}}" Foreground="White" Margin="30,0,0,0"/>
                             </StackPanel>
-                            <Button Command="interactivity:ControlCommands.Close" WindowChrome.IsHitTestVisibleInChrome="True" Background="Red" Grid.Row="0" Padding="14" controls:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonIcon}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="40" Height="40"/>
-                        </Grid>
+                            <Button Command="interactivity:ControlCommands.Close" WindowChrome.IsHitTestVisibleInChrome="True" Background="Red" Padding="14" controls:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonIcon}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="40" Height="40"/>
+                        </controls:SimplePanel>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger SourceName="PART_ImageViewer" Property="ShowCloseButton" Value="True">
diff --git a/HandyControlDemo/UserControl/Basic/TextDialog.xaml b/HandyControlDemo/UserControl/Basic/TextDialog.xaml
index eb470cc8..a4504bc3 100644
--- a/HandyControlDemo/UserControl/Basic/TextDialog.xaml
+++ b/HandyControlDemo/UserControl/Basic/TextDialog.xaml
@@ -8,8 +8,8 @@
         Width="400"
         Height="247"
         Background="{DynamicResource RegionBrush}">
-    <Grid>
+    <controls:SimplePanel>
         <TextBlock Style="{StaticResource TextBlockLargeBold}" Text="{x:Static langs:Lang.PleaseWait}"/>
         <Button Width="22" Height="22" Command="interactivity:ControlCommands.Close" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryBrush}" controls:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0"/>    
-    </Grid>
+    </controls:SimplePanel>
 </Border>
diff --git a/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml
index e78b2e07..2a47a088 100644
--- a/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml
@@ -7,10 +7,10 @@
         <controls:Carousel Margin="32" IsCenter="True" AutoRun="True" Width="600" Height="330" VerticalAlignment="Center">
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/1.jpg"/>
             <Image Width="300" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/2.jpg"/>
-            <Grid Width="600">
+            <controls:SimplePanel Width="600">
                 <Image Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/3.jpg"/>
                 <TextBlock Text="示例文本" Style="{StaticResource TextBlockDefault}" FontSize="100" FontWeight="Bold" Foreground="White"/>
-            </Grid>
+            </controls:SimplePanel>
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/4.jpg"/>
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/5.jpg"/>
         </controls:Carousel>
diff --git a/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml
index b9b99343..285330c6 100644
--- a/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/ChatBubbleDemoCtl.xaml
@@ -2,8 +2,9 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              Background="{DynamicResource RegionBrush}">
-    <ContentControl>
+    <controls:TransitioningContentControl>
         <StackPanel Orientation="Horizontal" Margin="32">
             <userControl:ChatBox>
                 <userControl:ChatBox.Background>
@@ -16,5 +17,5 @@
                 </userControl:ChatBox.Background>
             </userControl:ChatBox>
         </StackPanel>
-    </ContentControl>
+    </controls:TransitioningContentControl>
 </UserControl>
diff --git a/HandyControlDemo/UserControl/Controls/GotoTopDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/GotoTopDemoCtl.xaml
index 87c61e84..5f6821a0 100644
--- a/HandyControlDemo/UserControl/Controls/GotoTopDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/GotoTopDemoCtl.xaml
@@ -4,7 +4,7 @@
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
-        <Grid Width="500" Height="400">
+        <controls:SimplePanel Width="500" Height="400">
             <controls:ScrollViewer Name="ScrollViewerDemo" IsEnableInertia="True" Margin="0,10,0,0">
                 <Border Height="2000" Margin="8,0">
                     <Border.Background>
@@ -16,6 +16,6 @@
                 </Border>
             </controls:ScrollViewer>
             <controls:GotoTop Animated="True" AutoHiding="True" AnimationTime="500" Target="{Binding ElementName=ScrollViewerDemo}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,20,20"/>
-        </Grid>
+        </controls:SimplePanel>
     </controls:TransitioningContentControl>
 </UserControl>
diff --git a/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml
index cb441647..5c54ea23 100644
--- a/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml
@@ -9,25 +9,25 @@
                 <Label Style="{StaticResource LabelPrimary}" Content="Default" Margin="32,32,0,0" HorizontalAlignment="Left"/>
                 <controls:TabControl Margin="32,16,32,0" Width="800" Height="300">
                     <controls:TabItem Header="TabItem1">
-                        <Grid Background="White"/>
+                        <controls:SimplePanel Background="White"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem2">
-                        <Grid Background="{DynamicResource DarkDangerBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkDangerBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem3" IsSelected="True">
-                        <Grid Background="{DynamicResource PrimaryBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource PrimaryBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem4">
-                        <Grid Background="{DynamicResource DarkInfoBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkInfoBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem5">
-                        <Grid Background="{DynamicResource DarkSuccessBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkSuccessBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem6">
-                        <Grid Background="{DynamicResource DarkWarningBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkWarningBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem7">
-                        <Grid Background="{DynamicResource DarkAccentBrush}"/>
+                        <controls:SimplePanel Background="{DynamicResource DarkAccentBrush}"/>
                     </controls:TabItem>
                 </controls:TabControl>
                 <StackPanel Orientation="Horizontal" Margin="32,32,32,16">
@@ -38,25 +38,25 @@
                 </StackPanel>
                 <controls:TabControl IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
                     <controls:TabItem Header="TabItem1">
-                        <Grid Background="White"/>
+                        <controls:SimplePanel Background="White"/>
                     </controls:TabItem>
                     <controls:TabItem IsSelected="True" Header="TabItem2">
-                        <Grid Background="#FFE8563F"/>
+                        <controls:SimplePanel Background="#FFE8563F"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem3">
-                        <Grid Background="#FF3F4EE8"/>
+                        <controls:SimplePanel Background="#FF3F4EE8"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem4">
-                        <Grid Background="#FFE83F6D"/>
+                        <controls:SimplePanel Background="#FFE83F6D"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem5">
-                        <Grid Background="#FFB23FE8"/>
+                        <controls:SimplePanel Background="#FFB23FE8"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem6">
-                        <Grid Background="#FF3FE8E8"/>
+                        <controls:SimplePanel Background="#FF3FE8E8"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem7">
-                        <Grid Background="#FFE8E03F"/>
+                        <controls:SimplePanel Background="#FFE8E03F"/>
                     </controls:TabItem>
                 </controls:TabControl>
             </StackPanel>
diff --git a/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml
index 827ad0e3..abdf0364 100644
--- a/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml
@@ -5,7 +5,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
-         <Grid Margin="32">
+        <controls:SimplePanel Margin="32">
              <TextBlock Text="{x:Static langs:Lang.RightClickHere}" Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}"/>
              <Rectangle Width="200" Height="112" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
              <Border Width="200" Height="112" Background="Transparent">
@@ -19,6 +19,6 @@
                      </ContextMenu>
                  </Border.ContextMenu>
              </Border>
-         </Grid>
+         </controls:SimplePanel>
     </controls:TransitioningContentControl>
 </UserControl>
diff --git a/HandyControlDemo/Window/AboutWindow.xaml b/HandyControlDemo/Window/AboutWindow.xaml
index 63b0d8ab..1591a6eb 100644
--- a/HandyControlDemo/Window/AboutWindow.xaml
+++ b/HandyControlDemo/Window/AboutWindow.xaml
@@ -10,22 +10,17 @@
                  ShowTitle="True"
                  BorderThickness="1"
                  BorderBrush="#262e2f"
-                 NonClientAreaBackground="White"
-                 NonClientAreaForeground="{StaticResource PrimaryTextBrush}"
-                 CloseButtonForeground="{StaticResource PrimaryTextBrush}"
-                 OtherButtonForeground="{StaticResource PrimaryTextBrush}"
-                 OtherButtonHoverBackground="#e5e5e5"
                  Style="{StaticResource WindowWin10}"
                  ResizeMode="NoResize"
                  ShowInTaskbar="False"
                  WindowStartupLocation="CenterOwner"
                  Width="340"
                  Height="220">
-    <Grid>
+    <controls:SimplePanel>
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,30,0,0">
             <TextBlock Text="HandyControl" FontSize="30" Foreground="{StaticResource PrimaryBrush}" VerticalAlignment="Top" HorizontalAlignment="Center"/>
             <TextBlock Text="{Binding Version}" HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="{StaticResource PrimaryBrush}"/>
         </StackPanel>
         <TextBlock Text="{Binding CopyRight}" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,14" Foreground="{StaticResource ThirdlyTextBrush}"/>
-    </Grid>
+    </controls:SimplePanel>
 </controls:Window>
diff --git a/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml b/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml
index 18f02754..a6ba0100 100644
--- a/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml
+++ b/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml
@@ -14,11 +14,11 @@
                      Title="NoClientDragableWindow" 
                      Height="450" 
                      Width="800">
-    <Grid>
+    <controls:SimplePanel>
         <Rectangle VerticalAlignment="Top" Margin="10" Height="30" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
         <Border controls:WindowAttach.IsDragElement="True" VerticalAlignment="Top" Margin="11" Height="28" Background="{DynamicResource DarkDefaultBrush}" CornerRadius="4">
             <TextBlock Text="{x:Static langs:Lang.DragHere}" Style="{StaticResource TextBlockDefault}"/>
         </Border>
         <Button Click="ButtonClose_OnClick" HorizontalAlignment="Right" Margin="0,15,15,0" VerticalAlignment="Top" Padding="0" Height="20" Width="20" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource CloseGeometry}" controls:BorderElement.CornerRadius="15"/>
-    </Grid>
+    </controls:SimplePanel>
 </controls:BlurWindow>