diff --git a/HandyControl/Controls/Attach/LinkElement.cs b/HandyControl/Controls/Attach/LinkElement.cs
new file mode 100644
index 00000000..90bd8053
--- /dev/null
+++ b/HandyControl/Controls/Attach/LinkElement.cs
@@ -0,0 +1,48 @@
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Input;
+using HandyControl.Interactivity;
+
+namespace HandyControl.Controls
+{
+    public class LinkElement
+    {
+        public static readonly DependencyProperty LinkProperty = DependencyProperty.RegisterAttached(
+            "Link", typeof(string), typeof(LinkElement), new PropertyMetadata(default(string), OnLinkChanged));
+
+        private static void OnLinkChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is UIElement element)
+            {
+                CreateTrriger(element, (string) e.NewValue);
+            }
+        }
+
+        private static readonly DependencyProperty CommandBindingProperty = DependencyProperty.RegisterAttached(
+            "CommandBinding", typeof(CommandBinding), typeof(LinkElement), new PropertyMetadata(default(CommandBinding)));
+
+        private static void SetCommandBinding(DependencyObject element, CommandBinding value)
+            => element.SetValue(CommandBindingProperty, value);
+
+        private static CommandBinding GetCommandBinding(DependencyObject element)
+            => (CommandBinding) element.GetValue(CommandBindingProperty);
+
+        private static void CreateTrriger(UIElement element, string link)
+        {
+            if (string.IsNullOrEmpty(link))
+            {
+                element.CommandBindings.Remove(GetCommandBinding(element));
+                return;
+            }
+            var commandBinding = new CommandBinding(ControlCommands.OpenLink, (sender, args) => Process.Start(link));
+            SetCommandBinding(element, commandBinding);
+            element.CommandBindings.Add(commandBinding);
+        }
+
+        public static void SetLink(DependencyObject element, string value)
+            => element.SetValue(LinkProperty, value);
+
+        public static string GetLink(DependencyObject element)
+            => (string) element.GetValue(LinkProperty);
+    }
+}
\ No newline at end of file
diff --git a/HandyControl/Controls/Other/CircleProgressBar.cs b/HandyControl/Controls/Other/CircleProgressBar.cs
index bcefe80c..474ced46 100644
--- a/HandyControl/Controls/Other/CircleProgressBar.cs
+++ b/HandyControl/Controls/Other/CircleProgressBar.cs
@@ -11,17 +11,28 @@ namespace HandyControl.Controls
         private const string IndicatorTemplateName = "PART_Indicator";
 
         public static readonly DependencyProperty ArcThicknessProperty = DependencyProperty.Register(
-            "ArcThickness", typeof(double), typeof(CircleProgressBar), new PropertyMetadata(.0));
+            "ArcThickness", typeof(double), typeof(CircleProgressBar), new PropertyMetadata(ValueBoxes.Double0Box));
 
         public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
             "ShowText", typeof(bool), typeof(CircleProgressBar), new PropertyMetadata(ValueBoxes.TrueBox));
 
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+            "Text", typeof(string), typeof(CircleProgressBar), new PropertyMetadata(default(string)));
+
         private Arc _indicator;
 
         static CircleProgressBar()
         {
-            FocusableProperty.OverrideMetadata(typeof(CircleProgressBar), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
-            MaximumProperty.OverrideMetadata(typeof(CircleProgressBar), new FrameworkPropertyMetadata(ValueBoxes.Double100Box));
+            FocusableProperty.OverrideMetadata(typeof(CircleProgressBar),
+                new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+            MaximumProperty.OverrideMetadata(typeof(CircleProgressBar),
+                new FrameworkPropertyMetadata(ValueBoxes.Double100Box));
+        }
+
+        public string Text
+        {
+            get => (string) GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
         }
 
         public bool ShowText
diff --git a/HandyControl/Controls/Other/Shield.cs b/HandyControl/Controls/Other/Shield.cs
new file mode 100644
index 00000000..28a5284a
--- /dev/null
+++ b/HandyControl/Controls/Other/Shield.cs
@@ -0,0 +1,38 @@
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Markup;
+using System.Windows.Media;
+
+namespace HandyControl.Controls
+{
+    [ContentProperty(nameof(Status))]
+    public class Shield : ButtonBase
+    {
+        public static readonly DependencyProperty SubjectProperty = DependencyProperty.Register(
+            "Subject", typeof(string), typeof(Shield), new PropertyMetadata(default(string)));
+
+        public string Subject
+        {
+            get => (string) GetValue(SubjectProperty);
+            set => SetValue(SubjectProperty, value);
+        }
+
+        public static readonly DependencyProperty StatusProperty = DependencyProperty.Register(
+            "Status", typeof(object), typeof(Shield), new PropertyMetadata(default(object)));
+
+        public object Status
+        {
+            get => GetValue(StatusProperty);
+            set => SetValue(StatusProperty, value);
+        }
+
+        public static readonly DependencyProperty ColorProperty = DependencyProperty.Register(
+            "Color", typeof(Brush), typeof(Shield), new PropertyMetadata(default(Brush)));
+
+        public Brush Color
+        {
+            get => (Brush) GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/HandyControl/Controls/Rate/Rate.cs b/HandyControl/Controls/Rate/Rate.cs
index e2595971..d41d3256 100644
--- a/HandyControl/Controls/Rate/Rate.cs
+++ b/HandyControl/Controls/Rate/Rate.cs
@@ -4,11 +4,45 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
+using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
     public class Rate : ItemsControl
     {
+        public static readonly DependencyProperty ItemMarginProperty = DependencyProperty.Register(
+            "ItemMargin", typeof(Thickness), typeof(Rate), new PropertyMetadata(default(Thickness)));
+
+        public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
+            "ItemWidth", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double20Box));
+
+        public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
+            "ItemHeight", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double20Box));
+
+        public static readonly DependencyProperty AllowHalfProperty = DependencyProperty.Register(
+            "AllowHalf", typeof(bool), typeof(Rate), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
+
+        public static readonly DependencyProperty AllowClearProperty = DependencyProperty.Register(
+            "AllowClear", typeof(bool), typeof(Rate), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
+
+        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
+            "Icon", typeof(Geometry), typeof(Rate), new FrameworkPropertyMetadata(default(Geometry), FrameworkPropertyMetadataOptions.Inherits));
+
+        public static readonly DependencyProperty CountProperty = DependencyProperty.Register(
+            "Count", typeof(int), typeof(Rate), new PropertyMetadata(ValueBoxes.Int5Box));
+
+        public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register(
+            "DefaultValue", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double0Box));
+
+        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
+            "Value", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double0Box));
+
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+            "Text", typeof(string), typeof(Rate), new PropertyMetadata(default(string)));
+
+        public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
+            "ShowText", typeof(bool), typeof(Rate), new PropertyMetadata(ValueBoxes.FalseBox));
+
         private bool _isLoaded;
 
         public Rate()
@@ -18,6 +52,7 @@ namespace HandyControl.Controls
 
             Loaded += (s, e) =>
             {
+                if (DesignerHelper.IsInDesignMode()) return;
                 if (_isLoaded) return;
                 _isLoaded = true;
                 if (Value <= 0)
@@ -35,15 +70,84 @@ namespace HandyControl.Controls
             };
         }
 
-        private void RateItemValueChanged(object sender, RoutedEventArgs e) => Value =
-            (from RateItem item in Items where item.IsSelected select item.IsHalf ? 0.5 : 1).Sum();
+        public Thickness ItemMargin
+        {
+            get => (Thickness) GetValue(ItemMarginProperty);
+            set => SetValue(ItemMarginProperty, value);
+        }
+
+        public double ItemWidth
+        {
+            get => (double) GetValue(ItemWidthProperty);
+            set => SetValue(ItemWidthProperty, value);
+        }
+
+        public double ItemHeight
+        {
+            get => (double) GetValue(ItemHeightProperty);
+            set => SetValue(ItemHeightProperty, value);
+        }
+
+        public bool AllowHalf
+        {
+            get => (bool) GetValue(AllowHalfProperty);
+            set => SetValue(AllowHalfProperty, value);
+        }
+
+        public bool AllowClear
+        {
+            get => (bool) GetValue(AllowClearProperty);
+            set => SetValue(AllowClearProperty, value);
+        }
+
+        public Geometry Icon
+        {
+            get => (Geometry) GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
+        }
+
+        public int Count
+        {
+            get => (int) GetValue(CountProperty);
+            set => SetValue(CountProperty, value);
+        }
+
+        public double DefaultValue
+        {
+            get => (double) GetValue(DefaultValueProperty);
+            set => SetValue(DefaultValueProperty, value);
+        }
+
+        public double Value
+        {
+            get => (double) GetValue(ValueProperty);
+            set => SetValue(ValueProperty, value);
+        }
+
+        public string Text
+        {
+            get => (string) GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
+        }
+
+        public bool ShowText
+        {
+            get => (bool) GetValue(ShowTextProperty);
+            set => SetValue(ShowTextProperty, value);
+        }
+
+        private void RateItemValueChanged(object sender, RoutedEventArgs e)
+        {
+            Value =
+                (from RateItem item in Items where item.IsSelected select item.IsHalf ? 0.5 : 1).Sum();
+        }
 
         private void RateItemSelectedChanged(object sender, RoutedEventArgs e)
         {
             if (e.OriginalSource is RateItem rateItem)
             {
                 var index = rateItem.Index;
-                for (int i = 0; i < index; i++)
+                for (var i = 0; i < index; i++)
                 {
                     if (Items[i] is RateItem item)
                     {
@@ -51,7 +155,8 @@ namespace HandyControl.Controls
                         item.IsHalf = false;
                     }
                 }
-                for (int i = index; i < Count; i++)
+
+                for (var i = index; i < Count; i++)
                 {
                     if (Items[i] is RateItem item)
                     {
@@ -62,109 +167,16 @@ namespace HandyControl.Controls
             }
         }
 
-        public static readonly DependencyProperty ItemMarginProperty = DependencyProperty.Register(
-            "ItemMargin", typeof(Thickness), typeof(Rate), new PropertyMetadata(default(Thickness)));
-
-        public Thickness ItemMargin
+        protected override bool IsItemItsOwnContainerOverride(object item)
         {
-            get => (Thickness)GetValue(ItemMarginProperty);
-            set => SetValue(ItemMarginProperty, value);
+            return item is RateItem;
         }
 
-        public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
-            "ItemWidth", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double20Box));
-
-        public double ItemWidth
+        protected override DependencyObject GetContainerForItemOverride()
         {
-            get => (double)GetValue(ItemWidthProperty);
-            set => SetValue(ItemWidthProperty, value);
+            return new RateItem();
         }
 
-        public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
-            "ItemHeight", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double20Box));
-
-        public double ItemHeight
-        {
-            get => (double)GetValue(ItemHeightProperty);
-            set => SetValue(ItemHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty AllowHalfProperty = DependencyProperty.Register(
-            "AllowHalf", typeof(bool), typeof(Rate), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool AllowHalf
-        {
-            get => (bool)GetValue(AllowHalfProperty);
-            set => SetValue(AllowHalfProperty, value);
-        }
-
-        public static readonly DependencyProperty AllowClearProperty = DependencyProperty.Register(
-            "AllowClear", typeof(bool), typeof(Rate), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool AllowClear
-        {
-            get => (bool)GetValue(AllowClearProperty);
-            set => SetValue(AllowClearProperty, value);
-        }
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(Geometry), typeof(Rate), new PropertyMetadata(default(Geometry)));
-
-        public Geometry Icon
-        {
-            get => (Geometry)GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        public static readonly DependencyProperty CountProperty = DependencyProperty.Register(
-            "Count", typeof(int), typeof(Rate), new PropertyMetadata(ValueBoxes.Int5Box));
-
-        public int Count
-        {
-            get => (int)GetValue(CountProperty);
-            set => SetValue(CountProperty, value);
-        }
-
-        public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register(
-            "DefaultValue", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double DefaultValue
-        {
-            get => (double)GetValue(DefaultValueProperty);
-            set => SetValue(DefaultValueProperty, value);
-        }
-
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-            "Value", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double Value
-        {
-            get => (double)GetValue(ValueProperty);
-            set => SetValue(ValueProperty, value);
-        }
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(Rate), new PropertyMetadata(default(string)));
-
-        public string Text
-        {
-            get => (string)GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
-            "ShowText", typeof(bool), typeof(Rate), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowText
-        {
-            get => (bool)GetValue(ShowTextProperty);
-            set => SetValue(ShowTextProperty, value);
-        }
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is RateItem;
-
-        protected override DependencyObject GetContainerForItemOverride() => new RateItem();
-
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
@@ -173,7 +185,7 @@ namespace HandyControl.Controls
             {
                 Items.Clear();
 
-                for (int i = 1; i <= Count; i++)
+                for (var i = 1; i <= Count; i++)
                 {
                     Items.Add(new RateItem
                     {
@@ -192,8 +204,8 @@ namespace HandyControl.Controls
 
         private void UpdateItems()
         {
-            var count = (int)Value;
-            for (int i = 0; i < count; i++)
+            var count = (int) Value;
+            for (var i = 0; i < count; i++)
             {
                 if (Items[i] is RateItem rateItem)
                 {
@@ -201,6 +213,7 @@ namespace HandyControl.Controls
                     rateItem.IsHalf = false;
                 }
             }
+
             if (Value > count)
             {
                 if (Items[count] is RateItem rateItem)
@@ -208,9 +221,11 @@ namespace HandyControl.Controls
                     rateItem.IsSelected = true;
                     rateItem.IsHalf = true;
                 }
+
                 count += 1;
             }
-            for (int i = count; i < Count; i++)
+
+            for (var i = count; i < Count; i++)
             {
                 if (Items[i] is RateItem rateItem)
                 {
@@ -220,6 +235,9 @@ namespace HandyControl.Controls
             }
         }
 
-        public void Reset() => Value = DefaultValue;
+        public void Reset()
+        {
+            Value = DefaultValue;
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/HandyControl/Controls/Rate/RateItem.cs b/HandyControl/Controls/Rate/RateItem.cs
index 383a61ea..ee50ffa3 100644
--- a/HandyControl/Controls/Rate/RateItem.cs
+++ b/HandyControl/Controls/Rate/RateItem.cs
@@ -12,86 +12,65 @@ namespace HandyControl.Controls
     {
         private const string ElementIcon = "PART_Icon";
 
-        private FrameworkElement _icon;
+        public static readonly DependencyProperty AllowClearProperty =
+            Rate.AllowClearProperty.AddOwner(typeof(RateItem));
 
-        private bool _isLoaded;
+        public static readonly DependencyProperty AllowHalfProperty =
+            Rate.AllowHalfProperty.AddOwner(typeof(RateItem), new PropertyMetadata(OnAllowHalfChanged));
 
-        private bool _isSentValue;
-
-        private bool _isMouseLeftButtonDown;
-
-        public RateItem() => Loaded += (s, e) => _isLoaded = true;
-
-        public static readonly DependencyProperty AllowClearProperty = DependencyProperty.Register(
-            "AllowClear", typeof(bool), typeof(RateItem), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool AllowClear
-        {
-            get => (bool)GetValue(AllowClearProperty);
-            set => SetValue(AllowClearProperty, value);
-        }
-
-        public static readonly DependencyProperty AllowHalfProperty = DependencyProperty.Register(
-            "AllowHalf", typeof(bool), typeof(RateItem), new PropertyMetadata(ValueBoxes.FalseBox, OnAllowHalfChanged));
-
-        private static void OnAllowHalfChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (RateItem)d;
-            ctl.HandleMouseMoveEvent((bool)e.NewValue);
-        }
-
-        public bool AllowHalf
-        {
-            get => (bool)GetValue(AllowHalfProperty);
-            set => SetValue(AllowHalfProperty, value);
-        }
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(Geometry), typeof(RateItem), new PropertyMetadata(default(Geometry)));
-
-        public Geometry Icon
-        {
-            get => (Geometry)GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
+        public static readonly DependencyProperty IconProperty = Rate.IconProperty.AddOwner(typeof(RateItem));
 
         internal static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
-            "IsSelected", typeof(bool), typeof(RateItem), new PropertyMetadata(ValueBoxes.FalseBox, OnIsSelectedChanged));
-
-        private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (RateItem)d;
-            ctl._icon.Show((bool)e.NewValue);
-        }
-
-        internal bool IsSelected
-        {
-            get => (bool)GetValue(IsSelectedProperty);
-            set => SetValue(IsSelectedProperty, value);
-        }
+            "IsSelected", typeof(bool), typeof(RateItem),
+            new PropertyMetadata(ValueBoxes.FalseBox, OnIsSelectedChanged));
 
         public static readonly RoutedEvent SelectedChangedEvent =
             EventManager.RegisterRoutedEvent("SelectedChanged", RoutingStrategy.Bubble,
                 typeof(RoutedEventHandler), typeof(RateItem));
 
-        public event RoutedEventHandler SelectedChanged
-        {
-            add => AddHandler(SelectedChangedEvent, value);
-            remove => RemoveHandler(SelectedChangedEvent, value);
-        }
-
         public static readonly RoutedEvent ValueChangedEvent =
             EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
                 typeof(RoutedEventHandler), typeof(RateItem));
 
-        public event RoutedEventHandler ValueChanged
-        {
-            add => AddHandler(ValueChangedEvent, value);
-            remove => RemoveHandler(ValueChangedEvent, value);
-        }
+        private FrameworkElement _icon;
 
         private bool _isHalf;
 
+        private bool _isLoaded;
+
+        private bool _isMouseLeftButtonDown;
+
+        private bool _isSentValue;
+
+        public RateItem()
+        {
+            Loaded += (s, e) => _isLoaded = true;
+        }
+
+        public bool AllowClear
+        {
+            get => (bool) GetValue(AllowClearProperty);
+            set => SetValue(AllowClearProperty, value);
+        }
+
+        public bool AllowHalf
+        {
+            get => (bool) GetValue(AllowHalfProperty);
+            set => SetValue(AllowHalfProperty, value);
+        }
+
+        public Geometry Icon
+        {
+            get => (Geometry) GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
+        }
+
+        internal bool IsSelected
+        {
+            get => (bool) GetValue(IsSelectedProperty);
+            set => SetValue(IsSelectedProperty, value);
+        }
+
         internal bool IsHalf
         {
             get => _isHalf;
@@ -105,6 +84,30 @@ namespace HandyControl.Controls
 
         internal int Index { get; set; }
 
+        private static void OnAllowHalfChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (RateItem) d;
+            ctl.HandleMouseMoveEvent((bool) e.NewValue);
+        }
+
+        private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (RateItem) d;
+            ctl._icon.Show((bool) e.NewValue);
+        }
+
+        public event RoutedEventHandler SelectedChanged
+        {
+            add => AddHandler(SelectedChangedEvent, value);
+            remove => RemoveHandler(SelectedChangedEvent, value);
+        }
+
+        public event RoutedEventHandler ValueChanged
+        {
+            add => AddHandler(ValueChangedEvent, value);
+            remove => RemoveHandler(ValueChangedEvent, value);
+        }
+
         private void HandleMouseMoveEvent(bool handle)
         {
             if (handle)
@@ -144,7 +147,7 @@ namespace HandyControl.Controls
 
             _isSentValue = false;
             IsSelected = true;
-            RaiseEvent(new RoutedEventArgs(SelectedChangedEvent) { Source = this });
+            RaiseEvent(new RoutedEventArgs(SelectedChangedEvent) {Source = this});
         }
 
         protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
@@ -178,6 +181,7 @@ namespace HandyControl.Controls
                             _isSentValue = true;
                             return;
                         }
+
                         _isSentValue = false;
                         IsSelected = false;
                         IsHalf = false;
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index d28b79d8..5a45f7e2 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -92,6 +92,7 @@
     </When>
   </Choose>
   <ItemGroup>
+    <Compile Include="Controls\Attach\LinkElement.cs" />
     <Compile Include="Controls\Attach\VisualElement.cs" />
     <Compile Include="Controls\Other\AnimationPath.cs" />
     <Compile Include="Controls\Attach\BackgroundSwitchElement.cs" />
@@ -110,6 +111,7 @@
     <Compile Include="Controls\Other\CirclePanel.cs" />
     <Compile Include="Controls\Other\CircleProgressBar.cs" />
     <Compile Include="Controls\Other\RadioGroup.cs" />
+    <Compile Include="Controls\Other\Shield.cs" />
     <Compile Include="Controls\Rate\Rate.cs" />
     <Compile Include="Controls\Rate\RateItem.cs" />
     <Compile Include="Controls\Text\OutlineText.cs" />
@@ -202,6 +204,7 @@
     <Compile Include="Expression\Media\UnitType.cs" />
     <Compile Include="Expression\Shapes\Arc.cs" />
     <Compile Include="Expression\Shapes\PrimitiveShape.cs" />
+    <Compile Include="Tools\Helper\DesignerHelper.cs" />
     <Compile Include="Tools\Helper\ExternDllHelper.cs" />
     <Compile Include="Tools\Helper\SingleOpenHelper.cs" />
     <Compile Include="Controls\TabControl\TabControl.cs" />
@@ -360,6 +363,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Base\ShieldBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\Base\TagBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -368,6 +375,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Base\TreeViewBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\FlipClock.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -596,6 +607,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Shield.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\Slider.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/HandyControl/Interactivity/ControlCommands.cs b/HandyControl/Interactivity/ControlCommands.cs
index e74368fc..2054ff5b 100644
--- a/HandyControl/Interactivity/ControlCommands.cs
+++ b/HandyControl/Interactivity/ControlCommands.cs
@@ -131,5 +131,10 @@ namespace HandyControl.Interactivity
         ///     鼠标移动
         /// </summary>
         public static RoutedCommand MouseMove { get; } = new RoutedCommand(nameof(MouseMove), typeof(ControlCommands));
+
+        /// <summary>
+        ///     打开链接
+        /// </summary>
+        public static RoutedCommand OpenLink { get; } = new RoutedCommand(nameof(OpenLink), typeof(ControlCommands));
     }
 }
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
index 4508be01..5e96b5cb 100644
--- a/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
@@ -76,13 +76,14 @@
         <Setter Property="Height" Value="100"/>
         <Setter Property="Width" Value="100"/>
         <Setter Property="ArcThickness" Value="4"/>
+        <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0} %}"></Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:CircleProgressBar">
                     <Grid 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="{DynamicResource PrimaryTextBrush}" Text="{Binding Value,RelativeSource={RelativeSource TemplatedParent},StringFormat={}{0} %}"/>
+                        <TextBlock Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource PrimaryTextBrush}" Text="{TemplateBinding Text}"/>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/HandyControl/Themes/Styles/Base/RateBaseStyle.xaml b/HandyControl/Themes/Styles/Base/RateBaseStyle.xaml
index 9d29a661..95c61199 100644
--- a/HandyControl/Themes/Styles/Base/RateBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/RateBaseStyle.xaml
@@ -15,7 +15,6 @@
         <Setter Property="AllowClear" Value="{Binding AllowClear,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
         <Setter Property="Icon" Value="{Binding Icon,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
         <Setter Property="Background" Value="{Binding Background,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
-        <Setter Property="Foreground" Value="{Binding Foreground,RelativeSource={RelativeSource FindAncestor, AncestorType=controls:Rate}}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RateItem">
diff --git a/HandyControl/Themes/Styles/Base/ShieldBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ShieldBaseStyle.xaml
new file mode 100644
index 00000000..dd4ffb4c
--- /dev/null
+++ b/HandyControl/Themes/Styles/Base/ShieldBaseStyle.xaml
@@ -0,0 +1,39 @@
+<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">
+
+    <Style x:Key="ShieldBaseStyle" TargetType="controls:Shield">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="3"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Color" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:Shield">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.OpacityMask>
+                            <VisualBrush Stretch="None">
+                                <VisualBrush.Visual>
+                                    <Border x:Name="clipMask" Background="White" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"/>
+                                </VisualBrush.Visual>
+                            </VisualBrush>
+                        </Grid.OpacityMask>
+                        <Border Grid.Column="0" Background="#555">
+                            <TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0"/>
+                        </Border>
+                        <Border Grid.Column="1" Background="{TemplateBinding Color}">
+                            <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}"/>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/TreeViewBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TreeViewBaseStyle.xaml
new file mode 100644
index 00000000..63d2d8ab
--- /dev/null
+++ b/HandyControl/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -0,0 +1,142 @@
+<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">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Converters.xaml"/>
+        <ResourceDictionary Source="BaseStyle.xaml"/>
+        <ResourceDictionary Source="ScrollViewerBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <PathGeometry x:Key="TreeArrow" Figures="M508.893248 762.931659a65.039498 65.039498 0 0 1-46.420659-19.485839L97.125746 371.004022c-25.143018-25.634319-24.752868-66.816849 0.881451-91.959868 25.648769-25.164693 66.809624-24.745643 91.959867 0.881451l318.933409 325.125238 318.933408-325.125238a65.025048 65.025048 0 0 1 92.841318 91.078417L555.313907 743.44582a65.025048 65.025048 0 0 1-46.420659 19.485839z"/>
+    <Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Width" Value="16"/>
+        <Setter Property="Height" Value="16"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border Background="Transparent" Height="16" Padding="4" Width="16">
+                        <Path x:Name="ExpandPath" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Data="{StaticResource TreeArrow}" Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}}">
+                            <Path.RenderTransform>
+                                <RotateTransform Angle="-90"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="RenderTransform" TargetName="ExpandPath">
+                                <Setter.Value>
+                                    <RotateTransform Angle="0"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TreeViewItemBaseStyle" TargetType="TreeViewItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Padding" Value="10,0"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TreeViewItem">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="32"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                            <StackPanel Orientation="Horizontal" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type TreeViewItem}}}">
+                                <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
+                                <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </StackPanel>
+                        </Border>
+                        <ItemsPresenter x:Name="ItemsHost" Grid.Row="1"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="true"/>
+                                <Condition Property="HasItems" Value="false"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}"/>
+                        </MultiTrigger>
+                        <Trigger Property="IsExpanded" Value="false">
+                            <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="true"/>
+                                <Condition Property="IsSelectionActive" Value="false"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource DarkDefaultBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+                        </MultiTrigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{StaticResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TreeViewBaseStyle" TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="controls:ScrollViewer.IsEnableInertia" Value="False"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <!--<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>-->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TreeView">
+                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+                        <controls:ScrollViewer x:Name="_tv_scrollviewer_" IsEnableInertia="{Binding Path=(controls:ScrollViewer.IsEnableInertia),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                            <ItemsPresenter/>
+                        </controls:ScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}"/>
+                        </Trigger>
+                        <!--<Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+                            <Setter Property="CanContentScroll" TargetName="_tv_scrollviewer_" Value="true"/>
+                        </Trigger>-->
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <!--<Style.Triggers>
+            <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+                <Setter Property="ItemsPanel">
+                    <Setter.Value>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel/>
+                        </ItemsPanelTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>-->
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Shield.xaml b/HandyControl/Themes/Styles/Shield.xaml
new file mode 100644
index 00000000..e4c62e4e
--- /dev/null
+++ b/HandyControl/Themes/Styles/Shield.xaml
@@ -0,0 +1,11 @@
+<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">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/ShieldBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource ShieldBaseStyle}" TargetType="controls:Shield"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Style-Net40.xaml b/HandyControl/Themes/Styles/Style-Net40.xaml
deleted file mode 100644
index 866dc60c..00000000
--- a/HandyControl/Themes/Styles/Style-Net40.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Window-Net40.xaml"/>
-        <ResourceDictionary Source="Button.xaml"/>
-        <ResourceDictionary Source="ToggleButton.xaml"/>
-        <ResourceDictionary Source="TextBlock.xaml"/>
-        <ResourceDictionary Source="Border.xaml"/>
-        <ResourceDictionary Source="ProgressBar.xaml"/>
-        <ResourceDictionary Source="ScrollViewer.xaml"/>
-        <ResourceDictionary Source="Slider.xaml"/>
-        <ResourceDictionary Source="Clock.xaml"/>
-        <ResourceDictionary Source="TreeView.xaml"/>
-        <ResourceDictionary Source="Pagination.xaml"/>
-        <ResourceDictionary Source="TabControl.xaml"/>
-        <ResourceDictionary Source="ListBox.xaml"/>
-        <ResourceDictionary Source="Loading.xaml"/>
-        <ResourceDictionary Source="ContextMenu.xaml"/>
-        <ResourceDictionary Source="ToolTip.xaml"/>
-        <ResourceDictionary Source="Expander.xaml"/>
-        <ResourceDictionary Source="TextBox.xaml"/>
-        <ResourceDictionary Source="ComboBox.xaml"/>
-        <ResourceDictionary Source="CheckBox.xaml"/>
-        <ResourceDictionary Source="RadioButton.xaml"/>
-        <ResourceDictionary Source="NumericUpDown.xaml"/>
-        <ResourceDictionary Source="PasswordBox.xaml"/>
-        <ResourceDictionary Source="Calendar.xaml"/>
-        <ResourceDictionary Source="DatePicker.xaml"/>
-        <ResourceDictionary Source="TimePicker.xaml"/>
-        <ResourceDictionary Source="ContentControl.xaml"/>
-        <ResourceDictionary Source="Growl.xaml"/>
-        <ResourceDictionary Source="StepBar.xaml"/>
-        <ResourceDictionary Source="Carousel.xaml"/>
-        <ResourceDictionary Source="TimeBar.xaml"/>
-        <ResourceDictionary Source="ColorPicker.xaml"/>
-        <ResourceDictionary Source="DataGrid.xaml"/>
-        <ResourceDictionary Source="TransitioningContentControl.xaml"/>
-        <ResourceDictionary Source="Image.xaml"/>
-        <ResourceDictionary Source="Label.xaml"/>
-        <ResourceDictionary Source="ImageViewer.xaml"/>
-        <ResourceDictionary Source="CalendarWithClock.xaml"/>
-        <ResourceDictionary Source="DateTimePicker.xaml"/>
-        <ResourceDictionary Source="GroupBox.xaml"/>
-        <ResourceDictionary Source="ListView.xaml"/>
-        <ResourceDictionary Source="RichTextBox.xaml"/>
-        <ResourceDictionary Source="ToolBar.xaml"/>
-        <ResourceDictionary Source="SearchBar.xaml"/>
-        <ResourceDictionary Source="Tag.xaml"/>
-        <ResourceDictionary Source="RadioGroup.xaml"/>
-        <ResourceDictionary Source="FlipClock.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml
index aaa06631..19959398 100644
--- a/HandyControl/Themes/Styles/Style.xaml
+++ b/HandyControl/Themes/Styles/Style.xaml
@@ -49,6 +49,7 @@
         <ResourceDictionary Source="RadioGroup.xaml"/>
         <ResourceDictionary Source="FlipClock.xaml"/>
         <ResourceDictionary Source="Rate.xaml"/>
+        <ResourceDictionary Source="Shield.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/TreeView.xaml b/HandyControl/Themes/Styles/TreeView.xaml
index 2d4bacae..956ed723 100644
--- a/HandyControl/Themes/Styles/TreeView.xaml
+++ b/HandyControl/Themes/Styles/TreeView.xaml
@@ -1,142 +1,11 @@
-<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">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
-        <ResourceDictionary Source="Base/BaseStyle.xaml"/>
-        <ResourceDictionary Source="Base/ScrollViewerBaseStyle.xaml"/>
+        <ResourceDictionary Source="Base/TreeViewBaseStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <PathGeometry x:Key="TreeArrow" Figures="M508.893248 762.931659a65.039498 65.039498 0 0 1-46.420659-19.485839L97.125746 371.004022c-25.143018-25.634319-24.752868-66.816849 0.881451-91.959868 25.648769-25.164693 66.809624-24.745643 91.959867 0.881451l318.933409 325.125238 318.933408-325.125238a65.025048 65.025048 0 0 1 92.841318 91.078417L555.313907 743.44582a65.025048 65.025048 0 0 1-46.420659 19.485839z"/>
-    <Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Width" Value="16"/>
-        <Setter Property="Height" Value="16"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Border Background="Transparent" Height="16" Padding="4" Width="16">
-                        <Path x:Name="ExpandPath" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Data="{StaticResource TreeArrow}" Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}}">
-                            <Path.RenderTransform>
-                                <RotateTransform Angle="-90"/>
-                            </Path.RenderTransform>
-                        </Path>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="RenderTransform" TargetName="ExpandPath">
-                                <Setter.Value>
-                                    <RotateTransform Angle="0"/>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+    <Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem"/>
 
-    <Style TargetType="TreeViewItem">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Padding" Value="10,0"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="TreeViewItem">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="32"/>
-                            <RowDefinition/>
-                        </Grid.RowDefinitions>
-                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <StackPanel Orientation="Horizontal" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type TreeViewItem}}}">
-                                <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
-                                <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                            </StackPanel>
-                        </Border>
-                        <ItemsPresenter x:Name="ItemsHost" Grid.Row="1"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="true"/>
-                                <Condition Property="HasItems" Value="false"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}"/>
-                        </MultiTrigger>
-                        <Trigger Property="IsExpanded" Value="false">
-                            <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
-                        </Trigger>
-                        <Trigger Property="HasItems" Value="false">
-                            <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsSelected" Value="true"/>
-                                <Condition Property="IsSelectionActive" Value="false"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource DarkDefaultBrush}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-                        </MultiTrigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{StaticResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="controls:ScrollViewer.IsEnableInertia" Value="False"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <!--<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>-->
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="TreeView">
-                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-                        <controls:ScrollViewer x:Name="_tv_scrollviewer_" IsEnableInertia="{Binding Path=(controls:ScrollViewer.IsEnableInertia),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                            <ItemsPresenter/>
-                        </controls:ScrollViewer>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}"/>
-                        </Trigger>
-                        <!--<Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
-                            <Setter Property="CanContentScroll" TargetName="_tv_scrollviewer_" Value="true"/>
-                        </Trigger>-->
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <!--<Style.Triggers>
-            <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
-                <Setter Property="ItemsPanel">
-                    <Setter.Value>
-                        <ItemsPanelTemplate>
-                            <VirtualizingStackPanel/>
-                        </ItemsPanelTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>-->
-    </Style>
+    <Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView"/>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Window-Net40.xaml b/HandyControl/Themes/Styles/Window-Net40.xaml
deleted file mode 100644
index 7363b314..00000000
--- a/HandyControl/Themes/Styles/Window-Net40.xaml
+++ /dev/null
@@ -1,251 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs"
-                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity"
-                    xmlns:shell="http://schemas.microsoft.com/winfx/2006/xaml/presentation/shell">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Button.xaml"/>
-        <ResourceDictionary Source="TextBlock.xaml"/>
-        <ResourceDictionary Source="Border.xaml"/>
-        <ResourceDictionary Source="ToggleButton.xaml"/>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
-        <ResourceDictionary Source="../Basic/Paths.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style x:Key="WindowDefaultStyle" BasedOn="{x:Null}" TargetType="Window">
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-    </Style>
-
-    <Style x:Key="CustomWindowStyle" BasedOn="{x:Null}" TargetType="controls:WindowBorderless">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="NonClientAreaBackground" Value="{DynamicResource TitleBrush}"/>
-        <Setter Property="NonClientAreaForeground" Value="White"/>
-        <Setter Property="CloseButtonHoverBackground" Value="Red"/>
-        <Setter Property="CloseButtonHoverForeground" Value="White"/>
-        <Setter Property="CloseButtonBackground" Value="Transparent"/>
-        <Setter Property="OtherButtonHoverBackground" Value="{DynamicResource DarkPrimaryBrush}"/>
-        <Setter Property="OtherButtonHoverForeground" Value="White"/>
-        <Setter Property="OtherButtonBackground" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:WindowBorderless">
-                    <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                        <Grid Margin="{TemplateBinding Padding}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            <Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NonClientAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <StackPanel shell:WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MinimizeWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMin" Height="28" Style="{StaticResource ButtonIcon}" Width="44" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" Padding="17,0"/>
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MaximizeWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMax" Height="28" Style="{StaticResource ButtonIcon}" Width="44" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" Padding="17,0"/>
-                                    <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.RestoreWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonRestore" Height="28" Style="{StaticResource ButtonIcon}" Width="44" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" Padding="17,0"/>
-                                    <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="shell:SystemCommands.CloseWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonClose" Height="28" Style="{StaticResource ButtonIcon}" Width="44" controls:IconElement.Geometry="{StaticResource CloseGeometry}" Padding="9"/>
-                                </StackPanel>
-                                <Grid Grid.Column="0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition/>
-                                    </Grid.ColumnDefinitions>
-                                    <ContentPresenter Content="{TemplateBinding Icon}" VerticalAlignment="Center"/>
-                                    <TextBlock Name="Title" Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center"/>
-                                    <ContentPresenter shell:WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
-                                </Grid>
-                            </Grid>
-                            <ContentPresenter Grid.Row="1" Content="{TemplateBinding Content}"/>
-                            <ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsActive" Value="False">
-                            <Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain"/>
-                        </Trigger>
-                        <Trigger Property="WindowState" Value="Maximized">
-                            <Setter Property="Padding" Value="8"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Visible" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="WindowState" Value="Normal">
-                            <Setter Property="Visibility" Value="Visible" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="ResizeMode" Value="NoResize">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMin"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="ResizeMode" Value="CanMinimize">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax"/>
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-                            <Setter Property="Background" TargetName="ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMax">
-                            <Setter Property="Background" TargetName="ButtonMax" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonMax" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonRestore">
-                            <Setter Property="Background" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMin">
-                            <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                        </Trigger>
-                        <Trigger Property="ShowNonClientArea" Value="False">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="GridMenu"/>
-                        </Trigger>
-                        <Trigger Property="ShowTitle" Value="False">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ResizeMode" Value="CanResizeWithGrip"/>
-                                <Condition Property="WindowState" Value="Normal" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsFullScreen" Value="True">
-                <Setter Property="shell:WindowChrome.WindowChrome">
-                    <Setter.Value>
-                        <shell:WindowChrome CornerRadius="0" GlassFrameThickness="1" CaptionHeight="0"/>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style TargetType="controls:PopupWindow">
-        <Setter Property="WindowStyle" Value="None"/>
-        <Setter Property="MinHeight" Value="220"/>
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="BorderThickness" Value="20"/>
-        <Setter Property="ShowInTaskbar" Value="False"/>
-        <Setter Property="MinWidth" Value="300"/>
-        <Setter Property="ResizeMode" Value="NoResize"/>
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="SizeToContent" Value="WidthAndHeight"/>
-        <Setter Property="Effect">
-            <Setter.Value>
-                <DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:PopupWindow">
-                    <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="10,6" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
-                                <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" controls:IconElement.Geometry="{StaticResource CloseGeometry}" Padding="9">
-                                    <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}"/>
-                                </Button>
-                            </Grid>
-                            <Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
-                                <StackPanel>
-                                    <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}"/>
-                                    <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
-                                        <Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0"/>
-                                        <Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Style="{StaticResource ButtonPrimary}"/>
-                                    </StackPanel>
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="ShowBorder" Value="True">
-                            <Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder"/>
-                        </Trigger>
-                        <Trigger Property="ShowTitle" Value="False">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid"/>
-                            <Setter Property="Background" Value="Transparent"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="controls:ImageBrowser">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="MinWidth" Value="400"/>
-        <Setter Property="MinHeight" Value="250"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="Black"/>
-        <Setter Property="ResizeMode" Value="NoResize"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:ImageBrowser">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="Storyboard1">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_GridTop">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="Storyboard2">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_GridTop">
-                                <EasingDoubleKeyFrame KeyTime="0:0:.4" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition/>
-                            <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">
-                            <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" shell: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>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger SourceName="PART_ImageViewer" Property="ShowCloseButton" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
-                            </Trigger.ExitActions>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsFullScreen" Value="True">
-                <Setter Property="WindowState" Value="Maximized"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Tools/Helper/DesignerHelper.cs b/HandyControl/Tools/Helper/DesignerHelper.cs
new file mode 100644
index 00000000..1f4d3416
--- /dev/null
+++ b/HandyControl/Tools/Helper/DesignerHelper.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace HandyControl.Tools
+{
+    public class DesignerHelper
+    {
+        public static bool IsInDesignMode()
+        {
+            try
+            {
+                var type1 = Type.GetType(
+                    "System.ComponentModel.DesignerProperties, PresentationFramework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
+                if (type1 == null)
+                    return false;
+                var obj1 = type1.GetTypeInfo().GetDeclaredField("IsInDesignModeProperty").GetValue(null);
+                var type2 = Type.GetType(
+                    "System.ComponentModel.DependencyPropertyDescriptor, WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
+                var type3 = Type.GetType(
+                    "System.Windows.FrameworkElement, PresentationFramework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
+                if (type2 == null || type3 == null)
+                    return false;
+                var list = type2.GetTypeInfo().GetDeclaredMethods("FromProperty").ToList();
+                if (list.Count == 0)
+                    return false;
+                var methodInfo = list.FirstOrDefault(mi =>
+                {
+                    if (mi.IsPublic && mi.IsStatic)
+                        return mi.GetParameters().Length == 2;
+                    return false;
+                });
+                if (methodInfo == null)
+                    return false;
+                var obj2 = methodInfo.Invoke(null, new[]
+                {
+                    obj1,
+                    type3
+                });
+                if (obj2 == null)
+                    return false;
+                var declaredProperty1 = type2.GetTypeInfo().GetDeclaredProperty("Metadata");
+                if (declaredProperty1 == null)
+                    return false;
+                var obj3 = declaredProperty1.GetValue(obj2, null);
+                var type4 = Type.GetType(
+                    "System.Windows.PropertyMetadata, WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
+                if (obj3 == null || type4 == null)
+                    return false;
+                var declaredProperty2 = type4.GetTypeInfo().GetDeclaredProperty("DefaultValue");
+                if (declaredProperty2 == null)
+                    return false;
+                return (bool) declaredProperty2.GetValue(obj3, null);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index 588a5b6d..81585c04 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -66,6 +66,8 @@
 	
         public static readonly string RateDemoCtl = nameof(RateDemoCtl);
 	
+        public static readonly string ShieldDemoCtl = nameof(ShieldDemoCtl);
+	
         public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
 
         public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt
index f9ae0db6..8d998ceb 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -35,7 +35,8 @@ var controlList = new List<string>
 	"FlipClockDemoCtl",
 	"QQGroupView",
 	"BlurWindow",
-	"RateDemoCtl"
+	"RateDemoCtl",
+	"ShieldDemoCtl"
 };
 var styleList = new List<string>
 {
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 87384aa3..7b854b59 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -171,6 +171,9 @@
     <Compile Include="UserControl\Controls\SearchBarDemoCtl.xaml.cs">
       <DependentUpon>SearchBarDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\Controls\ShieldDemoCtl.xaml.cs">
+      <DependentUpon>ShieldDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\Controls\StepBarDemoCtl.xaml.cs">
       <DependentUpon>StepBarDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -455,6 +458,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UserControl\Controls\ShieldDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UserControl\Controls\StepBarDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -647,6 +654,7 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>MessageToken.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\Img\LeftMainContent\Shield_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\Star.png" />
     <Resource Include="Resources\Img\qq-group.jpg" />
     <Resource Include="Resources\Img\LeftMainContent\FlipVertical_16x.png" />
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index a4904768..37b055b6 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -825,6 +825,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 徽章 的本地化字符串。
+        /// </summary>
+        public static string Shield {
+            get {
+                return ResourceManager.GetString("Shield", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 显示行号 的本地化字符串。
         /// </summary>
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index b3355a51..33e53c3e 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -447,4 +447,7 @@
   <data name="Rate" xml:space="preserve">
     <value>Rate</value>
   </data>
+  <data name="Shield" xml:space="preserve">
+    <value>Shield</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index 218da9cf..f910452f 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -427,4 +427,7 @@
   <data name="Rate" xml:space="preserve">
     <value>评分</value>
   </data>
+  <data name="Shield" xml:space="preserve">
+    <value>徽章</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/Shield_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/Shield_16x.png
new file mode 100644
index 00000000..9b30ef16
Binary files /dev/null and b/HandyControlDemo/Resources/Img/LeftMainContent/Shield_16x.png differ
diff --git a/HandyControlDemo/UserControl/Controls/RateDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/RateDemoCtl.xaml
index 2fe07025..1f7e3524 100644
--- a/HandyControlDemo/UserControl/Controls/RateDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/RateDemoCtl.xaml
@@ -6,6 +6,7 @@
     <controls:TransitioningContentControl>
         <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center" Width="170">
             <controls:Rate Value="2"/>
+            <controls:Rate Value="5" Count="6" Margin="0,16,0,0" Foreground="{DynamicResource SuccessBrush}"/>
             <controls:Rate DefaultValue="3" AllowHalf="True" Margin="0,16,0,0" Foreground="{DynamicResource WarningBrush}"/>
             <controls:Rate DefaultValue="1" AllowClear="False" AllowHalf="True" Margin="0,16,0,0" Foreground="{DynamicResource DangerBrush}" Icon="{StaticResource LoveGeometry}"/>
             <controls:Rate Value="4.5" AllowHalf="True" ShowText="True" Margin="0,16,0,0" Foreground="{DynamicResource DangerBrush}" Icon="{StaticResource LoveGeometry}"/>
diff --git a/HandyControlDemo/UserControl/Controls/ShieldDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ShieldDemoCtl.xaml
new file mode 100644
index 00000000..6676c3ef
--- /dev/null
+++ b/HandyControlDemo/UserControl/Controls/ShieldDemoCtl.xaml
@@ -0,0 +1,16 @@
+<UserControl x:Class="HandyControlDemo.UserControl.ShieldDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
+             Background="{DynamicResource RegionBrush}">
+    <controls:TransitioningContentControl>
+        <StackPanel Orientation="Horizontal" Margin="32">
+            <controls:Shield Subject=".net" Status=">=4.0" Color="#1182c3"/>
+            <controls:Shield Subject="c#" Status="7.0" Margin="4,0,0,0" Color="#1182c3"/>
+            <controls:Shield Subject="IDE" Status="2017" Margin="4,0,0,0" Color="#1182c3"/>
+            <controls:Shield Subject="chat" Status="on gitter" Margin="4,0,0,0" Color="#4eb899" Command="interactivity:ControlCommands.OpenLink" controls:LinkElement.Link="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
+            <controls:Shield Subject="qq" Status="714704041" Margin="4,0,0,0" Color="#d8624c" Command="interactivity:ControlCommands.OpenLink" controls:LinkElement.Link="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
+        </StackPanel>
+    </controls:TransitioningContentControl>
+</UserControl>
\ No newline at end of file
diff --git a/HandyControlDemo/UserControl/Controls/ShieldDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/ShieldDemoCtl.xaml.cs
new file mode 100644
index 00000000..6cfbc669
--- /dev/null
+++ b/HandyControlDemo/UserControl/Controls/ShieldDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class ShieldDemoCtl
+    {
+        public ShieldDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index 6b51a723..a208902f 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -200,6 +200,11 @@
                         <Image Source="../../Resources/Img/LeftMainContent/Star.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
+                <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ShieldDemoCtl}" Content="{x:Static langs:Lang.Shield}">
+                    <controls:EdgeElement.LeftContent>
+                        <Image Source="../../Resources/Img/LeftMainContent/Shield_16x.png"/>
+                    </controls:EdgeElement.LeftContent>
+                </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.SearchBarDemoCtl}" Content="{x:Static langs:Lang.SearchBar}">
                     <controls:EdgeElement.LeftContent>
                         <Image Source="../../Resources/Img/LeftMainContent/Search_16x.png"/>