Merge branch 'master' into pr/84

src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs

@@ -34,8 +34,8 @@ namespace HandyControl.Controls
                 }
                 else
                 {
-                    BindingOperations.ClearBinding(border, FrameworkElement.MinWidthProperty);
-                    BindingOperations.ClearBinding(border, FrameworkElement.MinHeightProperty);
+                    BindingOperations.ClearBinding(border, FrameworkElement.ActualWidthProperty);
+                    BindingOperations.ClearBinding(border, FrameworkElement.ActualHeightProperty);
                     BindingOperations.ClearBinding(border, Border.CornerRadiusProperty);
                 }
             }

src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs

@@ -0,0 +1,45 @@
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Shapes;
+using HandyControl.Data;
+using HandyControl.Tools.Converter;
+
+namespace HandyControl.Controls
+{
+    public class RectangleAttach
+    {
+        public static readonly DependencyProperty CircularProperty = DependencyProperty.RegisterAttached(
+            "Circular", typeof(bool), typeof(RectangleAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnCircularChanged));
+
+        private static void OnCircularChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is Rectangle rectangle)
+            {
+                if ((bool)e.NewValue)
+                {
+                    var binding = new MultiBinding
+                    {
+                        Converter = new RectangleCircularConverter()
+                    };
+                    binding.Bindings.Add(new Binding(FrameworkElement.ActualWidthProperty.Name) { Source = rectangle });
+                    binding.Bindings.Add(new Binding(FrameworkElement.ActualHeightProperty.Name) { Source = rectangle });
+                    rectangle.SetBinding(Rectangle.RadiusXProperty, binding);
+                    rectangle.SetBinding(Rectangle.RadiusYProperty, binding);
+                }
+                else
+                {
+                    BindingOperations.ClearBinding(rectangle, FrameworkElement.ActualWidthProperty);
+                    BindingOperations.ClearBinding(rectangle, FrameworkElement.ActualHeightProperty);
+                    BindingOperations.ClearBinding(rectangle, Rectangle.RadiusXProperty);
+                    BindingOperations.ClearBinding(rectangle, Rectangle.RadiusYProperty);
+                }
+            }
+        }
+
+        public static void SetCircular(DependencyObject element, bool value)
+            => element.SetValue(CircularProperty, value);
+
+        public static bool GetCircular(DependencyObject element)
+            => (bool) element.GetValue(CircularProperty);
+    }
+}

src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs

@@ -12,6 +12,15 @@ namespace HandyControl.Controls
             => element.SetValue(HighlightBrushProperty, value);
 
         public static Brush GetHighlightBrush(DependencyObject element)
-            => (Brush) element.GetValue(HighlightBrushProperty);        
+            => (Brush) element.GetValue(HighlightBrushProperty);
+
+        public static readonly DependencyProperty TextProperty = DependencyProperty.RegisterAttached(
+            "Text", typeof(string), typeof(VisualElement), new PropertyMetadata(default(string)));
+
+        public static void SetText(DependencyObject element, string value)
+            => element.SetValue(TextProperty, value);
+
+        public static string GetText(DependencyObject element)
+            => (string) element.GetValue(TextProperty);
     }
 }

src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs

@@ -478,7 +478,7 @@ namespace HandyControl.Controls
         /// </summary>
         private void UpdateStatus(Color color)
         {
-            if (_isOnDragging) return;
+            if (_isOnDragging || _sliderColor == null) return;
 
             var r = color.R;
             var g = color.G;

src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs

@@ -204,7 +204,7 @@ namespace HandyControl.Controls
         /// <param name="pos"></param>
         private void Remove(int pos)
         {
-            var item = _itemShowList[pos];
+            if (!_itemShowList.TryGetValue(pos, out var item)) return;
             _visualParent.Children.Remove(item);
             _itemShowList.Remove(pos);
         }
@@ -308,10 +308,17 @@ namespace HandyControl.Controls
         {
             if (content is Uri uri)
             {
-                return new CoverFlowItem(index, PageIndex, new Image
+                try
                 {
-                    Source = BitmapFrame.Create(uri)
-                });
+                    return new CoverFlowItem(index, PageIndex, new Image
+                    {
+                        Source = BitmapFrame.Create(uri, BitmapCreateOptions.DelayCreation, BitmapCacheOption.OnDemand)
+                    });
+                }
+                catch
+                {
+                    return new CoverFlowItem(index, PageIndex, new ContentControl());
+                }
             }
 
             return new CoverFlowItem(index, PageIndex, new ContentControl

src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs

@@ -33,6 +33,22 @@ namespace HandyControl.Controls
             VisibilityProperty.OverrideMetadata(typeof(GifImage), new PropertyMetadata(default(Visibility), OnVisibilityChanged));
         }
 
+        public static readonly DependencyProperty UriProperty = DependencyProperty.Register(
+            "Uri", typeof(Uri), typeof(GifImage), new PropertyMetadata(default(Uri), OnUriChanged));
+
+        private static void OnUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (GifImage) d;
+            var v = (Uri)e.NewValue;
+            ctl.Source = new BitmapImage(v);
+        }
+
+        public Uri Uri
+        {
+            get => (Uri) GetValue(UriProperty);
+            set => SetValue(UriProperty, value);
+        }
+
         private static void OnVisibilityChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
         {
             var ctl = (GifImage)s;
@@ -56,10 +72,14 @@ namespace HandyControl.Controls
                 if (DesignerProperties.GetIsInDesignMode(this)) return;
                 if (_isLoaded) return;
                 _isLoaded = true;
-                if (Source is BitmapImage image)
+                if (Uri != null)
                 {
-                    var uri = image.UriSource;
-                    GetGifStreamFromPack(uri);
+                    GetGifStreamFromPack(Uri);
+                    StartAnimate();
+                }
+                else if (Source is BitmapImage image)
+                {
+                    GetGifStreamFromPack(image.UriSource);
                     StartAnimate();
                 }
             };

src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs

@@ -0,0 +1,190 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Threading;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    public class ImageBlock : FrameworkElement
+    {
+        private readonly DispatcherTimer _dispatcherTimer;
+
+        private BitmapSource _source;
+
+        private int _indexMax;
+
+        private int _indexMin;
+
+        private int _currentIndex;
+
+        private int _blockWidth;
+
+        private int _blockHeight;
+
+        public ImageBlock()
+        {
+            _dispatcherTimer = new DispatcherTimer
+            {
+                Interval = Interval
+            };
+            _dispatcherTimer.Tick += DispatcherTimer_Tick;
+        }
+
+        private void UpdateDatas()
+        {
+            if (_source == null) return;
+            _indexMin = StartRow * Columns + StartColumn;
+            _indexMax = EndRow * Columns + EndColumn;
+            _currentIndex = _indexMin;
+            _blockWidth = _source.PixelWidth / Columns;
+            _blockHeight = _source.PixelHeight / Rows;
+        }
+
+        private static void OnPositionsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ImageBlock)d;
+            ctl.UpdateDatas();
+        }
+
+        private void DispatcherTimer_Tick(object sender, EventArgs e) => InvalidateVisual();
+
+        public static readonly DependencyProperty StartColumnProperty = DependencyProperty.Register(
+            "StartColumn", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
+
+        public int StartColumn
+        {
+            get => (int) GetValue(StartColumnProperty);
+            set => SetValue(StartColumnProperty, value);
+        }
+
+        public static readonly DependencyProperty StartRowProperty = DependencyProperty.Register(
+            "StartRow", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
+
+        public int StartRow
+        {
+            get => (int) GetValue(StartRowProperty);
+            set => SetValue(StartRowProperty, value);
+        }
+
+        public static readonly DependencyProperty EndColumnProperty = DependencyProperty.Register(
+            "EndColumn", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
+
+        public int EndColumn
+        {
+            get => (int) GetValue(EndColumnProperty);
+            set => SetValue(EndColumnProperty, value);
+        }
+
+        public static readonly DependencyProperty EndRowProperty = DependencyProperty.Register(
+            "EndRow", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
+
+        public int EndRow
+        {
+            get => (int) GetValue(EndRowProperty);
+            set => SetValue(EndRowProperty, value);
+        }
+
+        public static readonly DependencyProperty IsPlayingProperty = DependencyProperty.Register(
+            "IsPlaying", typeof(bool), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox,
+                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnIsPlayingChanged));
+
+        private static void OnIsPlayingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ImageBlock)d;
+            if ((bool) e.NewValue)
+            {
+                ctl._dispatcherTimer.Start();
+            }
+            else
+            {
+                ctl._dispatcherTimer.Stop();
+            }
+        }
+
+        public bool IsPlaying
+        {
+            get => (bool) GetValue(IsPlayingProperty);
+            set => SetValue(IsPlayingProperty, value);
+        }
+
+        public static readonly DependencyProperty ColumnsProperty = DependencyProperty.Register(
+            "Columns", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int1Box,
+                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged), obj => (int)obj >= 1);
+
+        public int Columns
+        {
+            get => (int) GetValue(ColumnsProperty);
+            set => SetValue(ColumnsProperty, value);
+        }
+
+        public static readonly DependencyProperty RowsProperty = DependencyProperty.Register(
+            "Rows", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int1Box,
+                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged), obj => (int)obj >= 1);
+
+        public int Rows
+        {
+            get => (int) GetValue(RowsProperty);
+            set => SetValue(RowsProperty, value);
+        }
+
+        public static readonly DependencyProperty IntervalProperty = DependencyProperty.Register(
+            "Interval", typeof(TimeSpan), typeof(ImageBlock), new PropertyMetadata(TimeSpan.FromSeconds(1), OnIntervalChanged));
+
+        private static void OnIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ImageBlock) d;
+            ctl._dispatcherTimer.Interval = (TimeSpan) e.NewValue;
+        }
+
+        public TimeSpan Interval
+        {
+            get => (TimeSpan) GetValue(IntervalProperty);
+            set => SetValue(IntervalProperty, value);
+        }
+
+        public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
+            "Source", typeof(ImageSource), typeof(ImageBlock), new FrameworkPropertyMetadata(default(ImageSource),
+                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnSourceChanged));
+
+        private static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ImageBlock)d;
+            ctl._source = e.NewValue as BitmapSource;
+            ctl.UpdateDatas();
+        }
+
+        public ImageSource Source
+        {
+            get => (ImageSource)GetValue(SourceProperty);
+            set => SetValue(SourceProperty, value);
+        }
+
+        protected override void OnRender(DrawingContext dc)
+        {
+            if (_source == null) return;
+            var croppedBitmap = new CroppedBitmap(_source, CalDisplayRect());
+            dc.DrawImage(croppedBitmap, new Rect(0, 0, RenderSize.Width, RenderSize.Height));
+        }
+
+        private Int32Rect CalDisplayRect()
+        {
+            if (_currentIndex > _indexMax)
+            {
+                _currentIndex = _indexMin;
+            }
+
+            var x = _currentIndex % Columns * _blockWidth;
+            var y = _currentIndex / Columns * _blockHeight;
+
+            var rect = new Int32Rect(x, y, _blockWidth, _blockHeight);
+            _currentIndex++;
+            return rect;
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Other/ButtonGroup.cs

@@ -1,17 +1,16 @@
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
-    public class RadioGroup : ItemsControl
+    public class ButtonGroup : ItemsControl
     {
-        protected override DependencyObject GetContainerForItemOverride() => new RadioButton();
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is RadioButton;
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is Button || item is RadioButton || item is ToggleButton;
 
         public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            "Orientation", typeof(Orientation), typeof(RadioGroup), new PropertyMetadata(default(Orientation)));
+            "Orientation", typeof(Orientation), typeof(ButtonGroup), new PropertyMetadata(default(Orientation)));
 
         public Orientation Orientation
         {
@@ -20,7 +19,7 @@ namespace HandyControl.Controls
         }
 
         public static readonly DependencyProperty ItemStyleSelectorProperty = DependencyProperty.Register(
-            "ItemStyleSelector", typeof(StyleSelector), typeof(RadioGroup), new PropertyMetadata(new RadioGroupItemStyleSelector()));
+            "ItemStyleSelector", typeof(StyleSelector), typeof(ButtonGroup), new PropertyMetadata(new ButtonGroupItemStyleSelector()));
 
         public StyleSelector ItemStyleSelector
         {
@@ -35,9 +34,9 @@ namespace HandyControl.Controls
             var count = Items.Count;
             for (var i = 0; i < count; i++)
             {
-                var item = (RadioButton)Items[i];
+                var item = (ButtonBase)Items[i];
                 item.Style = ItemStyleSelector?.SelectStyle(item, this);
             }
         }
     }
-}
+}

src/Shared/HandyControl_Shared/Controls/Other/Card.cs

@@ -0,0 +1,87 @@
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+    public class Card : ContentControl
+    {
+        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+            "Header", typeof(object), typeof(Card), new PropertyMetadata(default(object)));
+
+        public object Header
+        {
+            get => GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
+            "HeaderTemplate", typeof(DataTemplate), typeof(Card), new PropertyMetadata(default(DataTemplate)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplate HeaderTemplate
+        {
+            get => (DataTemplate) GetValue(HeaderTemplateProperty);
+            set => SetValue(HeaderTemplateProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderTemplateSelectorProperty = DependencyProperty.Register(
+            "HeaderTemplateSelector", typeof(DataTemplateSelector), typeof(Card), new PropertyMetadata(default(DataTemplateSelector)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplateSelector HeaderTemplateSelector
+        {
+            get => (DataTemplateSelector) GetValue(HeaderTemplateSelectorProperty);
+            set => SetValue(HeaderTemplateSelectorProperty, value);
+        }
+
+        public static readonly DependencyProperty HeaderStringFormatProperty = DependencyProperty.Register(
+            "HeaderStringFormat", typeof(string), typeof(Card), new PropertyMetadata(default(string)));
+
+        [Bindable(true), Category("Content")]
+        public string HeaderStringFormat
+        {
+            get => (string) GetValue(HeaderStringFormatProperty);
+            set => SetValue(HeaderStringFormatProperty, value);
+        }
+
+        public static readonly DependencyProperty FooterProperty = DependencyProperty.Register(
+            "Footer", typeof(object), typeof(Card), new PropertyMetadata(default(object)));
+
+        public object Footer
+        {
+            get => GetValue(FooterProperty);
+            set => SetValue(FooterProperty, value);
+        }
+
+        public static readonly DependencyProperty FooterTemplateProperty = DependencyProperty.Register(
+            "FooterTemplate", typeof(DataTemplate), typeof(Card), new PropertyMetadata(default(DataTemplate)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplate FooterTemplate
+        {
+            get => (DataTemplate) GetValue(FooterTemplateProperty);
+            set => SetValue(FooterTemplateProperty, value);
+        }
+
+        public static readonly DependencyProperty FooterTemplateSelectorProperty = DependencyProperty.Register(
+            "FooterTemplateSelector", typeof(DataTemplateSelector), typeof(Card), new PropertyMetadata(default(DataTemplateSelector)));
+
+        [Bindable(true), Category("Content")]
+        public DataTemplateSelector FooterTemplateSelector
+        {
+            get => (DataTemplateSelector) GetValue(FooterTemplateSelectorProperty);
+            set => SetValue(FooterTemplateSelectorProperty, value);
+        }
+
+        public static readonly DependencyProperty FooterStringFormatProperty = DependencyProperty.Register(
+            "FooterStringFormat", typeof(string), typeof(Card), new PropertyMetadata(default(string)));
+
+        [Bindable(true), Category("Content")]
+        public string FooterStringFormat
+        {
+            get => (string) GetValue(FooterStringFormatProperty);
+            set => SetValue(FooterStringFormatProperty, value);
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs

@@ -61,7 +61,7 @@ namespace HandyControl.Controls
             _itemsControl = GetTemplateChild(ElementItemsControl) as ItemsPresenter;
             _panelPage = GetTemplateChild(ElementPanelPage) as Panel;
 
-            CheckNull();
+            if (!CheckNull()) return;
 
             _panelPage.AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(ButtonPages_OnClick));
             _appliedTemplate = true;
@@ -74,10 +74,7 @@ namespace HandyControl.Controls
             UpdatePageButtons(_pageIndex);
         }
 
-        private void CheckNull()
-        {
-            if (_itemsControl == null || _panelPage == null) throw new Exception();
-        }
+        private bool CheckNull() => !(_itemsControl == null || _panelPage == null);
 
         public static readonly DependencyProperty AutoRunProperty = DependencyProperty.Register(
             "AutoRun", typeof(bool), typeof(Carousel), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
@@ -195,6 +192,7 @@ namespace HandyControl.Controls
         /// </summary>
         public void UpdatePageButtons(int index = -1)
         {
+            if (!CheckNull()) return;
             if (!_appliedTemplate) return;
 
             var count = Items.Count;
@@ -236,6 +234,7 @@ namespace HandyControl.Controls
         /// </summary>
         private void UpdateItemsPosition()
         {
+            if (!CheckNull()) return;
             if (!_appliedTemplate) return;
             if (Items.Count == 0) return;
             if (!IsCenter)
@@ -284,6 +283,7 @@ namespace HandyControl.Controls
 
         private void ButtonPages_OnClick(object sender, RoutedEventArgs e)
         {
+            if (!CheckNull()) return;
             if (_selectedButton != null && _selectedButton.Content is Border borderOri)
                 borderOri.Background = Brushes.White;
             _selectedButton = e.OriginalSource as Button;

src/Shared/HandyControl_Shared/Controls/Other/Dialog.cs

@@ -12,6 +12,8 @@ namespace HandyControl.Controls
 {
     public class Dialog : ContentControl
     {
+        private string _token;
+
         private Adorner _container;
 
         private static readonly Dictionary<string, System.Windows.Window> WindowDic = new Dictionary<string, System.Windows.Window>();
@@ -99,6 +101,7 @@ namespace HandyControl.Controls
         {
             var dialog = new Dialog
             {
+                _token = token,
                 Content = content
             };
 
@@ -139,19 +142,16 @@ namespace HandyControl.Controls
             return dialog;
         }
 
-        public void Close(string token = "")
+        public void Close()
         {
-            if (!string.IsNullOrEmpty(token))
-            {
-                if (WindowDic.TryGetValue(token, out var window))
-                {
-                    Close(window);
-                }
-            }
-            else
+            if (string.IsNullOrEmpty(_token))
             {
                 Close(VisualHelper.GetActiveWindow());
             }
+            else if (WindowDic.TryGetValue(_token, out var window))
+            {
+                Close(window);
+            }
         }
 
         private void Close(System.Windows.Window window)

src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs

@@ -0,0 +1,174 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using HandyControl.Data;
+using HandyControl.Interactivity;
+using HandyControl.Tools;
+using HandyControl.Tools.Extension;
+
+namespace HandyControl.Controls
+{
+    [TemplatePart(Name = ElementVisualBrush, Type = typeof(VisualBrush))]
+    public class Magnifier : Control
+    {
+        private Size _viewboxSize;
+
+        private AdornerContainer _adorner;
+
+        private UIElement _elementTarget;
+
+        private const string ElementVisualBrush = "PART_VisualBrush";
+
+        private VisualBrush _visualBrush = new VisualBrush();
+
+        private readonly TranslateTransform _translateTransform;
+
+        public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.Register(
+            "HorizontalOffset", typeof(double), typeof(Magnifier), new PropertyMetadata(ValueBoxes.Double0Box));
+
+        public double HorizontalOffset
+        {
+            get => (double) GetValue(HorizontalOffsetProperty);
+            set => SetValue(HorizontalOffsetProperty, value);
+        }
+
+        public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.Register(
+            "VerticalOffset", typeof(double), typeof(Magnifier), new PropertyMetadata(ValueBoxes.Double0Box));
+
+        public double VerticalOffset
+        {
+            get => (double) GetValue(VerticalOffsetProperty);
+            set => SetValue(VerticalOffsetProperty, value);
+        }
+
+        public static readonly DependencyProperty InstanceProperty = DependencyProperty.RegisterAttached(
+            "Instance", typeof(Magnifier), typeof(Magnifier), new PropertyMetadata(default(Magnifier), OnMagnifierChanged));
+
+        private static void OnMagnifierChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (!(d is UIElement target)) return;
+            var magnifier = (Magnifier)e.NewValue;
+            magnifier.Target = target;
+        }
+
+        public static void SetInstance(DependencyObject element, Magnifier value)
+            => element.SetValue(InstanceProperty, value);
+
+        public static Magnifier GetInstance(DependencyObject element)
+            => (Magnifier) element.GetValue(InstanceProperty);
+
+        public static Magnifier Default => new Magnifier();
+
+        internal static readonly DependencyProperty TargetProperty = DependencyProperty.Register(
+            "Target", typeof(UIElement), typeof(Magnifier), new PropertyMetadata(default(UIElement), OnTargetChanged));
+
+        private static void OnTargetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (Magnifier) d;
+            ctl.UpdateTarget(ctl._elementTarget, false);
+            ctl.UpdateTarget((UIElement)e.NewValue, true);
+        }
+
+        internal UIElement Target
+        {
+            get => (UIElement)GetValue(TargetProperty);
+            set => SetValue(TargetProperty, value);
+        }
+
+        public static readonly DependencyProperty ScaleProperty = DependencyProperty.Register(
+            "Scale", typeof(double), typeof(Magnifier), new PropertyMetadata(5.0, OnScaleChanged), ValidateHelper.IsInRangeOfPosDouble);
+
+        private static void OnScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((Magnifier)d).UpdateViewboxSize();
+
+        public double Scale
+        {
+            get => (double)GetValue(ScaleProperty);
+            set => SetValue(ScaleProperty, value);
+        }
+
+        public Magnifier()
+        {
+            _translateTransform = new TranslateTransform();
+            RenderTransform = _translateTransform;
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            var visualBrush = GetTemplateChild(ElementVisualBrush) as VisualBrush ?? new VisualBrush();
+            visualBrush.Viewbox = _visualBrush.Viewbox;
+            _visualBrush = visualBrush;
+        }
+
+        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+        {
+            base.OnRenderSizeChanged(sizeInfo);
+            UpdateViewboxSize();
+        }
+
+        private void UpdateViewboxSize() => _viewboxSize = new Size(ActualWidth / Scale, ActualHeight / Scale);
+
+        private void UpdateTarget(UIElement element , bool isNew)
+        {
+            if (element == null) return;
+
+            if (!isNew)
+            {
+                element.MouseEnter -= Element_MouseEnter;
+                element.MouseLeave -= Element_MouseLeave;
+                element.MouseMove -= Element_MouseMove;
+                _elementTarget = null;
+            }
+            else
+            {
+                element.MouseEnter += Element_MouseEnter;
+                element.MouseLeave += Element_MouseLeave;
+                element.MouseMove += Element_MouseMove;
+                _elementTarget = element;
+            }
+        }
+
+        private void UpdateLocation()
+        {
+            var targetPoint = Mouse.GetPosition(Target);
+            var subX = targetPoint.X - _visualBrush.Viewbox.Width / 2;
+            var subY = targetPoint.Y - _visualBrush.Viewbox.Height / 2;
+
+            var targetVector = VisualTreeHelper.GetOffset(Target);
+            _visualBrush.Viewbox = new Rect(new Point(subX + targetVector.X, subY + targetVector.Y), _viewboxSize);
+
+            var adornerPoint = Mouse.GetPosition(_adorner);
+            _translateTransform.X = adornerPoint.X + HorizontalOffset;
+            _translateTransform.Y = adornerPoint.Y + VerticalOffset;
+        }
+
+        private void Element_MouseMove(object sender, MouseEventArgs e) => UpdateLocation();
+
+        private void Element_MouseLeave(object sender, MouseEventArgs e)
+        {
+            var layer = AdornerLayer.GetAdornerLayer(Target);
+            if (layer == null) return;
+            layer.Remove(_adorner);
+            _adorner.Child = null;
+            _adorner = null;
+        }
+
+        private void Element_MouseEnter(object sender, MouseEventArgs e)
+        {
+            if (_adorner == null)
+            {
+                var layer = AdornerLayer.GetAdornerLayer(Target);
+                if (layer == null) return;
+                _adorner = new AdornerContainer(layer)
+                {
+                    Child = this
+                };
+                layer.Add(_adorner);
+            }
+            this.Show();
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs

@@ -72,6 +72,7 @@ namespace HandyControl.Controls
             CommandBindings.Add(new CommandBinding(ControlCommands.Prev, ButtonPrev_OnClick));
             CommandBindings.Add(new CommandBinding(ControlCommands.Next, ButtonNext_OnClick));
             CommandBindings.Add(new CommandBinding(ControlCommands.Selected, ToggleButton_OnChecked));
+            this.Show(MaxPageCount > 1);
         }
 
         #region Public Properties

src/Shared/HandyControl_Shared/Controls/Other/ToggleBlock.cs

@@ -0,0 +1,62 @@
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    /// <summary>
+    ///     切换块
+    /// </summary>
+    /// <remarks>
+    ///     在不需要命中测试的情况下可代替ToggleButton或CheckBox，以减少内存用量。
+    /// </remarks>
+    public class ToggleBlock : Control
+    {
+        public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(
+            "IsChecked", typeof(bool?), typeof(ToggleBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox,
+                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal));
+
+        [Category("Appearance")]
+        [TypeConverter(typeof(NullableBoolConverter))]
+        [Localizability(LocalizationCategory.None, Readability = Readability.Unreadable)]
+        public bool? IsChecked
+        {
+            get
+            {
+                // Because Nullable<bool> unboxing is very slow (uses reflection) first we cast to bool
+                var value = GetValue(IsCheckedProperty);
+                // ReSharper disable once RedundantExplicitNullableCreation
+                return value == null ? new bool?() : new bool?((bool)value);
+            }
+            set => SetValue(IsCheckedProperty, value.HasValue ? ValueBoxes.BooleanBox(value.Value) : null);
+        }
+
+        public static readonly DependencyProperty CheckedContentProperty = DependencyProperty.Register(
+            "CheckedContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+
+        public object CheckedContent
+        {
+            get => GetValue(CheckedContentProperty);
+            set => SetValue(CheckedContentProperty, value);
+        }
+
+        public static readonly DependencyProperty UnCheckedContentProperty = DependencyProperty.Register(
+            "UnCheckedContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+
+        public object UnCheckedContent
+        {
+            get => GetValue(UnCheckedContentProperty);
+            set => SetValue(UnCheckedContentProperty, value);
+        }
+
+        public static readonly DependencyProperty IndeterminateContentProperty = DependencyProperty.Register(
+            "IndeterminateContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+
+        public object IndeterminateContent
+        {
+            get => GetValue(IndeterminateContentProperty);
+            set => SetValue(IndeterminateContentProperty, value);
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs

@@ -15,6 +15,7 @@ namespace HandyControl.Controls
     [TemplatePart(Name = OverflowScrollviewer, Type = typeof(ScrollViewer))]
     [TemplatePart(Name = ScrollButtonLeft, Type = typeof(Button))]
     [TemplatePart(Name = ScrollButtonRight, Type = typeof(Button))]
+    [TemplatePart(Name = HeaderBorder, Type = typeof(Border))]
     public class TabControl : System.Windows.Controls.TabControl
     {
         private const string OverflowButtonKey = "PART_OverflowButton";
@@ -27,6 +28,8 @@ namespace HandyControl.Controls
 
         private const string ScrollButtonRight = "PART_ScrollButtonRight";
 
+        private const string HeaderBorder = "PART_HeaderBorder";
+
         private ContextMenuToggleButton _buttonOverflow;
 
         private TabPanel _headerPanel;
@@ -37,6 +40,8 @@ namespace HandyControl.Controls
 
         private Button _buttonScrollRight;
 
+        private Border _headerBorder;
+
         /// <summary>
         ///     是否为内部操作
         /// </summary>
@@ -220,6 +225,9 @@ namespace HandyControl.Controls
                     item.TabPanel = _headerPanel;
                 }
             }
+
+            _headerBorder?.InvalidateMeasure();
+
             IsInternalAction = false;
         }
 
@@ -248,6 +256,7 @@ namespace HandyControl.Controls
             _scrollViewerOverflow = GetTemplateChild(OverflowScrollviewer) as ScrollViewer;
             _buttonScrollLeft = GetTemplateChild(ScrollButtonLeft) as Button;
             _buttonScrollRight = GetTemplateChild(ScrollButtonRight) as Button;
+            _headerBorder = GetTemplateChild(HeaderBorder) as Border;
 
             if (_buttonScrollLeft != null) _buttonScrollLeft.Click += ButtonScrollLeft_Click;
             if (_buttonScrollRight != null) _buttonScrollRight.Click += ButtonScrollRight_Click;

src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs

@@ -400,6 +400,7 @@ namespace HandyControl.Controls
 
         private void TimeBar_OnSizeChanged(object sender, SizeChangedEventArgs e)
         {
+            if (_canvasSpe == null) return;
             _speBlockList.Clear();
             _canvasSpe.Children.Clear();
 
@@ -442,7 +443,7 @@ namespace HandyControl.Controls
         {
             var p = Mouse.GetPosition(this);
             var mlliseconds = (p.X - ActualWidth / 2) / _itemWidth * _timeSpeList[_speIndex];
-            if (double.IsInfinity(mlliseconds)) return;
+            if (double.IsNaN(mlliseconds) || double.IsInfinity(mlliseconds)) return;
             _textBlockMove.Text = mlliseconds < 0
                 ? (SelectedTime - TimeSpan.FromMilliseconds(-mlliseconds)).ToString(TimeFormat)
                 : (SelectedTime + TimeSpan.FromMilliseconds(mlliseconds)).ToString(TimeFormat);

src/Shared/HandyControl_Shared/Controls/Window/Window.cs

@@ -70,7 +70,7 @@ namespace HandyControl.Controls
             new PropertyMetadata(ValueBoxes.TrueBox, OnShowNonClientAreaChanged));
 
         public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
-            "ShowTitle", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.FalseBox));
+            "ShowTitle", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.TrueBox));
 
         public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
             "IsFullScreen", typeof(bool), typeof(Window),
@@ -94,11 +94,20 @@ namespace HandyControl.Controls
 
         public Window()
         {
+#if netle40
             var chrome = new WindowChrome
             {
                 CornerRadius = new CornerRadius(),
                 GlassFrameThickness = new Thickness(0, 0, 0, 1)
             };
+#else
+            var chrome = new WindowChrome
+            {
+                CornerRadius = new CornerRadius(),
+                GlassFrameThickness = new Thickness(0, 0, 0, 1),
+                UseAeroCaptionButtons = false
+            };
+#endif
             BindingOperations.SetBinding(chrome, WindowChrome.CaptionHeightProperty,
                 new Binding(NonClientAreaHeightProperty.Name) {Source = this});
             WindowChrome.SetWindowChrome(this, chrome);

src/Shared/HandyControl_Shared/Data/ResourceToken.cs

@@ -52,6 +52,30 @@
 
         internal const string RadioGroupItemVerticalLast = nameof(RadioGroupItemVerticalLast);
 
+        internal const string ButtonGroupItemDefault = nameof(ButtonGroupItemDefault);
+
+        internal const string ButtonGroupItemSingle = nameof(ButtonGroupItemSingle);
+
+        internal const string ButtonGroupItemHorizontalFirst = nameof(ButtonGroupItemHorizontalFirst);
+
+        internal const string ButtonGroupItemHorizontalLast = nameof(ButtonGroupItemHorizontalLast);
+
+        internal const string ButtonGroupItemVerticalFirst = nameof(ButtonGroupItemVerticalFirst);
+
+        internal const string ButtonGroupItemVerticalLast = nameof(ButtonGroupItemVerticalLast);
+
+        internal const string ToggleButtonGroupItemDefault = nameof(ToggleButtonGroupItemDefault);
+
+        internal const string ToggleButtonGroupItemSingle = nameof(ToggleButtonGroupItemSingle);
+
+        internal const string ToggleButtonGroupItemHorizontalFirst = nameof(ToggleButtonGroupItemHorizontalFirst);
+
+        internal const string ToggleButtonGroupItemHorizontalLast = nameof(ToggleButtonGroupItemHorizontalLast);
+
+        internal const string ToggleButtonGroupItemVerticalFirst = nameof(ToggleButtonGroupItemVerticalFirst);
+
+        internal const string ToggleButtonGroupItemVerticalLast = nameof(ToggleButtonGroupItemVerticalLast);
+
         internal const string TabItemCapsuleDefault = nameof(TabItemCapsuleDefault);
 
         internal const string TabItemCapsuleSingle = nameof(TabItemCapsuleSingle);

src/Shared/HandyControl_Shared/HandyControl_Shared.projitems

@@ -18,13 +18,22 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\InfoElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\PanelElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\PasswordBoxAttach.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\RectangleAttach.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Image\ImageBlock.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Magnifier.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\ButtonGroup.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Card.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\ToggleBlock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\RangeTrack.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\RangeThumb.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\TwoWayRangeBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\OpenLinkCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\NameReferenceConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\BorderCircularClipConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Number2PercentageConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\RectangleCircularConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\FrameworkElementExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\StringExtension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\ValueExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\GlobalShortcut.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\StatusSwitchElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\TipElement.cs" />
@@ -77,7 +86,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Growl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\NotifyIcon.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Pagination.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\RadioGroup.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\ScrollViewer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Shield.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\TransitioningContentControl.cs" />
@@ -102,8 +110,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TabControl\TabItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TabControl\TabPanel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\OutlineText.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\Tag\Tag.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\Tag\TagPanel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Tag\Tag.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Tag\TagPanel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Time\CalendarWithClock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Time\Clock\Clock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Time\Clock\ListClock.cs" />
@@ -250,6 +258,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\ConfigHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\CreateParams.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\DesignerHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\DpiHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\ExternDllHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\IconHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\ResourceHelper.cs" />
@@ -280,7 +289,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Queue\Deque!1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\RegularJudgment.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\RegularPatterns.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\StyleSelector\RadioGroupItemStyleSelector.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\StyleSelector\ButtonGroupItemStyleSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\StyleSelector\TabItemCapsuleStyleSelector.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -344,18 +353,46 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\CardBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\ColorPickerBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\MenuBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\ExpanderBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\MagnifierBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\SliderBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\ToggleBlockBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Card.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Col.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Menu.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\GridSplitter.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -468,7 +505,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\RadioGroupBaseStyle.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\ButtonGroupBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -636,6 +673,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Magnifier.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\NumericUpDown.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -664,7 +705,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\RadioGroup.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\ButtonGroup.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -672,6 +713,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Rectangle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\RepeatButton.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -736,6 +781,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\ToggleBlock.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\ToggleButton.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

src/Shared/HandyControl_Shared/HandyControl_Shared.shproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
     <ProjectGuid>aac11083-faca-405d-9197-5c1212d65656</ProjectGuid>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>

src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs

@@ -17,6 +17,13 @@ namespace HandyControl.Interactivity
             get => _child;
             set
             {
+                if (value == null)
+                {
+                    RemoveVisualChild(_child);
+                    // ReSharper disable once ExpressionIsAlwaysNull
+                    _child = value;
+                    return;
+                }
                 AddVisualChild(value);
                 _child = value;
             }

src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs

@@ -12,7 +12,19 @@ namespace HandyControl.Interactivity
         {
             if (parameter is string link)
             {
-                Process.Start(link);
+                link = link.Replace("&", "^&");
+                try
+                {
+                    Process.Start(new ProcessStartInfo("cmd", $"/c start {link}")
+                    {
+                        UseShellExecute = false,
+                        CreateNoWindow = true
+                    });
+                }
+                catch
+                {
+                    // ignored
+                }
             }
         }
 

src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyVersion("2.1.0")]
 #endif
 
 [assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Controls")]

src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml

@@ -15,7 +15,10 @@
     <converter:Boolean2StrConverter x:Key="Boolean2StrConverter"/>
     <converter:Int2StrConverter x:Key="Int2StrConverter"/>
     <converter:BorderClipConverter x:Key="BorderClipConverter"/>
+    <converter:BorderCircularClipConverter x:Key="BorderCircularClipConverter"/>
     <converter:BorderCircularConverter x:Key="BorderCircularConverter"/>
     <converter:Object2VisibilityConverter x:Key="Object2VisibilityConverter"/>
-
+    <converter:Number2PercentageConverter x:Key="Number2PercentageConverter"/>
+    <converter:RectangleCircularConverter x:Key="RectangleCircularConverter"/>
+    <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml

@@ -21,6 +21,7 @@
     <Geometry x:Key="SearchGeometry">M716.6003 213.800623c-138.851102-138.915088-364.020238-138.915088-502.935326 0s-138.915088 364.084225 0 502.935326a355.573996 355.573996 0 0 0 502.935326 0 355.573996 355.573996 0 0 0 0-502.935326z m-580.359212 580.359212a465.183184 465.183184 0 1 1 657.783099 0 465.183184 465.183184 0 0 1-657.783099 0z m868.939152 211.156054a63.474789 63.474789 0 0 1-89.837303 0l-89.773316-89.837303a63.410803 63.410803 0 1 1 89.773316-89.773316l89.837303 89.773316a63.346816 63.346816 0 0 1 0 89.837303z</Geometry>
     <Geometry x:Key="UpDownGeometry">M454.464 143.68l-253.44 253.44c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l237.376-237.376 237.376 237.376c11.968 11.968 31.36 11.968 43.328 0 12.032-12.032 12.032-31.36 0-43.392l-253.44-253.44C491.264 126.016 478.016 124.032 454.464 143.68zM507.968 947.648l252.48-253.376c11.968-11.968 11.968-31.36 0-43.392-11.968-11.968-31.296-11.968-43.264 0l-236.48 237.376L244.16 650.88c-11.968-11.968-31.296-11.968-43.264 0-11.968 12.032-11.968 31.424 0 43.392l252.48 253.376C465.984 960 491.136 964.48 507.968 947.648z</Geometry>
     <Geometry x:Key="WindowMinGeometry">M0,4 L10,4 L10,5 L0,5 z</Geometry>
+    <Geometry x:Key="CheckedGeometry">M 0,2 3,5 8,0</Geometry>
     <Geometry x:Key="EyeOpenGeometry">M928 406.4c-100.8-137.6-249.6-224-416-224s-315.2 86.4-416 224c-44.8 60.8-44.8 150.4 0 211.2 102.4 137.6 251.2 224 416 224 166.4 0 315.2-86.4 416-224 46.4-60.8 46.4-150.4 0-211.2zM512 721.6c-115.2 0-209.6-94.4-209.6-209.6 0-115.2 94.4-209.6 209.6-209.6 115.2 0 209.6 94.4 209.6 209.6 1.6 115.2-92.8 209.6-209.6 209.6z m0-360c-83.2 0-150.4 67.2-150.4 150.4s67.2 150.4 150.4 150.4 150.4-67.2 150.4-150.4-67.2-150.4-150.4-150.4z m0 0</Geometry>
     <Geometry x:Key="EyeCloseGeometry">M950.4 361.6c8-20.8 0-43.2-19.2-54.4-9.6-4.8-20.8-6.4-32-3.2s-19.2 11.2-24 22.4c-56 132.8-208 228.8-361.6 228.8-155.2 0-307.2-97.6-363.2-232-4.8-11.2-12.8-19.2-24-24-9.6-4.8-20.8-3.2-32 0-20.8 9.6-30.4 35.2-20.8 56 25.6 60.8 67.2 118.4 123.2 164.8l-67.2 70.4c-14.4 16-14.4 40 0 57.6 8 8 17.6 14.4 28.8 14.4s22.4-3.2 30.4-11.2l76.8-81.6c35.2 20.8 73.6 38.4 113.6 49.6l-28.8 83.2c-8 22.4 3.2 46.4 24 54.4 4.8 1.6 9.6 3.2 14.4 3.2 6.4 0 11.2-1.6 17.6-3.2 9.6-4.8 17.6-12.8 22.4-24l33.6-96c41.6 4.8 81.6 3.2 123.2-3.2l32 94.4c3.2 11.2 11.2 19.2 22.4 24 9.6 4.8 20.8 4.8 32 1.6 20.8-8 32-32 24-54.4l-28.8-84.8c30.4-9.6 59.2-22.4 86.4-38.4l62.4 65.6c14.4 16 43.2 16 57.6 0 16-16 16-43.2 0-60.8l-51.2-54.4c56-43.2 100.8-100.8 128-164.8z</Geometry>
     <Geometry x:Key="WindowRestoreGeometry">M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z</Geometry>

src/Shared/HandyControl_Shared/Themes/Basic/Sizes.xaml

@@ -3,7 +3,7 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:Double x:Key="DefaultControlHeight">30</system:Double>
-    <Thickness x:Key="DefaultControlPadding">12,6</Thickness>
+    <Thickness x:Key="DefaultControlPadding">10,6</Thickness>
     <Thickness x:Key="DefaultInputPadding">8,6</Thickness>
     <CornerRadius x:Key="DefaultCornerRadius">4</CornerRadius>
 

src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml

@@ -3,13 +3,14 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../../Basic/Fonts.xaml"/>
+        <ResourceDictionary Source="../Rectangle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="FocusVisual">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Rectangle Margin="-2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4"/>
+                    <Rectangle Style="{StaticResource RectangleFocusVisual}" RadiusX="4" RadiusY="4"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -19,7 +20,7 @@
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Rectangle Margin="-2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1"/>
+                    <Rectangle Style="{StaticResource RectangleFocusVisual}"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml

@@ -8,7 +8,7 @@
 
     <Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -46,4 +46,45 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="ButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="0"/>
+        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Padding" Value="10,0"/>
+        <Setter Property="Margin" Value="-1,0,0,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                        <ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value="0.4"/>
+            </Trigger>
+            <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=controls:ButtonGroup}}" Value="Vertical">
+                <Setter Property="Margin" Value="0,-1,0,0"/>
+            </DataTrigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonGroupBaseStyle.xaml

@@ -2,24 +2,25 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
-    <ItemsPanelTemplate x:Key="RadioGroupHorizontalItemsPanelTemplate">
+    <ItemsPanelTemplate x:Key="ButtonGroupHorizontalItemsPanelTemplate">
         <UniformGrid FocusVisualStyle="{x:Null}" Rows="1"/>
     </ItemsPanelTemplate>
 
-    <ItemsPanelTemplate x:Key="RadioGroupVerticalItemsPanelTemplate">
+    <ItemsPanelTemplate x:Key="ButtonGroupVerticalItemsPanelTemplate">
         <UniformGrid FocusVisualStyle="{x:Null}" Columns="1"/>
     </ItemsPanelTemplate>
 
-    <Style x:Key="RadioGroupBaseStyle" TargetType="controls:RadioGroup">
+    <Style x:Key="ButtonGroupBaseStyle" TargetType="controls:ButtonGroup">
+        <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Focusable" Value="False"/>
-        <Setter Property="ItemsPanel" Value="{StaticResource RadioGroupHorizontalItemsPanelTemplate}"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalItemsPanelTemplate}"/>
         <Setter Property="controls:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="controls:TitleElement.Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="controls:TitleElement.Foreground" Value="{DynamicResource PrimaryBrush}"/>
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="ItemsPanel" Value="{StaticResource RadioGroupVerticalItemsPanelTemplate}"/>
+                <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalItemsPanelTemplate}"/>
             </Trigger>
         </Style.Triggers>
     </Style>

src/Shared/HandyControl_Shared/Themes/Styles/Base/CardBaseStyle.xaml

@@ -0,0 +1,41 @@
+<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="BaseStyle.xaml"/>
+        <ResourceDictionary Source="../../Basic/Converters.xaml"/>
+        <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="CardBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="controls:Card">
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:Card">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Border BorderThickness="0,0,0,1" Visibility="{TemplateBinding Header, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
+                                <ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}"/>
+                            </Border>
+                            <ContentPresenter Grid.Row="1"/>
+                            <Border Grid.Row="2" BorderThickness="0,1,0,0"  Visibility="{TemplateBinding Footer, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
+                                <ContentPresenter ContentSource="Footer" ContentTemplate="{TemplateBinding FooterTemplate}" ContentTemplateSelector="{TemplateBinding FooterTemplateSelector}" ContentStringFormat="{TemplateBinding FooterStringFormat}"/>
+                            </Border>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml

@@ -4,6 +4,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="BaseStyle.xaml"/>
+        <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="CheckBoxBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CheckBox">
@@ -49,7 +50,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Height="18" Width="18" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
                         <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"/>
+                            <Path UseLayoutRounding="True" x:Name="path" StrokeDashOffset="8" StrokeDashArray="8,8" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}"/>
                             <Rectangle x:Name="indeterminateMark" RadiusX="2" RadiusY="2" Fill="{DynamicResource PrimaryBrush}" Margin="2" Opacity="0"/>
                         </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}"/>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ContextMenuBaseStyle.xaml

@@ -1,236 +1,20 @@
 <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:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="../ScrollViewer.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <!--普通菜单项-->
-    <Style x:Key="MenuItemBaseStyle" TargetType="MenuItem">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="controls:ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="MenuItem">
-                    <Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" Uid="Border_38">
-                        <Grid x:Name="Grid" Uid="Grid_49">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="26"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="30"/>
-                                <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto"/>
-                                <ColumnDefinition Width="20"/>
-                            </Grid.ColumnDefinitions>
-                            <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
-                            <Border Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
-                                <Path x:Name="Glyph" Margin="2" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="F1 M 9.97498,1.22334L 4.6983,9.09834L 4.52164,9.09834L 0,5.19331L 1.27664,3.52165L 4.255,6.08833L 8.33331,1.52588e-005L 9.97498,1.22334 Z " Fill="White" FlowDirection="LeftToRight"/>
-                            </Border>
-                            <ContentPresenter Grid.Column="1" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentSource="Header" Margin="10" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Uid="ContentPresenter_33"/>
-                            <TextBlock x:Name="InputGestureText" Margin="0,0,10,0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{TemplateBinding InputGestureText}" Uid="TextBlock_10"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="Role" Value="TopLevelHeader">
-                <Setter Property="Margin" Value="0"/>
-                <Setter Property="Padding" Value="10,0"/>
-                <Setter Property="Height" Value="29"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="MenuItem">
-                            <Border MinWidth="44" Height="{TemplateBinding Height}" x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                                <Grid VerticalAlignment="Center">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <ContentPresenter x:Name="Icon" Visibility="Collapsed" Content="{TemplateBinding Icon}" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
-                                    <Border Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
-                                        <Path x:Name="Glyph" Margin="2" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="F1 M 9.97498,1.22334L 4.6983,9.09834L 4.52164,9.09834L 0,5.19331L 1.27664,3.52165L 4.255,6.08833L 8.33331,1.52588e-005L 9.97498,1.22334 Z " Fill="White" FlowDirection="LeftToRight"/>
-                                    </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">
-                                        <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}"/>
-                                        </controls:SimplePanel>
-                                    </Popup>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsSuspendingPopupAnimation" Value="True">
-                                    <Setter Property="PopupAnimation" TargetName="PART_Popup" Value="None"/>
-                                </Trigger>
-                                <Trigger Property="Icon" Value="{x:Null}">
-                                    <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
-                                </Trigger>
-                                <Trigger Property="IsChecked" Value="True">
-                                    <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
-                                    <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
-                                </Trigger>
-                                <Trigger Property="IsHighlighted" Value="True">
-                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource DarkDefaultBrush}"/>
-                                    <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
-                                </Trigger>
-                                <Trigger Property="IsSubmenuOpen" Value="True">
-                                    <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource BorderBrush}"/>
-                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource RegionBrush}"/>
-                                    <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-            <Trigger Property="Role" Value="TopLevelItem">
-                <Setter Property="Margin" Value="0"/>
-                <Setter Property="Padding" Value="10,0"/>
-                <Setter Property="Height" Value="29"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="MenuItem">
-                            <Border Padding="{TemplateBinding Padding}" x:Name="templateRoot" Height="{TemplateBinding Height}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition/>
-                                    </Grid.ColumnDefinitions>
-                                    <ContentPresenter x:Name="Icon" Visibility="Collapsed" HorizontalAlignment="Left" Content="{TemplateBinding Icon}" ContentSource="Icon" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
-                                    <Border Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
-                                        <Path x:Name="Glyph" Margin="2" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="F1 M 9.97498,1.22334L 4.6983,9.09834L 4.52164,9.09834L 0,5.19331L 1.27664,3.52165L 4.255,6.08833L 8.33331,1.52588e-005L 9.97498,1.22334 Z " Fill="White" FlowDirection="LeftToRight"/>
-                                    </Border>
-                                    <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" HorizontalAlignment="Left" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="Icon" Value="{x:Null}">
-                                    <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
-                                </Trigger>
-                                <Trigger Property="IsChecked" Value="True">
-                                    <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
-                                    <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
-                                </Trigger>
-                                <Trigger Property="IsHighlighted" Value="True">
-                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource DarkDefaultBrush}"/>
-                                    <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
-                                </Trigger>
-                                <Trigger Property="IsSubmenuOpen" Value="True">
-                                    <Setter Property="Background" TargetName="templateRoot" Value="White"/>
-                                    <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
-                                </Trigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsHighlighted" Value="True"/>
-                                        <Condition Property="IsEnabled" Value="False"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter Property="Background" TargetName="templateRoot" Value="#0A000000"/>
-                                    <Setter Property="BorderBrush" TargetName="templateRoot" Value="#21000000"/>
-                                </MultiTrigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-            <Trigger Property="Role" Value="SubmenuHeader">
-                <Setter Property="DockPanel.Dock" Value="Top"/>
-                <Setter Property="Padding" Value="0"/>
-                <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="MenuItem">
-                            <Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" Uid="Border_42">
-                                <Grid x:Name="Grid" Uid="Grid_50">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="26"/>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="30"/>
-                                        <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto"/>
-                                        <ColumnDefinition Width="20"/>
-                                    </Grid.ColumnDefinitions>
-                                    <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
-                                    <Border Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
-                                        <Path x:Name="Glyph" Margin="2" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="F1 M 9.97498,1.22334L 4.6983,9.09834L 4.52164,9.09834L 0,5.19331L 1.27664,3.52165L 4.255,6.08833L 8.33331,1.52588e-005L 9.97498,1.22334 Z " Fill="White" FlowDirection="LeftToRight"/>
-                                    </Border>
-                                    <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}"  x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Grid.Column="1" ContentSource="Header" Margin="10" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Uid="ContentPresenter_39"/>
-                                    <Path x:Name="Path" Grid.Column="4" Width="10" Height="10" HorizontalAlignment="Left" Data="{StaticResource RightGeometry}" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Uid="Path_16" VerticalAlignment="Center"/>
-                                    <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Right" VerticalOffset="-7">
-                                        <Border CornerRadius="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>
-                                    </Popup>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsChecked" Value="True">
-                                    <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-            <Trigger Property="IsHighlighted" Value="True">
-                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Opacity" Value=".4"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <!--普通菜单-->
     <Style x:Key="ContextMenuBaseStyle" TargetType="ContextMenu">
-        <Setter Property="MaxHeight" Value="199"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ContextMenu">
                     <Border Background="{TemplateBinding Background}" CornerRadius="2" MaxHeight="{TemplateBinding MaxHeight}" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-                        <controls:ScrollViewer  Margin="0,6" VerticalScrollBarVisibility="Auto">
+                        <ScrollViewer Style="{StaticResource ScrollViewerUpDown}"  Margin="0,6">
                             <ItemsPresenter/>
-                        </controls:ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="MenuBaseStyle" TargetType="Menu">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="FontSize" Value="12"/>
-        <Setter Property="FontStyle" Value="Normal"/>
-        <Setter Property="FontWeight" Value="Normal"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource MenuItemBaseStyle}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Menu">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </ScrollViewer>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>

src/Shared/HandyControl_Shared/Themes/Styles/Base/DatePickerBaseStyle.xaml

@@ -34,7 +34,7 @@
         <Setter Property="SelectedDateFormat" Value="Short"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>

src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml

@@ -16,7 +16,7 @@
         <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Template">

src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml

@@ -0,0 +1,54 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="../ToggleButton.xaml"/>
+        <ResourceDictionary Source="../ToggleBlock.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="ExpanderBaseStyle" TargetType="Expander">
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource TitleBrush}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Expander">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" Grid.ColumnSpan="2" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="32"/>
+                                    </Grid.ColumnDefinitions>
+                                    <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right"/>
+                                </Grid>
+                            </ToggleButton>
+                            <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="1" Grid.Column="0"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="true">
+                            <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
+                            <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Opacity" Value="2"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/GotoTopBaseStyle.xaml

@@ -5,6 +5,7 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
         <ResourceDictionary Source="../Button.xaml"/>
+        <ResourceDictionary Source="../Rectangle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="GotoTopBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="controls:GotoTop">
@@ -21,7 +22,7 @@
                     <Setter Property="Control.Template">
                         <Setter.Value>
                             <ControlTemplate>
-                                <Rectangle Margin="-2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="25" RadiusY="25"/>
+                                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}"/>
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>

src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml

@@ -2,12 +2,16 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
     <Style x:Key="GravatarBaseStyle" TargetType="controls:Gravatar">
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="Width" Value="72"/>
         <Setter Property="Height" Value="72"/>
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Padding" Value="6"/>
         <Setter Property="Template">
             <Setter.Value>

src/Shared/HandyControl_Shared/Themes/Styles/Base/GroupBoxBaseStyle.xaml

@@ -2,6 +2,11 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
+        <ResourceDictionary Source="../../Basic/Converters.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
     <ControlTemplate x:Key="GroupBoxBaseTopTemplate" TargetType="GroupBox">
         <Grid>
             <Grid.RowDefinitions>
@@ -44,7 +49,7 @@
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
         <Setter Property="controls:TitleElement.Background" Value="{DynamicResource TitleBrush}"/>
         <Setter Property="controls:TitleElement.TitleAlignment" Value="Top"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="BorderThickness" Value="0"/>
@@ -63,7 +68,10 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="8,0,8,4" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+            <StackPanel Orientation="Horizontal" Margin="8,6">
+                <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="1,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
+            </StackPanel>
             <Border Grid.Row="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
                 <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
             </Border>
@@ -76,7 +84,10 @@
                 <ColumnDefinition Width="{Binding Path=(controls:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <ContentPresenter Margin="0,7,6,8" TextElement.Foreground="{TemplateBinding Foreground}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,8,6,8">
+                <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
+            </StackPanel>
             <Border Grid.Column="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
                 <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
             </Border>

src/Shared/HandyControl_Shared/Themes/Styles/Base/LabelBaseStyle.xaml

@@ -10,7 +10,7 @@
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>

src/Shared/HandyControl_Shared/Themes/Styles/Base/MagnifierBaseStyle.xaml

@@ -0,0 +1,33 @@
+<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="../Border.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="MagnifierBaseStyle" TargetType="controls:Magnifier">
+        <Setter Property="IsHitTestVisible" Value="False" />
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Width" Value="180"/>
+        <Setter Property="Height" Value="180"/>
+        <Setter Property="BorderThickness" Value="8"/>
+        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:Magnifier">
+                    <Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+                        <Ellipse>
+                            <Ellipse.Fill>
+                                <VisualBrush Visual="{Binding Target,RelativeSource={RelativeSource TemplatedParent}}" ViewboxUnits="Absolute" x:Name="PART_VisualBrush"/>
+                            </Ellipse.Fill>
+                        </Ellipse>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml

@@ -0,0 +1,215 @@
+<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/Geometries.xaml"/>
+        <ResourceDictionary Source="../ScrollViewer.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="MenuItemBaseStyle" TargetType="MenuItem">
+        <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="controls:ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuItem">
+                    <Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                        <Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="26"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="30"/>
+                                <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto"/>
+                                <ColumnDefinition Width="20"/>
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
+                            <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+                                <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}"/>
+                            </Border>
+                            <ContentPresenter Grid.Column="1" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentSource="Header" Margin="0,3" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            <TextBlock x:Name="InputGestureText" Margin="0,0,10,0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{TemplateBinding InputGestureText}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="Icon" Value="{x:Null}">
+                            <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Role" Value="TopLevelHeader">
+                <Setter Property="Margin" Value="0"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="MenuItem">
+                            <Border MinWidth="44" x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                                <Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <ContentPresenter Margin="0,0,10,0" x:Name="Icon" Visibility="Collapsed" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
+                                    <Border Margin="0,0,10,0" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
+                                        <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}"/>
+                                    </Border>
+                                    <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" 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}}" Placement="Bottom">
+                                        <controls:SimplePanel>
+                                            <Border CornerRadius="0,0,2,2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+                                                <ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
+                                                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle"/>
+                                                </ScrollViewer>
+                                            </Border>
+                                            <Border Height="1" Background="{DynamicResource RegionBrush}" VerticalAlignment="Top" BorderThickness="1,0" BorderBrush="{DynamicResource BorderBrush}" HorizontalAlignment="Left" Width="{Binding ActualWidth,ElementName=templateRoot}"/>
+                                        </controls:SimplePanel>
+                                    </Popup>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="Icon" Value="{x:Null}">
+                                    <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="True">
+                                    <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
+                                    <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
+                                </Trigger>
+                                <Trigger Property="IsHighlighted" Value="True">
+                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource DarkDefaultBrush}"/>
+                                    <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
+                                </Trigger>
+                                <Trigger Property="IsSubmenuOpen" Value="True">
+                                    <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource BorderBrush}"/>
+                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource RegionBrush}"/>
+                                    <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <Trigger Property="Role" Value="TopLevelItem">
+                <Setter Property="Margin" Value="0"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="MenuItem">
+                            <Border x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                                <Grid Margin="{TemplateBinding Padding}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <ContentPresenter Margin="0,0,10,0" x:Name="Icon" Visibility="Collapsed" HorizontalAlignment="Left" ContentSource="Icon" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
+                                    <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
+                                        <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}"/>
+                                    </Border>
+                                    <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" HorizontalAlignment="Left" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="Icon" Value="{x:Null}">
+                                    <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="True">
+                                    <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
+                                    <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
+                                </Trigger>
+                                <Trigger Property="IsHighlighted" Value="True">
+                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource DarkDefaultBrush}"/>
+                                    <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
+                                </Trigger>
+                                <Trigger Property="IsSubmenuOpen" Value="True">
+                                    <Setter Property="Background" TargetName="templateRoot" Value="White"/>
+                                    <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
+                                </Trigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="IsHighlighted" Value="True"/>
+                                        <Condition Property="IsEnabled" Value="False"/>
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="Background" TargetName="templateRoot" Value="#0A000000"/>
+                                    <Setter Property="BorderBrush" TargetName="templateRoot" Value="#21000000"/>
+                                </MultiTrigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <Trigger Property="Role" Value="SubmenuHeader">
+                <Setter Property="DockPanel.Dock" Value="Top"/>
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="MenuItem">
+                            <Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                                <Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="26"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="30"/>
+                                        <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto"/>
+                                        <ColumnDefinition Width="20"/>
+                                    </Grid.ColumnDefinitions>
+                                    <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
+                                    <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+                                        <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}"/>
+                                    </Border>
+                                    <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,3" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    <Path x:Name="Path" Grid.Column="4" Width="10" Height="10" HorizontalAlignment="Left" Data="{StaticResource RightGeometry}" Stretch="Uniform" Fill="{TemplateBinding Foreground}" VerticalAlignment="Center"/>
+                                    <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" VerticalOffset="-13" HorizontalOffset="10">
+                                        <Border CornerRadius="2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+                                            <ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
+                                                <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle"/>
+                                            </ScrollViewer>
+                                        </Border>
+                                    </Popup>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsChecked" Value="True">
+                                    <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <Trigger Property="IsHighlighted" Value="True">
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value=".4"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MenuBaseStyle" TargetType="Menu">
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="FontStyle" Value="Normal"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource MenuItemBaseStyle}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Menu">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml

@@ -21,7 +21,7 @@
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="AllowDrop" Value="true"/>
         <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>

src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml

@@ -24,7 +24,7 @@
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="AllowDrop" Value="true"/>
         <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -116,9 +116,8 @@
 
     <Style x:Key="PasswordBoxExtendBaseStyle" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
         <Setter Property="Height" Value="{x:Static system:Double.NaN}"/>
-        <Setter Property="Padding" Value="7,6"/>
         <Setter Property="controls:InfoElement.Symbol" Value="●"/>
-        <Setter Property="controls:InfoElement.ContentHeight" Value="30.0"/>
+        <Setter Property="controls:InfoElement.ContentHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="controls:PasswordBoxAttach.IsMonitoring" Value="True"/>
         <Setter Property="Template" Value="{StaticResource PasswordBoxExtendTopTemplate}"/>
         <Style.Triggers>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml

@@ -4,6 +4,7 @@
                     xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes">
 
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
         <ResourceDictionary Source="../../Basic/Converters.xaml"/>
         <ResourceDictionary Source="../Border.xaml"/>
     </ResourceDictionary.MergedDictionaries>
@@ -16,8 +17,16 @@
     </LinearGradientBrush>
 
     <Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
+        <Setter Property="controls:VisualElement.Text">
+            <Setter.Value>
+                <MultiBinding Converter="{StaticResource Number2PercentageConverter}" StringFormat="{}{0} %">
+                    <Binding Path="Value" RelativeSource="{RelativeSource Self}"/>
+                    <Binding Path="Maximum" RelativeSource="{RelativeSource Self}"/>
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Height" Value="20"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
@@ -33,7 +42,7 @@
                                     <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} %}"/>
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(controls:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}"/>
                         </controls:SimplePanel>
                     </controls:SimplePanel>
                 </ControlTemplate>
@@ -41,7 +50,12 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ProgressBarStripeBaseStyle" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+    <Style x:Key="ProgressBarStripeBaseStyle" TargetType="ProgressBar">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ProgressBar">
@@ -109,7 +123,7 @@
                     <StackPanel>
                         <Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
                             <Viewbox>
-                                <Border x:Name="PART_Clip" Style="{StaticResource BorderClip}" CornerRadius="100" Width="200" Height="200">
+                                <Border x:Name="PART_Clip" Style="{StaticResource BorderCircularClip}" CornerRadius="100" Width="200" Height="200">
                                     <Path x:Name="PART_Wave" Stroke="{TemplateBinding WaveStroke}" StrokeThickness="{TemplateBinding WaveThickness}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="600" Height="250" Fill="{TemplateBinding WaveFill}" Stretch="Fill" RenderTransformOrigin="0.5,0.5" UseLayoutRounding="False" Margin="0,0,-400,-20">
                                         <Path.Data>
                                             <PathGeometry>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressButtonBaseStyle.xaml

@@ -10,7 +10,7 @@
 
     <Style x:Key="ProgressBarFlat4ProgressButton" TargetType="ProgressBar">
         <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}"/>
         <Setter Property="Template">
             <Setter.Value>

src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml

@@ -196,9 +196,15 @@
             <Trigger Property="IsChecked" Value="True">
                 <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}"/>
             </Trigger>
-            <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=controls:RadioGroup}}" Value="Vertical">
+            <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=controls:ButtonGroup}}" Value="Vertical">
                 <Setter Property="Margin" Value="0,-1,0,0"/>
             </DataTrigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+            </Trigger>
         </Style.Triggers>
     </Style>
 

src/Shared/HandyControl_Shared/Themes/Styles/Base/RepeatButtonBaseStyle.xaml

@@ -8,7 +8,7 @@
 
     <Style x:Key="RepeatButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="RepeatButton">

src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml

@@ -158,6 +158,12 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Template" Value="{StaticResource ScrollViewerNativeBaseControlTemplate}"/>
+    </Style>
+
     <ControlTemplate x:Key="ScrollViewerBaseControlTemplate" TargetType="controls:ScrollViewer">
         <ControlTemplate.Resources>
             <Storyboard x:Key="Storyboard1">
@@ -199,12 +205,6 @@
             </EventTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-
-    <Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Template" Value="{StaticResource ScrollViewerNativeBaseControlTemplate}"/>
-    </Style>
     
     <Style x:Key="ScrollViewerBaseStyle" TargetType="controls:ScrollViewer">
         <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>

src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml

@@ -13,8 +13,8 @@
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="Margin" Value="0"/>
-        <Setter Property="Padding" Value="10,6"/>
-        <Setter Property="MinHeight" Value="30"/>
+        <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="VerticalContentAlignment" Value="Stretch"/>
         <Setter Property="Template">
@@ -139,7 +139,7 @@
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="controls:BorderElement.CornerRadius" Value="0"/>
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Padding" Value="10,0"/>
         <Setter Property="Margin" Value="-1,0,0,0"/>
         <Setter Property="Template">

src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml

@@ -7,25 +7,26 @@
         <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
         <ResourceDictionary Source="../../Basic/Converters.xaml"/>
         <ResourceDictionary Source="../Button.xaml"/>
+        <ResourceDictionary Source="../Border.xaml"/>
+        <ResourceDictionary Source="../Rectangle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="TagBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="controls:Tag">
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="15"/>
-        <Setter Property="Padding" Value="10,6"/>
+        <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Height" Value="30"/>
+        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="FocusVisualStyle">
             <Setter.Value>
                 <Style>
                     <Setter Property="Control.Template">
                         <Setter.Value>
                             <ControlTemplate>
-                                <Rectangle Margin="-2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="15" RadiusY="15"/>
+                                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}"/>
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>
@@ -35,7 +36,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Tag">
-                    <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                    <Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition/>
@@ -68,10 +69,9 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="AddTagButtonStyle" TargetType="Button" BasedOn="{StaticResource ButtonIcon}">
+    <Style x:Key="AddTagButtonStyle" TargetType="Button" BasedOn="{StaticResource ButtonIconCircular}">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="controls:IconElement.Geometry" Value="{StaticResource AddGeometry}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="15"/>
         <Setter Property="Padding" Value="10"/>
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
         <Setter Property="FocusVisualStyle">
@@ -80,7 +80,7 @@
                     <Setter Property="Control.Template">
                         <Setter.Value>
                             <ControlTemplate>
-                                <Rectangle Margin="-2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="15" RadiusY="15"/>
+                                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}"/>
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>

src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml

@@ -32,7 +32,7 @@
     </Style>
 
     <Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>

src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml

@@ -16,7 +16,7 @@
         <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Template">

src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleBlockBaseStyle.xaml

@@ -0,0 +1,35 @@
+<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="ToggleBlockBaseStyle" TargetType="controls:ToggleBlock">
+        <Setter Property="IsHitTestVisible" Value="False"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:ToggleBlock">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <controls:SimplePanel Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                            <ContentPresenter Name="ContentPresenterChecked" ContentSource="CheckedContent" Visibility="Collapsed"/>
+                            <ContentPresenter Name="ContentPresenterUnChecked" ContentSource="UnCheckedContent"/>
+                            <ContentPresenter Name="ContentPresenterIndeterminate" ContentSource="IndeterminateContent" Visibility="Collapsed"/>
+                        </controls:SimplePanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="False">
+                            <Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="{x:Null}">
+                            <Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml

@@ -1,14 +1,16 @@
 <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:controls="clr-namespace:HandyControl.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ButtonBaseBaseStyle.xaml"/>
+        <ResourceDictionary Source="../Rectangle.xaml"/>
         <ResourceDictionary Source="../../Basic/Effects.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="ToggleButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="ToggleButton">
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource DarkMaskBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -58,7 +60,7 @@
                     <Setter Property="Control.Template">
                         <Setter.Value>
                             <ControlTemplate>
-                                <Rectangle Margin="-2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="11" RadiusY="11"/>
+                                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}"/>
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>
@@ -129,31 +131,33 @@
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Border Height="22" Width="36" x:Name="backBorder" Background="{DynamicResource BorderBrush}" CornerRadius="11"/>
-                        <Border Grid.Column="0" Height="22" Width="36" Opacity="0" x:Name="lightBorder" Background="{DynamicResource PrimaryBrush}" CornerRadius="11" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
-                        <Border Grid.Column="0" Height="20" Margin="1" Background="{TemplateBinding Background}" CornerRadius="11" Name="innerBorder" RenderTransformOrigin=".8,0.5">
-                            <Border.RenderTransform>
-                                <TransformGroup>
-                                    <ScaleTransform/>
-                                </TransformGroup>
-                            </Border.RenderTransform>
-                        </Border>
-                        <controls:SimplePanel Grid.Column="0" Margin="1">
-                            <Border HorizontalAlignment="Left" CornerRadius="10" Name="thumb" Effect="{StaticResource EffectShadow2}" Background="White" Width="20" Height="20" RenderTransformOrigin="0.5,0.5">
+                    <Viewbox>
+                        <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Border Height="22" Width="36" x:Name="backBorder" Background="{DynamicResource BorderBrush}" CornerRadius="11"/>
+                            <Border Grid.Column="0" Height="22" Width="36" Opacity="0" x:Name="lightBorder" Background="{DynamicResource PrimaryBrush}" CornerRadius="11" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+                            <Border Grid.Column="0" Height="20" Margin="1" Background="{TemplateBinding Background}" CornerRadius="11" Name="innerBorder" RenderTransformOrigin=".8,0.5">
                                 <Border.RenderTransform>
                                     <TransformGroup>
-                                        <TranslateTransform/>
+                                        <ScaleTransform/>
                                     </TransformGroup>
                                 </Border.RenderTransform>
                             </Border>
-                        </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>
+                            <controls:SimplePanel Grid.Column="0" Margin="1">
+                                <Border HorizontalAlignment="Left" CornerRadius="10" Name="thumb" Effect="{StaticResource EffectShadow2}" Background="White" Width="20" Height="20" RenderTransformOrigin="0.5,0.5">
+                                    <Border.RenderTransform>
+                                        <TransformGroup>
+                                            <TranslateTransform/>
+                                        </TransformGroup>
+                                    </Border.RenderTransform>
+                                </Border>
+                            </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>
+                    </Viewbox>
                     <ControlTemplate.Triggers>
                         <Trigger Property="HasContent" Value="true">
                             <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible"/>
@@ -182,7 +186,7 @@
         <Setter Property="Padding" Value="8"/>
         <Setter Property="controls:IconSwitchElement.Geometry" Value="{x:Null}"/>
         <Setter Property="controls:IconSwitchElement.GeometrySelected" Value="{x:Null}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource DarkMaskBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
@@ -199,7 +203,7 @@
                     </controls:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(controls:IconSwitchElement.GeometrySelected)}"/>
+                            <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:IconSwitchElement.GeometrySelected)}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -218,4 +222,53 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="ToggleButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="0"/>
+        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Padding" Value="10,0"/>
+        <Setter Property="Margin" Value="-1,0,0,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                        <ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="BorderBrush" Value="{Binding Path=(controls:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot"/>
+                            <Setter Property="Background" Value="{Binding Path=(controls:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot"/>
+                            <Setter Property="TextElement.Foreground" Value="{Binding Path=(controls:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value="0.4"/>
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}"/>
+            </Trigger>
+            <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=controls:ButtonGroup}}" Value="Vertical">
+                <Setter Property="Margin" Value="0,-1,0,0"/>
+            </DataTrigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolBarBaseStyle.xaml

@@ -9,7 +9,7 @@
         <ResourceDictionary Source="../RadioButton.xaml"/>
         <ResourceDictionary Source="../ComboBox.xaml"/>
         <ResourceDictionary Source="../TextBox.xaml"/>
-        <ResourceDictionary Source="../ContextMenu.xaml"/>
+        <ResourceDictionary Source="../Menu.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="{x:Static ToolBar.SeparatorStyleKey}" TargetType="Separator">
@@ -130,7 +130,7 @@
 
     <Style x:Key="ToolBarBaseStyle" TargetType="ToolBar">
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Margin" Value="0,0,4,4"/>
         <Setter Property="Template">
             <Setter.Value>

src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml

@@ -86,7 +86,7 @@
     <Style x:Key="TransferBaseStyle" TargetType="controls:Transfer">
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}"/>
         <Setter Property="Template">

src/Shared/HandyControl_Shared/Themes/Styles/Border.xaml

@@ -30,7 +30,7 @@
         <Setter Property="controls:BorderElement.Circular" Value="True"/>
     </Style>
 
-    <Style x:Key="BorderClip" BasedOn="{StaticResource BorderCircular}" TargetType="Border">
+    <Style x:Key="BorderClip" TargetType="Border">
         <Setter Property="Clip">
             <Setter.Value>
                 <MultiBinding Converter="{StaticResource BorderClipConverter}">
@@ -42,4 +42,16 @@
         </Setter>
     </Style>
 
+    <Style x:Key="BorderCircularClip" BasedOn="{StaticResource BorderCircular}" TargetType="Border">
+        <Setter Property="Clip">
+            <Setter.Value>
+                <MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
+                    <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
+                    <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
+                    <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}"/>
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml

@@ -4,6 +4,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Base/ButtonBaseStyle.xaml"/>
+        <ResourceDictionary Source="Border.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
@@ -51,6 +52,20 @@
         </Setter>
     </Style>
 
+    <Style x:Key="ButtonIconCircular" BasedOn="{StaticResource ButtonIcon}" TargetType="Button">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                        <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                            <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding controls:IconElement.Width}" Height="{TemplateBinding controls:IconElement.Height}" Data="{TemplateBinding controls:IconElement.Geometry}"/>
+                        </ContentControl>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style x:Key="ButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{x:Null}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -81,4 +96,28 @@
         </Setter>
     </Style>
 
+    <Style x:Key="ButtonGroupItemDefault" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button"/>
+
+    <Style x:Key="ButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4,0,0,4"/>
+        <Setter Property="Margin" Value="0"/>
+    </Style>
+
+    <Style x:Key="ButtonGroupItemHorizontalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="0,4,4,0"/>
+    </Style>
+
+    <Style x:Key="ButtonGroupItemSingle" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+    </Style>
+
+    <Style x:Key="ButtonGroupItemVerticalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4,4,0,0"/>
+        <Setter Property="Margin" Value="0"/>
+    </Style>
+
+    <Style x:Key="ButtonGroupItemVerticalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="0,0,4,4"/>
+    </Style>
+
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/ButtonGroup.xaml

@@ -3,12 +3,12 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Base/RadioGroupBaseStyle.xaml"/>
+        <ResourceDictionary Source="Base/ButtonGroupBaseStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource RadioGroupBaseStyle}" TargetType="controls:RadioGroup"/>
+    <Style BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="controls:ButtonGroup"/>
 
-    <Style x:Key="RadioGroupSolid" BasedOn="{StaticResource RadioGroupBaseStyle}" TargetType="controls:RadioGroup">
+    <Style x:Key="ButtonGroupSolid" BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="controls:ButtonGroup">
         <Setter Property="controls:TitleElement.BorderBrush" Value="{DynamicResource TitleBrush}"/>
         <Setter Property="controls:TitleElement.Background" Value="{DynamicResource TitleBrush}"/>
         <Setter Property="controls:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}"/>

src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml

@@ -5,6 +5,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="Rectangle.xaml"/>
         <ResourceDictionary Source="Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
@@ -78,7 +79,7 @@
                     <Setter Property="Control.Template">
                         <Setter.Value>
                             <ControlTemplate>
-                                <Rectangle Margin="-2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="16" RadiusY="16"/>
+                                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}"/>
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>

src/Shared/HandyControl_Shared/Themes/Styles/Card.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/CardBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource CardBaseStyle}" TargetType="controls:Card"/>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/ContextMenu.xaml

@@ -4,12 +4,6 @@
         <ResourceDictionary Source="Base/ContextMenuBaseStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <!--默认普通菜单-->
     <Style BasedOn="{StaticResource ContextMenuBaseStyle}" TargetType="ContextMenu"/>
 
-    <!--默认普通菜单项-->
-    <Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem"/>
-
-    <Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu"/>
-
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Expander.xaml

@@ -1,54 +1,9 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:controls="clr-namespace:HandyControl.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
-        <ResourceDictionary Source="ToggleButton.xaml"/>
+        <ResourceDictionary Source="Base/ExpanderBaseStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style TargetType="Expander">
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="Background" Value="{DynamicResource TitleBrush}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="MinHeight" Value="32"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Expander">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            <ToggleButton Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" Grid.ColumnSpan="2" HorizontalContentAlignment="Stretch" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
-                                <ToggleButton.Content>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition/>
-                                            <ColumnDefinition Width="{TemplateBinding MinHeight}"/>
-                                        </Grid.ColumnDefinitions>
-                                        <ContentPresenter ContentSource="Header"/>
-                                        <ToggleButton Foreground="{TemplateBinding Foreground}" Grid.Column="1" Padding="0" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="Center" HorizontalAlignment="Right" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" controls:IconSwitchElement.Geometry="{StaticResource DownGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" Style="{StaticResource ToggleButtonIconTransparent}"/>
-                                    </Grid>
-                                </ToggleButton.Content>
-                            </ToggleButton>
-                            <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="1" Grid.Column="0"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="true">
-                            <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" Value="2"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+    <Style BasedOn="{StaticResource ExpanderBaseStyle}" TargetType="Expander"/>
 
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Gravatar.xaml

@@ -14,7 +14,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Gravatar">
-                    <Border Style="{StaticResource BorderClip}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                    <Border Style="{StaticResource BorderCircularClip}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
                         <ContentPresenter Margin="{TemplateBinding Padding}"/>
                     </Border>
                 </ControlTemplate>

src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml

@@ -26,13 +26,13 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ListBoxCustom" TargetType="ListBox">
+    <Style x:Key="ListBoxCustom" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
         <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemCustom}"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
     </Style>
 
     <ItemsPanelTemplate x:Key="WrapPanelHorizontalItemsPanelTemplate">
-        <WrapPanel FocusVisualStyle="{x:Null}"/>
+        <WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
     </ItemsPanelTemplate>
 
     <Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
@@ -40,7 +40,7 @@
     </Style>
 
     <ItemsPanelTemplate x:Key="WrapPanelVerticalItemsPanelTemplate">
-        <WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical"/>
+        <WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"/>
     </ItemsPanelTemplate>
 
     <Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">

src/Shared/HandyControl_Shared/Themes/Styles/Magnifier.xaml

@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/MagnifierBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource MagnifierBaseStyle}" TargetType="controls:Magnifier"/>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Menu.xaml

@@ -0,0 +1,11 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/MenuBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem"/>
+
+    <Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu"/>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/PopupWindow.xaml

@@ -40,7 +40,7 @@
                                     <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"/>
+                                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="{StaticResource DefaultControlPadding}" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
                                 <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" Padding="9">
                                     <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}"/>
                                 </Button>

src/Shared/HandyControl_Shared/Themes/Styles/RadioButton.xaml

@@ -23,7 +23,7 @@
     </Style>
 
     <Style x:Key="RadioGroupItemSingle" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
     </Style>
 
     <Style x:Key="RadioGroupItemVerticalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">

src/Shared/HandyControl_Shared/Themes/Styles/Rectangle.xaml

@@ -0,0 +1,26 @@
+<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.MergedDictionaries>
+
+    <Style x:Key="RectangleCircular" TargetType="Rectangle">
+        <Setter Property="controls:RectangleAttach.Circular" Value="True"/>
+    </Style>
+
+    <Style x:Key="RectangleFocusVisual" TargetType="Rectangle">
+        <Setter Property="Margin" Value="-2"/>
+        <Setter Property="Opacity" Value=".6"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="Stroke" Value="{DynamicResource SecondaryBorderBrush}"/>
+        <Setter Property="StrokeThickness" Value="2"/>
+        <Setter Property="StrokeDashArray" Value="1 1"/>
+    </Style>
+
+    <Style x:Key="RectangleFocusVisualCircular" BasedOn="{StaticResource RectangleFocusVisual}" TargetType="Rectangle">
+        <Setter Property="controls:RectangleAttach.Circular" Value="True"/>
+    </Style>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/RichTextBox.xaml

@@ -2,13 +2,17 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../Basic/Sizes.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
     <Style x:Key="TextBoxBaseBaseStyle" TargetType="TextBoxBase">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>

src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml

@@ -4,6 +4,9 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Base/ScrollViewerBaseStyle.xaml"/>
+        <ResourceDictionary Source="../Basic/Converters.xaml"/>
+        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="RepeatButton.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <!--default style-->
@@ -11,4 +14,40 @@
 
     <Style BasedOn="{StaticResource ScrollViewerBaseStyle}" TargetType="controls:ScrollViewer"/>
 
+    <Style x:Key="ScrollViewerUpDownRepeatButtonStyle" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="Height" Value="10"/>
+        <Setter Property="Padding" Value="0,2"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="Visibility">
+            <Setter.Value>
+                <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    <ControlTemplate x:Key="ScrollViewerUpDownControlTemplate" TargetType="ScrollViewer">
+        <Grid x:Name="Grid" Background="{TemplateBinding Background}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" controls:IconElement.Geometry="{StaticResource UpGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Command="{x:Static ScrollBar.LineUpCommand}"/>
+            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="1"/>
+            <RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" controls:IconElement.Geometry="{StaticResource DownGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="2" Command="{x:Static ScrollBar.LineDownCommand}"/>
+        </Grid>
+    </ControlTemplate>
+    
+    <Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer">
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}"/>
+    </Style>
+
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml

@@ -18,6 +18,7 @@
         <ResourceDictionary Source="TabControl.xaml"/>
         <ResourceDictionary Source="ListBox.xaml"/>
         <ResourceDictionary Source="Loading.xaml"/>
+        <ResourceDictionary Source="Menu.xaml"/>
         <ResourceDictionary Source="ContextMenu.xaml"/>
         <ResourceDictionary Source="ToolTip.xaml"/>
         <ResourceDictionary Source="Expander.xaml"/>
@@ -49,7 +50,7 @@
         <ResourceDictionary Source="ToolBar.xaml"/>
         <ResourceDictionary Source="SearchBar.xaml"/>
         <ResourceDictionary Source="Tag.xaml"/>
-        <ResourceDictionary Source="RadioGroup.xaml"/>
+        <ResourceDictionary Source="ButtonGroup.xaml"/>
         <ResourceDictionary Source="FlipClock.xaml"/>
         <ResourceDictionary Source="Rate.xaml"/>
         <ResourceDictionary Source="Shield.xaml"/>
@@ -65,6 +66,10 @@
         <ResourceDictionary Source="SideMenu.xaml"/>
         <ResourceDictionary Source="GridSplitter.xaml"/>
         <ResourceDictionary Source="Col.xaml"/>
+        <ResourceDictionary Source="Card.xaml"/>
+        <ResourceDictionary Source="Rectangle.xaml"/>
+        <ResourceDictionary Source="Magnifier.xaml"/>
+        <ResourceDictionary Source="ToggleBlock.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml

@@ -122,7 +122,7 @@
                     <Button Focusable="False" Style="{StaticResource ButtonIcon}" Padding="8" controls:IconElement.Geometry="{StaticResource LeftGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonLeft"/>
                 </Border>
                 <controls:ScrollViewer HorizontalScrollBarVisibility="Hidden" CanMouseWheel="True" Orientation="Horizontal" IsEnableInertia="True" Grid.Row="0" Grid.Column="1" IsDeferredScrollingEnabled="True" x:Name="PART_OverflowScrollviewer">
-                    <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" >
+                    <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Name="PART_HeaderBorder">
                         <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsEnableTabFill="{TemplateBinding IsEnableTabFill}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
                             <interactivity:Interaction.Behaviors>
                                 <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
@@ -249,7 +249,7 @@
     </Style>
 
     <Style x:Key="TabItemCapsuleSingle" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
     </Style>
 
     <Style x:Key="TabItemCapsuleVerticalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">

src/Shared/HandyControl_Shared/Themes/Styles/ToggleBlock.xaml

@@ -0,0 +1,28 @@
+<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/ToggleBlockBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="controls:ToggleBlock"/>
+
+    <Style x:Key="ToggleBlockIcon" BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="controls:ToggleBlock">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:ToggleBlock">
+                    <ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <Path x:Name="PathIcon" Width="{TemplateBinding controls:IconElement.Width}" Height="{TemplateBinding controls:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding controls:IconSwitchElement.Geometry}"/>
+                    </ContentControl>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:IconSwitchElement.GeometrySelected)}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml

@@ -91,7 +91,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(controls:IconSwitchElement.GeometrySelected)}"/>
+                            <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:IconSwitchElement.GeometrySelected)}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -178,7 +178,7 @@
                     </ControlTemplate.Resources>
                     <Viewbox>
                         <controls:SimplePanel Height="28" Width="28">
-                            <Border Name="UnCheckedElement" Style="{StaticResource BorderClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                            <Border Name="UnCheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
                                 <Border.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1"/>
@@ -186,7 +186,7 @@
                                 </Border.RenderTransform>
                                 <ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             </Border>
-                            <Border Name="CheckedElement" Style="{StaticResource BorderClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                            <Border Name="CheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
                                 <Border.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="0"/>
@@ -264,4 +264,104 @@
         </Setter>
     </Style>
 
+
+    <!--ButtonGroup-->
+    <Style x:Key="ToggleButtonGroupItemDefault" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton"/>
+
+    <Style x:Key="ToggleButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4,0,0,4"/>
+        <Setter Property="Margin" Value="0"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonGroupItemHorizontalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="0,4,4,0"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonGroupItemSingle" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonGroupItemVerticalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4,4,0,0"/>
+        <Setter Property="Margin" Value="0"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonGroupItemVerticalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+        <Setter Property="controls:BorderElement.CornerRadius" Value="0,0,4,4"/>
+    </Style>
+
+    <!--LoadingButton-->
+    <Style x:Key="ToggleButtonLoadingPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="Chrome" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <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}}"/>
+                            </controls:SimplePanel>
+                            <Viewbox Margin="0,4">
+                                <controls:LoadingCircle x:Name="Loading" Width="22" Height="22" Foreground="{TemplateBinding Foreground}" DotDiameter="3" IsRunning="{TemplateBinding IsChecked}" Visibility="Collapsed"/>
+                            </Viewbox>
+                        </StackPanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Opacity" Value=".9"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Opacity" Value=".6"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="Loading"/>
+                            <Setter Property="Visibility" Value="Visible" TargetName="CheckedElement"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="controls:StatusSwitchElement.HideUncheckedElement" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement"/>
+                        </MultiTrigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ToggleButtonLoading" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="ToggleButtonLoadingSuccess" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+        <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonLoadingInfo" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+        <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonLoadingWarning" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+        <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonLoadingDanger" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+        <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
+    </Style>
+
 </ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/TransitioningContentControl.xaml

@@ -87,7 +87,7 @@
                                     </TransformGroup>
                                 </ContentPresenter.RenderTransform>
                             </ContentPresenter>
-                            <ContentPresenter x:Name="CurrentContentPresentationSite" Content="{x:Null}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <ContentPresenter x:Name="CurrentContentPresentationSite" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                                 <ContentPresenter.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform />

src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs

@@ -0,0 +1,36 @@
+//referenced from https://stackoverflow.com/a/5650367/9639378
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace HandyControl.Tools.Converter
+{
+    public class BorderCircularClipConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Length == 3 && values[0] is double width && values[1] is double height && values[2] is CornerRadius radius)
+            {
+                if (width < double.Epsilon || height < double.Epsilon)
+                {
+                    return Geometry.Empty;
+                }
+
+                var clip = new RectangleGeometry(new Rect(0, 0, width, height), radius.TopLeft, radius.TopLeft);
+                clip.Freeze();
+
+                return clip;
+            }
+
+            return DependencyProperty.UnsetValue;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}

src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs

@@ -1,6 +1,4 @@
-//referenced from https://stackoverflow.com/a/5650367/9639378
-
-using System;
+using System;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
@@ -19,7 +17,23 @@ namespace HandyControl.Tools.Converter
                     return Geometry.Empty;
                 }
 
-                var clip = new RectangleGeometry(new Rect(0, 0, width, height), radius.TopLeft, radius.TopLeft);
+                var clip = new PathGeometry
+                {
+                    Figures = new PathFigureCollection
+                    {
+                        new PathFigure(new Point(radius.TopLeft, 0), new PathSegment[]
+                        {
+                            new LineSegment(new Point(width - radius.TopRight, 0), false),
+                            new ArcSegment(new Point(width, radius.TopRight), new Size(radius.TopRight, radius.TopRight), 90, false, SweepDirection.Clockwise, false),
+                            new LineSegment(new Point(width, height - radius.BottomRight), false),
+                            new ArcSegment(new Point(width - radius.BottomRight, height), new Size(radius.BottomRight, radius.BottomRight), 90, false, SweepDirection.Clockwise, false),
+                            new LineSegment(new Point(radius.BottomLeft, height), false),
+                            new ArcSegment(new Point(0, height - radius.BottomLeft), new Size(radius.BottomLeft, radius.BottomLeft), 90, false, SweepDirection.Clockwise, false),
+                            new LineSegment(new Point(0, radius.TopLeft), false),
+                            new ArcSegment(new Point(radius.TopLeft, 0), new Size(radius.TopLeft, radius.TopLeft), 90, false, SweepDirection.Clockwise, false),
+                        }, false)
+                    }
+                };
                 clip.Freeze();
 
                 return clip;

src/Shared/HandyControl_Shared/Tools/Converter/NameReferenceConverter.cs

@@ -1,17 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-// ReSharper disable ConditionIsAlwaysTrueOrFalse
-// ReSharper disable HeuristicUnreachableCode
-
-namespace HandyControl.Tools.Converter
-{
-    public class NameReferenceConverter : System.Windows.Markup.NameReferenceConverter
-    {
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) 
-            => context == null ? null : base.ConvertFrom(context, culture, value);
-
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
-            => context == null ? null : base.ConvertTo(context, culture, value, destinationType);
-    }
-}

src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using HandyControl.Expression.Drawing;
+using HandyControl.Tools.Extension;
+
+namespace HandyControl.Tools.Converter
+{
+    public class Number2PercentageConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values == null || values.Length != 2) return .0;
+
+            var obj1 = values[0];
+            var obj2 = values[1];
+
+            if (obj1 == null || obj2 == null) return .0;
+
+            var str1 = values[0].ToString();
+            var str2 = values[1].ToString();
+
+            var v1 = str1.Value<double>();
+            var v2 = str2.Value<double>();
+
+            if (MathHelper.IsVerySmall(v2)) return 100.0;
+
+            return v1 / v2 * 100;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace HandyControl.Tools.Converter
+{
+    public class RectangleCircularConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Length == 2 && values[0] is double width && values[1] is double height)
+            {
+                if (width < double.Epsilon || height < double.Epsilon)
+                {
+                    return .0;
+                }
+
+                var min = Math.Min(width, height);
+                return min / 2;
+            }
+
+            return DependencyProperty.UnsetValue;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}

src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs

@@ -9,7 +9,7 @@ namespace HandyControl.Tools.Extension
     {
         T Result { get; set; }
 
-        Action<string> CloseAction { get; set; }
+        Action CloseAction { get; set; }
     }
 
     public static class DialogExtension

src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs

@@ -0,0 +1,9 @@
+using System.Windows;
+
+namespace HandyControl.Tools.Extension
+{
+    public static class ValueExtension
+    {
+        public static Thickness Add(this Thickness a, Thickness b) => new Thickness(a.Left + b.Left, a.Top + b.Top, a.Right + b.Right, a.Bottom + b.Bottom);
+    }
+}

src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs

@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Input;
 using HandyControl.Data;
@@ -7,15 +10,18 @@ namespace HandyControl.Tools
 {
     public class GlobalShortcut
     {
+        private static ObservableCollection<KeyBinding> KeyBindingCollection;
+
         private static readonly Dictionary<string, KeyBinding> CommandDic = new Dictionary<string, KeyBinding>();
 
+        private static void KeyboardHook_KeyDown(object sender, KeyboardHookEventArgs e) => HitTest(e.Key);
+
         static GlobalShortcut()
         {
+
             KeyboardHook.KeyDown += KeyboardHook_KeyDown;
         }
 
-        private static void KeyboardHook_KeyDown(object sender, KeyboardHookEventArgs e) => HitTest(e.Key);
-
         private static void HitTest(Key key)
         {
             if (IsModifierKey(key)) return;
@@ -45,21 +51,26 @@ namespace HandyControl.Tools
                    key == Key.RightCtrl || key == Key.RightAlt || key == Key.RightShift || key == Key.RWin;
         }
 
+        [Obsolete("pls use Host attach property instead of Init method")]
         public static void Init(DependencyObject host)
         {
             CommandDic.Clear();
 
             if (host == null) return;
 
-            var keyBindings = GetKeyBindings(host);
-            if (keyBindings == null || keyBindings.Count == 0) return;
+            KeyBindingCollection = GetKeyBindings(host);
+            if (KeyBindingCollection == null || KeyBindingCollection.Count == 0) return;
 
-            foreach (KeyBinding item in keyBindings)
+            AddKeyBindings(KeyBindingCollection);
+
+            KeyboardHook.Start();
+        }
+
+        private static void AddKeyBindings(IEnumerable<KeyBinding> keyBindings)
+        {
+            foreach (var item in keyBindings)
             {
-                if (item.Key == Key.None)
-                {
-                    continue;
-                }
+                if (item.Key == Key.None) continue;
 
                 if (item.Modifiers == ModifierKeys.None)
                 {
@@ -71,17 +82,45 @@ namespace HandyControl.Tools
                     CommandDic[keyStr] = item;
                 }
             }
+        }
 
+        public static readonly DependencyProperty HostProperty = DependencyProperty.RegisterAttached(
+            "Host", typeof(bool), typeof(GlobalShortcut), new PropertyMetadata(ValueBoxes.FalseBox, OnHostChanged));
+
+        private static void OnHostChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (DesignerHelper.IsInDesignMode) return;
+
+            if (KeyBindingCollection != null)
+            {
+                KeyBindingCollection.CollectionChanged -= KeyBindingCollection_CollectionChanged;
+            }
+            KeyBindingCollection = GetKeyBindings(d);
+            if (KeyBindingCollection != null)
+            {
+                KeyBindingCollection.CollectionChanged += KeyBindingCollection_CollectionChanged;
+            }
+        }
+
+        private static void KeyBindingCollection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            AddKeyBindings(KeyBindingCollection);
             KeyboardHook.Start();
         }
 
-        public static readonly DependencyProperty KeyBindingsProperty = DependencyProperty.RegisterAttached(
-            "KeyBindings", typeof(InputBindingCollection), typeof(GlobalShortcut), new PropertyMetadata(new InputBindingCollection()));
+        public static void SetHost(DependencyObject element, bool value)
+            => element.SetValue(HostProperty, value);
 
-        public static void SetKeyBindings(DependencyObject element, InputBindingCollection value)
+        public static bool GetHost(DependencyObject element)
+            => (bool) element.GetValue(HostProperty);
+
+        public static readonly DependencyProperty KeyBindingsProperty = DependencyProperty.RegisterAttached(
+            "KeyBindings", typeof(ObservableCollection<KeyBinding>), typeof(GlobalShortcut), new PropertyMetadata(new ObservableCollection<KeyBinding>()));
+
+        public static void SetKeyBindings(DependencyObject element, ObservableCollection<KeyBinding> value)
             => element.SetValue(KeyBindingsProperty, value);
 
-        public static InputBindingCollection GetKeyBindings(DependencyObject element)
-            => (InputBindingCollection) element.GetValue(KeyBindingsProperty);
+        public static ObservableCollection<KeyBinding> GetKeyBindings(DependencyObject element)
+            => (ObservableCollection<KeyBinding>) element.GetValue(KeyBindingsProperty);
     }
 }

src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace HandyControl.Tools
+{
+    internal class DpiHelper
+    {
+        [ThreadStatic]
+        private static Matrix _transformToDip;
+
+        public static Point DevicePixelsToLogical(Point devicePoint, double dpiScaleX, double dpiScaleY)
+        {
+            _transformToDip = Matrix.Identity;
+            _transformToDip.Scale(1d / dpiScaleX, 1d / dpiScaleY);
+            return _transformToDip.Transform(devicePoint);
+        }
+
+        public static Size DeviceSizeToLogical(Size deviceSize, double dpiScaleX, double dpiScaleY)
+        {
+            Point pt = DevicePixelsToLogical(new Point(deviceSize.Width, deviceSize.Height), dpiScaleX, dpiScaleY);
+
+            return new Size(pt.X, pt.Y);
+        }
+    }
+}

src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs

@@ -1,6 +1,13 @@
-using System.Linq;
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security;
 using System.Windows;
 using System.Windows.Media;
+using HandyControl.Tools.Interop;
+using HandyControl.Tools.Extension;
 
 namespace HandyControl.Tools
 {
@@ -50,5 +57,131 @@ namespace HandyControl.Tools
         /// </summary>
         /// <returns></returns>
         public static Window GetActiveWindow() => Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
+
+        private static readonly BitArray _cacheValid = new BitArray((int)CacheSlot.NumSlots);
+
+        private static bool _setDpiX = true;
+
+        private static bool _dpiInitialized;
+
+        private static readonly object _dpiLock = new object();
+
+        private static int _dpi;
+
+        internal static int Dpi
+        {
+            [SecurityCritical, SecuritySafeCritical]
+            get
+            {
+                if (!_dpiInitialized)
+                {
+                    lock (_dpiLock)
+                    {
+                        if (!_dpiInitialized)
+                        {
+                            var desktopWnd = new HandleRef(null, IntPtr.Zero);
+
+                            // Win32Exception will get the Win32 error code so we don't have to
+                            var dc = UnsafeNativeMethods.GetDC(desktopWnd);
+
+                            // Detecting error case from unmanaged call, required by PREsharp to throw a Win32Exception
+                            if (dc == IntPtr.Zero)
+                            {
+                                throw new Win32Exception();
+                            }
+
+                            try
+                            {
+                                _dpi = UnsafeNativeMethods.GetDeviceCaps(new HandleRef(null, dc), NativeMethods.LOGPIXELSY);
+                                _dpiInitialized = true;
+                            }
+                            finally
+                            {
+                                UnsafeNativeMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
+                            }
+                        }
+                    }
+                }
+                return _dpi;
+            }
+        }
+
+        private static int _dpiX;
+
+        internal static int DpiX
+        {
+            [SecurityCritical, SecuritySafeCritical]
+            get
+            {
+                if (_setDpiX)
+                {
+                    lock (_cacheValid)
+                    {
+                        if (_setDpiX)
+                        {
+                            _setDpiX = false;
+                            var desktopWnd = new HandleRef(null, IntPtr.Zero);
+                            var dc = UnsafeNativeMethods.GetDC(desktopWnd);
+                            if (dc == IntPtr.Zero)
+                            {
+                                throw new Win32Exception();
+                            }
+                            try
+                            {
+                                _dpiX = UnsafeNativeMethods.GetDeviceCaps(new HandleRef(null, dc), NativeMethods.LOGPIXELSX);
+                                _cacheValid[(int)CacheSlot.DpiX] = true;
+                            }
+                            finally
+                            {
+                                UnsafeNativeMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
+                            }
+                        }
+                    }
+                }
+
+                return _dpiX;
+            }
+        }
+
+        private static Thickness _windowResizeBorderThickness;
+
+        internal static Thickness WindowResizeBorderThickness
+        {
+            [SecurityCritical]
+            get
+            {
+                lock (_cacheValid)
+                {
+                    while (!_cacheValid[(int)CacheSlot.WindowResizeBorderThickness])
+                    {
+                        _cacheValid[(int)CacheSlot.WindowResizeBorderThickness] = true;
+
+                        var frameSize = new Size(NativeMethods.GetSystemMetrics(SM.CXSIZEFRAME), NativeMethods.GetSystemMetrics(SM.CYSIZEFRAME));
+                        var frameSizeInDips = DpiHelper.DeviceSizeToLogical(frameSize, DpiX / 96.0, Dpi / 96.0);
+
+                        _windowResizeBorderThickness = new Thickness(frameSizeInDips.Width, frameSizeInDips.Height, frameSizeInDips.Width, frameSizeInDips.Height);
+                    }
+                }
+
+                return _windowResizeBorderThickness;
+            }
+        }
+
+        public static Thickness WindowMaximizedPadding
+        {
+            get
+            {
+#if netle40
+                return WindowResizeBorderThickness;
+#elif Core
+                var hdc = UnsafeNativeMethods.GetDC(IntPtr.Zero);
+                var scale = UnsafeNativeMethods.GetDeviceCaps(hdc, NativeMethods.DESKTOPVERTRES) / (float)UnsafeNativeMethods.GetDeviceCaps(hdc, NativeMethods.VERTRES);
+                UnsafeNativeMethods.ReleaseDC(IntPtr.Zero, hdc);
+                return WindowResizeBorderThickness.Add(new Thickness(4 * scale));
+#else
+                return WindowResizeBorderThickness.Add(new Thickness(4));
+#endif
+            }
+        }
     }
 }

src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
+using System.Security;
 
 namespace HandyControl.Tools.Interop
 {
@@ -55,7 +56,15 @@ namespace HandyControl.Tools.Interop
             MEM_COMMIT = 0x1000,
             MEM_RELEASE = 0x8000,
             PAGE_READWRITE = 0x04,
-            TBSTATE_HIDDEN = 0x08;
+            TBSTATE_HIDDEN = 0x08,
+            VERTRES = 10,
+            HORZRES = 8,
+            DESKTOPVERTRES = 117,
+            DESKTOPHORZRES = 118,
+            LOGPIXELSX = 88,
+            LOGPIXELSY = 90,
+            CXFRAME = 32,
+            CXSIZEFRAME = CXFRAME;
 
         [Flags]
         public enum ProcessAccess
@@ -205,5 +214,10 @@ namespace HandyControl.Tools.Interop
 
         [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
         public static extern bool GetCursorPos(out POINT pt);
+
+        [SecurityCritical]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport(ExternDll.User32)]
+        public static extern int GetSystemMetrics(SM nIndex);
     }
 }

src/Shared/HandyControl_Shared/Tools/Interop/NativeValues.cs

@@ -87,7 +87,142 @@ namespace HandyControl.Tools.Interop
         TABLETPC = 86,
         MEDIACENTER = 87,
         REMOTESESSION = 0x1000,
-        REMOTECONTROL = 0x2001,
+        REMOTECONTROL = 0x2001
+    }
+
+    internal enum CacheSlot
+    {
+        DpiX,
+
+        FocusBorderWidth,
+        FocusBorderHeight,
+        HighContrast,
+        MouseVanish,
+
+        DropShadow,
+        FlatMenu,
+        WorkAreaInternal,
+        WorkArea,
+
+        IconMetrics,
+
+        KeyboardCues,
+        KeyboardDelay,
+        KeyboardPreference,
+        KeyboardSpeed,
+        SnapToDefaultButton,
+        WheelScrollLines,
+        MouseHoverTime,
+        MouseHoverHeight,
+        MouseHoverWidth,
+
+        MenuDropAlignment,
+        MenuFade,
+        MenuShowDelay,
+
+        ComboBoxAnimation,
+        ClientAreaAnimation,
+        CursorShadow,
+        GradientCaptions,
+        HotTracking,
+        ListBoxSmoothScrolling,
+        MenuAnimation,
+        SelectionFade,
+        StylusHotTracking,
+        ToolTipAnimation,
+        ToolTipFade,
+        UIEffects,
+
+        MinimizeAnimation,
+        Border,
+        CaretWidth,
+        ForegroundFlashCount,
+        DragFullWindows,
+        NonClientMetrics,
+
+        ThinHorizontalBorderHeight,
+        ThinVerticalBorderWidth,
+        CursorWidth,
+        CursorHeight,
+        ThickHorizontalBorderHeight,
+        ThickVerticalBorderWidth,
+        MinimumHorizontalDragDistance,
+        MinimumVerticalDragDistance,
+        FixedFrameHorizontalBorderHeight,
+        FixedFrameVerticalBorderWidth,
+        FocusHorizontalBorderHeight,
+        FocusVerticalBorderWidth,
+        FullPrimaryScreenWidth,
+        FullPrimaryScreenHeight,
+        HorizontalScrollBarButtonWidth,
+        HorizontalScrollBarHeight,
+        HorizontalScrollBarThumbWidth,
+        IconWidth,
+        IconHeight,
+        IconGridWidth,
+        IconGridHeight,
+        MaximizedPrimaryScreenWidth,
+        MaximizedPrimaryScreenHeight,
+        MaximumWindowTrackWidth,
+        MaximumWindowTrackHeight,
+        MenuCheckmarkWidth,
+        MenuCheckmarkHeight,
+        MenuButtonWidth,
+        MenuButtonHeight,
+        MinimumWindowWidth,
+        MinimumWindowHeight,
+        MinimizedWindowWidth,
+        MinimizedWindowHeight,
+        MinimizedGridWidth,
+        MinimizedGridHeight,
+        MinimumWindowTrackWidth,
+        MinimumWindowTrackHeight,
+        PrimaryScreenWidth,
+        PrimaryScreenHeight,
+        WindowCaptionButtonWidth,
+        WindowCaptionButtonHeight,
+        ResizeFrameHorizontalBorderHeight,
+        ResizeFrameVerticalBorderWidth,
+        SmallIconWidth,
+        SmallIconHeight,
+        SmallWindowCaptionButtonWidth,
+        SmallWindowCaptionButtonHeight,
+        VirtualScreenWidth,
+        VirtualScreenHeight,
+        VerticalScrollBarWidth,
+        VerticalScrollBarButtonHeight,
+        WindowCaptionHeight,
+        KanjiWindowHeight,
+        MenuBarHeight,
+        VerticalScrollBarThumbHeight,
+        IsImmEnabled,
+        IsMediaCenter,
+        IsMenuDropRightAligned,
+        IsMiddleEastEnabled,
+        IsMousePresent,
+        IsMouseWheelPresent,
+        IsPenWindows,
+        IsRemotelyControlled,
+        IsRemoteSession,
+        ShowSounds,
+        IsSlowMachine,
+        SwapButtons,
+        IsTabletPC,
+        VirtualScreenLeft,
+        VirtualScreenTop,
+
+        PowerLineStatus,
+
+        IsGlassEnabled,
+        UxThemeName,
+        UxThemeColor,
+        WindowCornerRadius,
+        WindowGlassColor,
+        WindowGlassBrush,
+        WindowNonClientFrameThickness,
+        WindowResizeBorderThickness,
+
+        NumSlots
     }
 
     internal static class Win32Constant

src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs

@@ -215,5 +215,11 @@ namespace HandyControl.Tools.Interop
 
         [DllImport(ExternDll.User32, SetLastError = true)]
         public static extern int ReleaseDC(IntPtr window, IntPtr dc);
+
+        [DllImport(ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
+        public static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
+        public static extern IntPtr GetDC(IntPtr ptr);
     }
 }

src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs

@@ -0,0 +1,87 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using HandyControl.Controls;
+using HandyControl.Data;
+
+namespace HandyControl.Tools
+{
+    public class ButtonGroupItemStyleSelector : StyleSelector
+    {
+        public override Style SelectStyle(object item, DependencyObject container)
+        {
+            if (container is ButtonGroup buttonGroup && item is ButtonBase buttonBase)
+            {
+                var count = buttonGroup.Items.Count;
+
+                switch (buttonBase)
+                {
+                    case RadioButton _:
+                    {
+                        if (count == 1)
+                        {
+                            return ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemSingle);
+                        }
+
+                        var index = buttonGroup.Items.IndexOf(buttonBase);
+                        return buttonGroup.Orientation == Orientation.Horizontal
+                            ? index == 0
+                                ? ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemHorizontalFirst)
+                                : ResourceHelper.GetResource<Style>(index == count - 1
+                                    ? ResourceToken.RadioGroupItemHorizontalLast
+                                    : ResourceToken.RadioGroupItemDefault)
+                            : index == 0
+                                ? ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemVerticalFirst)
+                                : ResourceHelper.GetResource<Style>(index == count - 1
+                                    ? ResourceToken.RadioGroupItemVerticalLast
+                                    : ResourceToken.RadioGroupItemDefault);
+                    }
+
+                    case Button _:
+                    {
+                        if (count == 1)
+                        {
+                            return ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemSingle);
+                        }
+
+                        var index = buttonGroup.Items.IndexOf(buttonBase);
+                        return buttonGroup.Orientation == Orientation.Horizontal
+                            ? index == 0
+                                ? ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemHorizontalFirst)
+                                : ResourceHelper.GetResource<Style>(index == count - 1
+                                    ? ResourceToken.ButtonGroupItemHorizontalLast
+                                    : ResourceToken.ButtonGroupItemDefault)
+                            : index == 0
+                                ? ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemVerticalFirst)
+                                : ResourceHelper.GetResource<Style>(index == count - 1
+                                    ? ResourceToken.ButtonGroupItemVerticalLast
+                                    : ResourceToken.ButtonGroupItemDefault);
+                    }
+
+                    case ToggleButton _:
+                    {
+                        if (count == 1)
+                        {
+                            return ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemSingle);
+                        }
+
+                        var index = buttonGroup.Items.IndexOf(buttonBase);
+                        return buttonGroup.Orientation == Orientation.Horizontal
+                            ? index == 0
+                                ? ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemHorizontalFirst)
+                                : ResourceHelper.GetResource<Style>(index == count - 1
+                                    ? ResourceToken.ToggleButtonGroupItemHorizontalLast
+                                    : ResourceToken.ToggleButtonGroupItemDefault)
+                            : index == 0
+                                ? ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemVerticalFirst)
+                                : ResourceHelper.GetResource<Style>(index == count - 1
+                                    ? ResourceToken.ToggleButtonGroupItemVerticalLast
+                                    : ResourceToken.ToggleButtonGroupItemDefault);
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+}

src/Shared/HandyControl_Shared/Tools/StyleSelector/RadioGroupItemStyleSelector.cs

@@ -1,37 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using HandyControl.Controls;
-using HandyControl.Data;
-
-namespace HandyControl.Tools
-{
-    public class RadioGroupItemStyleSelector : StyleSelector
-    {
-        public override Style SelectStyle(object item, DependencyObject container)
-        {
-            if (container is RadioGroup radioGroup && item is UIElement radioButton)
-            {
-                var count = radioGroup.Items.Count;
-                if (count == 1)
-                {
-                    return ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemSingle);
-                }
-
-                var index = radioGroup.Items.IndexOf(radioButton);
-                return radioGroup.Orientation == Orientation.Horizontal
-                    ? index == 0
-                        ? ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemHorizontalFirst)
-                        : ResourceHelper.GetResource<Style>(index == count - 1
-                            ? ResourceToken.RadioGroupItemHorizontalLast
-                            : ResourceToken.RadioGroupItemDefault)
-                    : index == 0
-                        ? ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemVerticalFirst)
-                        : ResourceHelper.GetResource<Style>(index == count - 1
-                            ? ResourceToken.RadioGroupItemVerticalLast
-                            : ResourceToken.RadioGroupItemDefault);
-            }
-
-            return null;
-        }
-    }
-}