From c2741c50ed04b3437fe063d02ab8cd0404033884 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 20 May 2019 21:04:49 +0800
Subject: [PATCH 01/17] fixed a bug of Transfer

---
 .../HandyControl_Shared/Controls/Transfer/Transfer.cs    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
index ba7afe33..afe715ae 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
@@ -79,8 +79,8 @@ namespace HandyControl.Controls
             {
                 if (_initEnumerable != null)
                 {
-                    OnItemsSourceChanged(null, _itemsSourceInternal);
-                    _itemsSourceInternal = null;
+                    OnItemsSourceChanged(null, _initEnumerable);
+                    _initEnumerable = null;
                 }
 
                 if (_initArgs != null)
@@ -89,7 +89,10 @@ namespace HandyControl.Controls
                     _initArgs = null;
                 }
 
-                Refresh();
+                if (_itemsOrigin.Items.Count == 0)
+                {
+                    Refresh();
+                }
             }
         }
 

From 6ec2b954ab16298fc8f3faf86f69d52698434e48 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 20 May 2019 21:39:11 +0800
Subject: [PATCH 02/17] fixed a bug of NumericUpDown

---
 src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index 257c6ef3..07dd7a5e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -159,6 +159,7 @@ namespace HandyControl.Controls
         {
             var ctl = (NumericUpDown) d;
             var v = (double) e.NewValue;
+            ctl._textBox.Text = v.ToString();
 
             ctl.OnValueChanged(new FunctionEventArgs<double>(ValueChangedEvent, ctl)
             {

From 86b634e85c311addbf875a3a3ac38db571661567 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 21 May 2019 23:04:03 +0800
Subject: [PATCH 03/17] add XmlnsPrefix

---
 .../UserControl/Main/NoUserContent.xaml       |  28 +-
 .../HandyControl_Core_30.csproj               |   5 +
 .../UserControl/Main/NoUserContent.xaml       |  28 +-
 .../UserControl/Main/NoUserContent.xaml       |  28 +-
 .../HandyControlDemo_Shared/MainWindow.xaml   |  18 +-
 .../Resources/Themes/Styles/Style.xaml        |  25 +-
 .../UserControl/Basic/ChatBox.xaml            |  47 ++-
 .../UserControl/Basic/InteractiveDialog.xaml  |   4 +-
 .../UserControl/Basic/TextDialog.xaml         |   9 +-
 .../Controls/AnimationPathDemoCtl.xaml        |   8 +-
 .../UserControl/Controls/BadgeDemoCtl.xaml    |  30 +-
 .../Controls/CalendarWithClockDemoCtl.xaml    |   8 +-
 .../UserControl/Controls/CarouselDemoCtl.xaml |  14 +-
 .../Controls/ChatBubbleDemoCtl.xaml           |   6 +-
 .../Controls/CirclePanelDemoCtl.xaml          |  10 +-
 .../UserControl/Controls/ClockDemoCtl.xaml    |  10 +-
 .../Controls/ColorPickerDemoCtl.xaml          |   8 +-
 .../UserControl/Controls/ComboBoxDemoCtl.xaml |  28 +-
 .../Controls/CompareSliderDemoCtl.xaml        |  34 +-
 .../Controls/CoverFlowDemoCtl.xaml            |   8 +-
 .../Controls/CoverViewDemoCtl.xaml            |  18 +-
 .../Controls/DatePickerDemoCtl.xaml           |  18 +-
 .../Controls/DateTimePickerDemoCtl.xaml       |  30 +-
 .../UserControl/Controls/DialogDemoCtl.xaml   |   8 +-
 .../Controls/FlipClockDemoCtl.xaml            |   8 +-
 .../UserControl/Controls/GifImageDemoCtl.xaml |  14 +-
 .../UserControl/Controls/GotoTopDemoCtl.xaml  |  16 +-
 .../UserControl/Controls/GravatarDemoCtl.xaml |  28 +-
 .../UserControl/Controls/GridDemoCtl.xaml     | 206 ++++++------
 .../UserControl/Controls/GrowlDemoCtl.xaml    |   6 +-
 .../Controls/ImageBrowserDemoCtl.xaml         |   8 +-
 .../UserControl/Controls/LoadingDemoCtl.xaml  |  14 +-
 .../Controls/NotifyIconDemoCtl.xaml           |  47 ++-
 .../Controls/NumericUpDownDemoCtl.xaml        |  30 +-
 .../Controls/OutlineTextDemoCtl.xaml          |  16 +-
 .../Controls/PaginationDemoCtl.xaml           |  23 +-
 .../Controls/PasswordBoxDemoCtl.xaml          |  18 +-
 .../Controls/PreviewSliderDemoCtl.xaml        |  14 +-
 .../Controls/ProgressBarDemoCtl.xaml          |  30 +-
 .../Controls/ProgressButtonDemoCtl.xaml       |  18 +-
 .../UserControl/Controls/RateDemoCtl.xaml     |  16 +-
 .../Controls/ScrollViewerDemoCtl.xaml         |  14 +-
 .../Controls/SearchBarDemoCtl.xaml            |  30 +-
 .../UserControl/Controls/ShieldDemoCtl.xaml   |  17 +-
 .../UserControl/Controls/SideMenuDemoCtl.xaml | 226 ++++++-------
 .../UserControl/Controls/StepBarDemoCtl.xaml  |  46 +--
 .../Controls/TabControlDemoCtl.xaml           | 119 ++++---
 .../UserControl/Controls/TagDemoCtl.xaml      |  30 +-
 .../UserControl/Controls/TextBoxDemoCtl.xaml  |  18 +-
 .../UserControl/Controls/TimeBarDemoCtl.xaml  |   8 +-
 .../Controls/TimePickerDemoCtl.xaml           |  38 +--
 .../UserControl/Controls/TransferDemoCtl.xaml |  14 +-
 .../Controls/WaterfallPanelDemoCtl.xaml       |  25 +-
 .../UserControl/Controls/WindowDemoCtl.xaml   |   6 +-
 .../UserControl/Main/LeftMainContent.xaml     | 304 +++++++++---------
 .../UserControl/Main/OverView.xaml            | 177 +++++-----
 .../UserControl/Main/UnderConstruction.xaml   |  14 +-
 .../UserControl/Styles/BorderDemoCtl.xaml     |   6 +-
 .../UserControl/Styles/BrushDemoCtl.xaml      |   6 +-
 .../UserControl/Styles/ButtonDemoCtl.xaml     |  42 +--
 .../UserControl/Styles/CalendarDemoCtl.xaml   |   6 +-
 .../UserControl/Styles/CheckBoxDemoCtl.xaml   |   6 +-
 .../UserControl/Styles/DataGridDemoCtl.xaml   |   8 +-
 .../UserControl/Styles/ExpanderDemoCtl.xaml   |   6 +-
 .../UserControl/Styles/GroupBoxDemoCtl.xaml   |  12 +-
 .../UserControl/Styles/LabelDemoCtl.xaml      |   6 +-
 .../UserControl/Styles/ListBoxDemoCtl.xaml    |   6 +-
 .../UserControl/Styles/ListViewDemoCtl.xaml   |   6 +-
 .../UserControl/Styles/MenuDemoCtl.xaml       |  10 +-
 .../Styles/NativeComboBoxDemoCtl.xaml         |  22 +-
 .../Styles/NativeDatePickerDemoCtl.xaml       |  14 +-
 .../Styles/NativePasswordBoxDemoCtl.xaml      |  14 +-
 .../Styles/NativeProgressBarDemoCtl.xaml      |   6 +-
 .../Styles/NativeScrollViewerDemoCtl.xaml     |   6 +-
 .../Styles/NativeTabControlDemoCtl.xaml       |   6 +-
 .../Styles/NativeTextBoxDemoCtl.xaml          |  14 +-
 .../Styles/RadioButtonDemoCtl.xaml            |  26 +-
 .../Styles/RepeatButtonDemoCtl.xaml           |  42 +--
 .../Styles/RichTextBoxDemoCtl.xaml            |   6 +-
 .../UserControl/Styles/SliderDemoCtl.xaml     |  14 +-
 .../UserControl/Styles/TextBlockDemoCtl.xaml  |   6 +-
 .../Styles/ToggleButtonDemoCtl.xaml           |  54 ++--
 .../UserControl/Styles/ToolBarDemoCtl.xaml    |   6 +-
 .../UserControl/Styles/TreeViewDemoCtl.xaml   |   6 +-
 .../Window/AboutWindow.xaml                   |  10 +-
 .../Window/BlurWindow.xaml                    |   6 +-
 .../Window/CommonWindow.xaml                  |  34 +-
 .../Window/CustomNonClientAreaWindow.xaml     |  44 +--
 .../Window/DialogDemoWindow.xaml              |   8 +-
 .../Window/GrowlDemoWindow.xaml               |  16 +-
 .../Window/NoNonClientAreaDragableWindow.xaml |  42 +--
 .../Controls/Image/ImageViewer.cs             |  42 ++-
 .../Controls/Input/NumericUpDown.cs           |   5 +-
 .../Controls/Transfer/Transfer.cs             |  11 +-
 .../Properties/AssemblyInfo.cs                |  15 +-
 95 files changed, 1313 insertions(+), 1310 deletions(-)

diff --git a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml
index b55926bd..6412815f 100644
--- a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml
+++ b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml
@@ -1,25 +1,23 @@
 <Grid x:Class="HandyControlDemo.UserControl.NoUserContent"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
       xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
       Height="29"
-      xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-      xmlns:enum="clr-namespace:HandyControl.Data;assembly=HandyControl">
+      xmlns:hc="https://handyorg.github.io/handycontrol">
     <Grid.ColumnDefinitions>
         <ColumnDefinition/>
         <ColumnDefinition Width="Auto"/>
     </Grid.ColumnDefinitions>
     <StackPanel VerticalAlignment="Stretch" Orientation="Horizontal">
         <Button Margin="4,0,0,0" Width="28" Height="29" Style="{StaticResource ButtonCustom}">
-            <interactivity:Interaction.Triggers>
-                <interactivity:EventTrigger EventName="Click">
-                    <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.ShowSystemMenuCommand}" />
-                </interactivity:EventTrigger>
-                <interactivity:EventTrigger EventName="MouseDoubleClick">
-                    <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
-                </interactivity:EventTrigger>
-            </interactivity:Interaction.Triggers>
+            <hc:Interaction.Triggers>
+                <hc:EventTrigger EventName="Click">
+                    <hc:InvokeCommandAction Command="{x:Static SystemCommands.ShowSystemMenuCommand}" />
+                </hc:EventTrigger>
+                <hc:EventTrigger EventName="MouseDoubleClick">
+                    <hc:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
+                </hc:EventTrigger>
+            </hc:Interaction.Triggers>
             <Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
         </Button>
         <Menu MenuItem.Click="MenuItemLinks_OnClick"  Margin="10,0,0,0" Background="Transparent">
@@ -69,7 +67,7 @@
             </MenuItem>
         </Menu>
     </StackPanel>
-    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
+    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
     <Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonConfig}" HorizontalOffset="-25" Name="PopupConfig" VerticalOffset="6" StaysOpen="False">
         <Border Background="{DynamicResource SecondaryRegionBrush}" CornerRadius="4" Margin="16" Effect="{StaticResource EffectShadow2}">
             <StackPanel Orientation="Horizontal">
@@ -82,13 +80,13 @@
                     </Button>
                 </StackPanel>
                 <StackPanel Button.Click="ButtonSkins_OnClick"  Margin="10,10,10,10">
-                    <Button Tag="{x:Static enum:SkinType.Default}" Style="{StaticResource ButtonCustom}">
+                    <Button Tag="{x:Static hc:SkinType.Default}" Style="{StaticResource ButtonCustom}">
                         <Border Background="White" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
-                    <Button Tag="{x:Static enum:SkinType.Dark}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
+                    <Button Tag="{x:Static hc:SkinType.Dark}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
                         <Border Background="Black" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
-                    <Button Tag="{x:Static enum:SkinType.Violet}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
+                    <Button Tag="{x:Static hc:SkinType.Violet}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
                         <Border Background="DarkViolet" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
                 </StackPanel>
diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj
index 3f62846b..0afdeaa1 100644
--- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj
+++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj
@@ -8,6 +8,8 @@
     <AssemblyVersion>1.5.5.0</AssemblyVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <Copyright>Copyright © HandyOrg 2018-2019</Copyright>
+    <Description>Contains some commonly used simple WPF controls</Description>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE;Core</DefineConstants>
@@ -33,6 +35,9 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Lang.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <Compile Include="..\..\Shared\HandyControl_Shared\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <ItemGroup>
diff --git a/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml b/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml
index 59a43609..1067134a 100644
--- a/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml
+++ b/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml
@@ -1,11 +1,9 @@
 <Grid x:Class="HandyControlDemo.UserControl.NoUserContent"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
       xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
       Height="29"
-      xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-      xmlns:enum="clr-namespace:HandyControl.Data;assembly=HandyControl"
+      xmlns:hc="https://handyorg.github.io/handycontrol"
       xmlns:shell="http://schemas.microsoft.com/winfx/2006/xaml/presentation/shell">
     <Grid.ColumnDefinitions>
         <ColumnDefinition/>
@@ -13,14 +11,14 @@
     </Grid.ColumnDefinitions>
     <StackPanel VerticalAlignment="Stretch" Orientation="Horizontal">
         <Button Margin="4,0,0,0" Width="28" Height="29" Style="{StaticResource ButtonCustom}">
-            <interactivity:Interaction.Triggers>
-                <interactivity:EventTrigger EventName="Click">
-                    <interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" />
-                </interactivity:EventTrigger>
-                <interactivity:EventTrigger EventName="MouseDoubleClick">
-                    <interactivity:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
-                </interactivity:EventTrigger>
-            </interactivity:Interaction.Triggers>
+            <hc:Interaction.Triggers>
+                <hc:EventTrigger EventName="Click">
+                    <hc:InvokeCommandAction Command="{x:Static shell:SystemCommands.ShowSystemMenuCommand}" />
+                </hc:EventTrigger>
+                <hc:EventTrigger EventName="MouseDoubleClick">
+                    <hc:InvokeCommandAction Command="{x:Static shell:SystemCommands.CloseWindowCommand}" />
+                </hc:EventTrigger>
+            </hc:Interaction.Triggers>
             <Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
         </Button>
         <Menu MenuItem.Click="MenuItemLinks_OnClick"  Margin="10,0,0,0" Background="Transparent">
@@ -70,7 +68,7 @@
             </MenuItem>
         </Menu>
     </StackPanel>
-    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
+    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
     <Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonConfig}" HorizontalOffset="-25" Name="PopupConfig" VerticalOffset="6" StaysOpen="False">
         <Border Background="{DynamicResource SecondaryRegionBrush}" CornerRadius="4" Margin="16" Effect="{StaticResource EffectShadow2}">
             <StackPanel Orientation="Horizontal">
@@ -83,13 +81,13 @@
                     </Button>
                 </StackPanel>
                 <StackPanel Button.Click="ButtonSkins_OnClick"  Margin="10,10,10,10">
-                    <Button Tag="{x:Static enum:SkinType.Default}" Style="{StaticResource ButtonCustom}">
+                    <Button Tag="{x:Static hc:SkinType.Default}" Style="{StaticResource ButtonCustom}">
                         <Border Background="White" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
-                    <Button Tag="{x:Static enum:SkinType.Dark}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
+                    <Button Tag="{x:Static hc:SkinType.Dark}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
                         <Border Background="Black" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
-                    <Button Tag="{x:Static enum:SkinType.Violet}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
+                    <Button Tag="{x:Static hc:SkinType.Violet}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
                         <Border Background="DarkViolet" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
                 </StackPanel>
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml
index b55926bd..6412815f 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml
@@ -1,25 +1,23 @@
 <Grid x:Class="HandyControlDemo.UserControl.NoUserContent"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
       xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
       Height="29"
-      xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-      xmlns:enum="clr-namespace:HandyControl.Data;assembly=HandyControl">
+      xmlns:hc="https://handyorg.github.io/handycontrol">
     <Grid.ColumnDefinitions>
         <ColumnDefinition/>
         <ColumnDefinition Width="Auto"/>
     </Grid.ColumnDefinitions>
     <StackPanel VerticalAlignment="Stretch" Orientation="Horizontal">
         <Button Margin="4,0,0,0" Width="28" Height="29" Style="{StaticResource ButtonCustom}">
-            <interactivity:Interaction.Triggers>
-                <interactivity:EventTrigger EventName="Click">
-                    <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.ShowSystemMenuCommand}" />
-                </interactivity:EventTrigger>
-                <interactivity:EventTrigger EventName="MouseDoubleClick">
-                    <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
-                </interactivity:EventTrigger>
-            </interactivity:Interaction.Triggers>
+            <hc:Interaction.Triggers>
+                <hc:EventTrigger EventName="Click">
+                    <hc:InvokeCommandAction Command="{x:Static SystemCommands.ShowSystemMenuCommand}" />
+                </hc:EventTrigger>
+                <hc:EventTrigger EventName="MouseDoubleClick">
+                    <hc:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
+                </hc:EventTrigger>
+            </hc:Interaction.Triggers>
             <Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
         </Button>
         <Menu MenuItem.Click="MenuItemLinks_OnClick"  Margin="10,0,0,0" Background="Transparent">
@@ -69,7 +67,7 @@
             </MenuItem>
         </Menu>
     </StackPanel>
-    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
+    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
     <Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonConfig}" HorizontalOffset="-25" Name="PopupConfig" VerticalOffset="6" StaysOpen="False">
         <Border Background="{DynamicResource SecondaryRegionBrush}" CornerRadius="4" Margin="16" Effect="{StaticResource EffectShadow2}">
             <StackPanel Orientation="Horizontal">
@@ -82,13 +80,13 @@
                     </Button>
                 </StackPanel>
                 <StackPanel Button.Click="ButtonSkins_OnClick"  Margin="10,10,10,10">
-                    <Button Tag="{x:Static enum:SkinType.Default}" Style="{StaticResource ButtonCustom}">
+                    <Button Tag="{x:Static hc:SkinType.Default}" Style="{StaticResource ButtonCustom}">
                         <Border Background="White" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
-                    <Button Tag="{x:Static enum:SkinType.Dark}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
+                    <Button Tag="{x:Static hc:SkinType.Dark}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
                         <Border Background="Black" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
-                    <Button Tag="{x:Static enum:SkinType.Violet}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
+                    <Button Tag="{x:Static hc:SkinType.Violet}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
                         <Border Background="DarkViolet" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
                     </Button>
                 </StackPanel>
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index 8ecc9c52..fabf5ef1 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -1,9 +1,9 @@
-<controls:BlurWindow x:Class="HandyControlDemo.MainWindow"
+<hc:BlurWindow x:Class="HandyControlDemo.MainWindow"
                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                     xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+                     xmlns:hc="https://handyorg.github.io/handycontrol"
                      xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
                      xmlns:data="clr-namespace:HandyControlDemo.Data"
                      mc:Ignorable="d"
@@ -20,12 +20,12 @@
                      ResizeMode="CanResizeWithGrip"
                      Name="MyWindow"
                      DataContext="{Binding Main,Source={StaticResource Locator}}"
-                     controls:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
+                     hc:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
                      d:DesignHeight="800" 
                      d:DesignWidth="1400">
-    <controls:Window.NonClientAreaContent>
+    <hc:Window.NonClientAreaContent>
         <userControl:NoUserContent/>
-    </controls:Window.NonClientAreaContent>
+    </hc:Window.NonClientAreaContent>
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="200" MinWidth="200" MaxWidth="400"/>
@@ -34,8 +34,8 @@
         <userControl:LeftMainContent/>
         <userControl:MainContent Grid.Column="1"/>
         <GridSplitter Grid.Column="1" HorizontalAlignment="Left" Width="4" Background="Transparent" BorderThickness="1,0,0,0" BorderBrush="{DynamicResource BorderBrush}"/>
-        <controls:ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
-            <StackPanel controls:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,10"/>
-        </controls:ScrollViewer>
+        <hc:ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
+            <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,10"/>
+        </hc:ScrollViewer>
     </Grid>
-</controls:BlurWindow>
\ No newline at end of file
+</hc:BlurWindow>
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
index 49831368..f8673fce 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl">
+                    xmlns:hc="https://handyorg.github.io/handycontrol">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Basic/Geometries.xaml"/>
@@ -53,13 +52,13 @@
             </Setter.Value>
         </Setter>
         <Style.Triggers>
-            <Trigger Property="controls:EdgeElement.ShowEdgeContent" Value="true">
+            <Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="ListBoxItem">
                             <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
                                 <StackPanel Orientation="Horizontal">
-                                    <ContentControl Width="16" Height="16" Content="{Binding Path=(controls:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}"/>
+                                    <ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}"/>
                                     <ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                                     <Path VerticalAlignment="Center" Data="{StaticResource NewGeometry}" Stretch="Uniform" Margin="10,0,0,0" Width="30" Height="14" Fill="{DynamicResource DangerBrush}"/>
                                 </StackPanel>
@@ -78,20 +77,20 @@
 
     <ItemsPanelTemplate x:Key="FluidMoveBehaviorWrapPanelItemsPanelTemplate">
         <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-            <interactivity:Interaction.Behaviors>
-                <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="0:0:.2">
-                    <interactivity:FluidMoveBehavior.EaseX>
+            <hc:Interaction.Behaviors>
+                <hc:FluidMoveBehavior AppliesTo="Children" Duration="0:0:.2">
+                    <hc:FluidMoveBehavior.EaseX>
                         <PowerEase/>
-                    </interactivity:FluidMoveBehavior.EaseX>
-                    <interactivity:FluidMoveBehavior.EaseY>
+                    </hc:FluidMoveBehavior.EaseX>
+                    <hc:FluidMoveBehavior.EaseY>
                         <PowerEase/>
-                    </interactivity:FluidMoveBehavior.EaseY>
-                </interactivity:FluidMoveBehavior>
-            </interactivity:Interaction.Behaviors>
+                    </hc:FluidMoveBehavior.EaseY>
+                </hc:FluidMoveBehavior>
+            </hc:Interaction.Behaviors>
         </WrapPanel>
     </ItemsPanelTemplate>
 
-    <Style x:Key="MessageBoxCustom" TargetType="controls:MessageBox" BasedOn="{StaticResource {x:Type controls:MessageBox}}">
+    <Style x:Key="MessageBoxCustom" TargetType="hc:MessageBox" BasedOn="{StaticResource {x:Type hc:MessageBox}}">
         <Setter Property="NonClientAreaBackground" Value="#262e2f"/>
         <Setter Property="OtherButtonHoverBackground" Value="#888580"/>
         <Setter Property="OtherButtonForeground" Value="White"/>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
index c0141b01..6b22e2ef 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
@@ -3,9 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
              mc:Ignorable="d" 
              Height="486"
              Effect="{StaticResource EffectShadow5}"
@@ -17,15 +16,15 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <ListBox ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.CanContentScroll="False"  Background="Transparent" controls:ChatBubble.MaxWidth="300" BorderThickness="0" Style="{StaticResource StackPanelVerticalListBox}" ItemsSource="{Binding ChatInfos}">
-            <interactivity:Interaction.Triggers>
-                <interactivity:RoutedEventTrigger RoutedEvent="controls:ChatBubble.Selected">
-                    <interactivity:EventToCommand Command="{Binding ReadMessageCmd}" PassEventArgsToCommand="True" />
-                </interactivity:RoutedEventTrigger>
-            </interactivity:Interaction.Triggers>
+        <ListBox ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.CanContentScroll="False"  Background="Transparent" hc:ChatBubble.MaxWidth="300" BorderThickness="0" Style="{StaticResource StackPanelVerticalListBox}" ItemsSource="{Binding ChatInfos}">
+            <hc:Interaction.Triggers>
+                <hc:RoutedEventTrigger RoutedEvent="hc:ChatBubble.Selected">
+                    <hc:EventToCommand Command="{Binding ReadMessageCmd}" PassEventArgsToCommand="True" />
+                </hc:RoutedEventTrigger>
+            </hc:Interaction.Triggers>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <controls:ChatBubble Role="{Binding Role}" Type="{Binding Type}" Content="{Binding Message}" Tag="{Binding}"/>
+                    <hc:ChatBubble Role="{Binding Role}" Type="{Binding Type}" Content="{Binding Message}" Tag="{Binding}"/>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
@@ -36,24 +35,24 @@
                     <ColumnDefinition/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <ToggleButton Name="ToggleButtonAudio" controls:BorderElement.CornerRadius="15" Width="30" Height="30" Padding="7" Margin="6" controls:IconSwitchElement.Geometry="{StaticResource AudioGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource KeyboardGeometry}" Style="{StaticResource ToggleButtonIcon}"/>
-                <Button Command="{Binding OpenImageCmd}" Grid.Column="2" Margin="6,0,6,0" controls:BorderElement.CornerRadius="15" Width="30" Height="30" Padding="7" controls:IconElement.Geometry="{StaticResource ImageGeometry}"/>
+                <ToggleButton Name="ToggleButtonAudio" hc:BorderElement.CornerRadius="15" Width="30" Height="30" Padding="7" Margin="6" hc:IconSwitchElement.Geometry="{StaticResource AudioGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource KeyboardGeometry}" Style="{StaticResource ToggleButtonIcon}"/>
+                <Button Command="{Binding OpenImageCmd}" Grid.Column="2" Margin="6,0,6,0" hc:BorderElement.CornerRadius="15" Width="30" Height="30" Padding="7" hc:IconElement.Geometry="{StaticResource ImageGeometry}"/>
                 <TextBox Grid.Column="1" Text="{Binding ChatString,UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding IsChecked,ElementName=ToggleButtonAudio,Converter={StaticResource Boolean2VisibilityReConverter}}">
-                    <interactivity:Interaction.Triggers>
-                        <interactivity:EventTrigger EventName="KeyDown">
-                            <interactivity:EventToCommand Command="{Binding SendStringCmd}" PassEventArgsToCommand="True" />
-                        </interactivity:EventTrigger>
-                    </interactivity:Interaction.Triggers>
+                    <hc:Interaction.Triggers>
+                        <hc:EventTrigger EventName="KeyDown">
+                            <hc:EventToCommand Command="{Binding SendStringCmd}" PassEventArgsToCommand="True" />
+                        </hc:EventTrigger>
+                    </hc:Interaction.Triggers>
                 </TextBox>
                 <Button Grid.Column="1" Visibility="{Binding IsChecked,ElementName=ToggleButtonAudio,Converter={StaticResource Boolean2VisibilityConverter}}" Content="{x:Static langs:Lang.PushToTalk}" HorizontalAlignment="Stretch">
-                    <interactivity:Interaction.Triggers>
-                        <interactivity:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                            <interactivity:EventToCommand Command="{Binding StartRecordCmd}"/>
-                        </interactivity:EventTrigger>
-                        <interactivity:EventTrigger EventName="PreviewMouseLeftButtonUp">
-                            <interactivity:EventToCommand Command="{Binding StopRecordCmd}"/>
-                        </interactivity:EventTrigger>
-                    </interactivity:Interaction.Triggers>
+                    <hc:Interaction.Triggers>
+                        <hc:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                            <hc:EventToCommand Command="{Binding StartRecordCmd}"/>
+                        </hc:EventTrigger>
+                        <hc:EventTrigger EventName="PreviewMouseLeftButtonUp">
+                            <hc:EventToCommand Command="{Binding StopRecordCmd}"/>
+                        </hc:EventTrigger>
+                    </hc:Interaction.Triggers>
                 </Button>
             </Grid>
         </Border>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml
index cc3bdb12..161cb16a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
         CornerRadius="10"
         Width="400"
         Height="247"
@@ -10,7 +10,7 @@
         Background="{DynamicResource RegionBrush}">
     <StackPanel VerticalAlignment="Center" Margin="32">
         <TextBlock Style="{StaticResource TextBlockLargeBold}" Text="{Binding Message}"/>
-        <TextBox Margin="0,32,0,0" Style="{StaticResource TextBoxExtend}" Text="{Binding Result,UpdateSourceTrigger=PropertyChanged}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PleaseInput}"/>
+        <TextBox Margin="0,32,0,0" Style="{StaticResource TextBoxExtend}" Text="{Binding Result,UpdateSourceTrigger=PropertyChanged}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PleaseInput}"/>
         <Button Width="120" Margin="0,32,0,0" Command="{Binding CloseCmd}" Style="{StaticResource ButtonPrimary}" Content="{x:Static langs:Lang.Ok}"/>
     </StackPanel>
 </Border>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml
index a4504bc3..285f4359 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml
@@ -2,14 +2,13 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-        xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
         CornerRadius="10"
         Width="400"
         Height="247"
         Background="{DynamicResource RegionBrush}">
-    <controls:SimplePanel>
+    <hc:SimplePanel>
         <TextBlock Style="{StaticResource TextBlockLargeBold}" Text="{x:Static langs:Lang.PleaseWait}"/>
-        <Button Width="22" Height="22" Command="interactivity:ControlCommands.Close" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryBrush}" controls:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0"/>    
-    </controls:SimplePanel>
+        <Button Width="22" Height="22" Command="hc:ControlCommands.Close" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryBrush}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0"/>    
+    </hc:SimplePanel>
 </Border>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml
index a01db604..f7818f4d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml
@@ -2,10 +2,10 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              Background="{DynamicResource RegionBrush}"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
         <Viewbox Margin="32" Width="200" Height="200">
-            <controls:AnimationPath VerticalAlignment="Center" Duration="0:0:6" Stretch="Uniform" Width="1024" Height="1024" StrokeThickness="10" Stroke="{DynamicResource PrimaryBrush}" Data="{StaticResource GithubGeometry}"/>
+            <hc:AnimationPath VerticalAlignment="Center" Duration="0:0:6" Stretch="Uniform" Width="1024" Height="1024" StrokeThickness="10" Stroke="{DynamicResource PrimaryBrush}" Data="{StaticResource GithubGeometry}"/>
         </Viewbox>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml
index d10cbda7..bc1520e4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml
@@ -1,30 +1,30 @@
 <UserControl x:Class="HandyControlDemo.UserControl.BadgeDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}"
              DataContext="{Binding BadgeDemo, Source={StaticResource Locator}}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
-            <controls:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30">
+            <hc:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30">
                 <Button Content="{x:Static langs:Lang.Comment}"/>
-            </controls:Badge>
-            <controls:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            </hc:Badge>
+            <hc:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
                 <Button Content="{x:Static langs:Lang.Comment}"/>
-            </controls:Badge>
-            <controls:Badge Value="{Binding Count}" BadgeMargin="0,-14,-10,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgePrimary}">
+            </hc:Badge>
+            <hc:Badge Value="{Binding Count}" BadgeMargin="0,-14,-10,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgePrimary}">
                 <Button Content="{x:Static langs:Lang.Click2Count}" Command="{Binding CountCmd}"/>
-            </controls:Badge>
-            <controls:Badge Value="100" BadgeMargin="0,-14,-20,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            </hc:Badge>
+            <hc:Badge Value="100" BadgeMargin="0,-14,-20,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
                 <Button Content="{x:Static langs:Lang.Comment}"/>
-            </controls:Badge>
-            <controls:Badge Status="Dot" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            </hc:Badge>
+            <hc:Badge Status="Dot" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
                 <Button Content="{x:Static langs:Lang.Reply}"/>
-            </controls:Badge>
-            <controls:Badge Status="Processing" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            </hc:Badge>
+            <hc:Badge Status="Processing" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
                 <Button Content="{x:Static langs:Lang.Reply}" />
-            </controls:Badge>
+            </hc:Badge>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml
index 69eb771d..64803a39 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml
@@ -2,8 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-         <controls:CalendarWithClock Margin="32"/>   
-    </controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+         <hc:CalendarWithClock Margin="32"/>   
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml
index 2a47a088..89bbeefc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml
@@ -2,17 +2,17 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-        <controls:Carousel Margin="32" IsCenter="True" AutoRun="True" Width="600" Height="330" VerticalAlignment="Center">
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+        <hc:Carousel Margin="32" IsCenter="True" AutoRun="True" Width="600" Height="330" VerticalAlignment="Center">
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/1.jpg"/>
             <Image Width="300" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/2.jpg"/>
-            <controls:SimplePanel Width="600">
+            <hc:SimplePanel Width="600">
                 <Image Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/3.jpg"/>
                 <TextBlock Text="示例文本" Style="{StaticResource TextBlockDefault}" FontSize="100" FontWeight="Bold" Foreground="White"/>
-            </controls:SimplePanel>
+            </hc:SimplePanel>
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/4.jpg"/>
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/5.jpg"/>
-        </controls:Carousel>
-    </controls:TransitioningContentControl>
+        </hc:Carousel>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml
index 285330c6..b7e9da26 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml
@@ -2,9 +2,9 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Orientation="Horizontal" Margin="32">
             <userControl:ChatBox>
                 <userControl:ChatBox.Background>
@@ -17,5 +17,5 @@
                 </userControl:ChatBox.Background>
             </userControl:ChatBox>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml
index 84eae51d..efff5379 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="HandyControlDemo.UserControl.CirclePanelDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:CirclePanel Margin="64" Diameter="170">
+    <hc:TransitioningContentControl>
+        <hc:CirclePanel Margin="64" Diameter="170">
             <Button Style="{StaticResource CirclePanelButton}"/>
             <Button Style="{StaticResource CirclePanelButton}"/>
             <Button Style="{StaticResource CirclePanelButton}"/>
@@ -13,6 +13,6 @@
             <Button Style="{StaticResource CirclePanelButton}"/>
             <Button Style="{StaticResource CirclePanelButton}"/>
             <Button Style="{StaticResource CirclePanelButton}"/>
-        </controls:CirclePanel>
-    </controls:TransitioningContentControl>
+        </hc:CirclePanel>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml
index 95fd9b50..bc1a0bfb 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ClockDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Orientation="Horizontal" Margin="32">
-            <controls:Clock/>
-            <controls:ListClock Margin="16,0,0,0"/>
+            <hc:Clock/>
+            <hc:ListClock Margin="16,0,0,0"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml
index 9d253efe..391b2332 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml
@@ -1,8 +1,8 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ColorPickerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-        <controls:ColorPicker Name="ColorPicker" Margin="32"/>
-    </controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+        <hc:ColorPicker Name="ColorPicker" Margin="32"/>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
index efd9a0ad..8839a3c6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
@@ -2,26 +2,26 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <ScrollViewer>
             <StackPanel Margin="32">
-                <controls:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" SelectedIndex="0"/>
-                <controls:ComboBox ItemsSource="{Binding DataList}" Margin="0,16,0,0" SelectedIndex="0" IsEnabled="False"/>
-                <controls:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" SelectedIndex="0" Margin="0,16,0,0" IsEditable="True"/>
+                <hc:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" SelectedIndex="0"/>
+                <hc:ComboBox ItemsSource="{Binding DataList}" Margin="0,16,0,0" SelectedIndex="0" IsEnabled="False"/>
+                <hc:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" SelectedIndex="0" Margin="0,16,0,0" IsEditable="True"/>
 
-                <controls:ComboBox ItemsSource="{Binding DataList}" SelectedIndex="0" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <controls:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-                <controls:ComboBox ItemsSource="{Binding DataList}" IsEditable="True" SelectedIndex="0" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <controls:ComboBox AutoComplete="True" ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:ComboBox ItemsSource="{Binding DataList}" SelectedIndex="0" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+                <hc:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:ComboBox ItemsSource="{Binding DataList}" IsEditable="True" SelectedIndex="0" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+                <hc:ComboBox AutoComplete="True" ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
 
-                <controls:ComboBox ItemsSource="{Binding DataList}" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <controls:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-                <controls:ComboBox ItemsSource="{Binding DataList}" IsEditable="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <controls:ComboBox AutoComplete="True" ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:ComboBox ItemsSource="{Binding DataList}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+                <hc:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:ComboBox ItemsSource="{Binding DataList}" IsEditable="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+                <hc:ComboBox AutoComplete="True" ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
         </ScrollViewer>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml
index c375b4bc..c77e8e3c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml
@@ -1,44 +1,44 @@
 <UserControl x:Class="HandyControlDemo.UserControl.CompareSliderDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:ScrollViewer VerticalAlignment="Center">
+    <hc:TransitioningContentControl>
+        <hc:ScrollViewer VerticalAlignment="Center">
             <WrapPanel ItemHeight="384" ItemWidth="632">
-                <controls:CompareSlider Value="5" Width="600" Height="352">
-                    <controls:CompareSlider.TargetContent>
+                <hc:CompareSlider Value="5" Width="600" Height="352">
+                    <hc:CompareSlider.TargetContent>
                         <Border>
                             <Border.Background>
                                 <ImageBrush ImageSource="/HandyControlDemo;component/Resources/Img/b1.jpg"/>
                             </Border.Background>
                         </Border>
-                    </controls:CompareSlider.TargetContent>
-                    <controls:CompareSlider.SourceContent>
+                    </hc:CompareSlider.TargetContent>
+                    <hc:CompareSlider.SourceContent>
                         <Border>
                             <Border.Background>
                                 <ImageBrush ImageSource="/HandyControlDemo;component/Resources/Img/b2.jpg"/>
                             </Border.Background>
                         </Border>
-                    </controls:CompareSlider.SourceContent>
-                </controls:CompareSlider>
-                <controls:CompareSlider Orientation="Vertical" Value="5" Width="600" Height="352">
-                    <controls:CompareSlider.TargetContent>
+                    </hc:CompareSlider.SourceContent>
+                </hc:CompareSlider>
+                <hc:CompareSlider Orientation="Vertical" Value="5" Width="600" Height="352">
+                    <hc:CompareSlider.TargetContent>
                         <Border>
                             <Border.Background>
                                 <ImageBrush ImageSource="/HandyControlDemo;component/Resources/Img/b1.jpg"/>
                             </Border.Background>
                         </Border>
-                    </controls:CompareSlider.TargetContent>
-                    <controls:CompareSlider.SourceContent>
+                    </hc:CompareSlider.TargetContent>
+                    <hc:CompareSlider.SourceContent>
                         <Border>
                             <Border.Background>
                                 <ImageBrush ImageSource="/HandyControlDemo;component/Resources/Img/b2.jpg"/>
                             </Border.Background>
                         </Border>
-                    </controls:CompareSlider.SourceContent>
-                </controls:CompareSlider>
+                    </hc:CompareSlider.SourceContent>
+                </hc:CompareSlider>
             </WrapPanel>
-        </controls:ScrollViewer>
-    </controls:TransitioningContentControl>
+        </hc:ScrollViewer>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml
index bd203b9c..742adf40 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="HandyControlDemo.UserControl.CoverFlowDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:CoverFlow x:Name="CoverFlowMain" Margin="32" Width="500" Height="300"/>
-    </controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
+        <hc:CoverFlow x:Name="CoverFlowMain" Margin="32" Width="500" Height="300"/>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml
index 43e57342..c97e7f25 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml
@@ -1,24 +1,24 @@
 <UserControl x:Class="HandyControlDemo.UserControl.CoverViewDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding CoverView,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:CoverView Margin="27" Width="880" Height="432" ItemWidth="160" ItemHeight="160" ItemsSource="{Binding DataList}">
-            <controls:CoverView.ItemHeaderTemplate>
+    <hc:TransitioningContentControl>
+        <hc:CoverView Margin="27" Width="880" Height="432" ItemWidth="160" ItemHeight="160" ItemsSource="{Binding DataList}">
+            <hc:CoverView.ItemHeaderTemplate>
                 <DataTemplate>
                     <Image Source="{Binding ImgPath}"/>
                 </DataTemplate>
-            </controls:CoverView.ItemHeaderTemplate>
-            <controls:CoverView.ItemTemplate>
+            </hc:CoverView.ItemHeaderTemplate>
+            <hc:CoverView.ItemTemplate>
                 <DataTemplate>
                     <Border Margin="10" Height="300" Background="{Binding BackgroundToken,Converter={StaticResource String2BrushConverter}}">
                         <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                     </Border>
                 </DataTemplate>
-            </controls:CoverView.ItemTemplate>
-        </controls:CoverView>
-    </controls:TransitioningContentControl>
+            </hc:CoverView.ItemTemplate>
+        </hc:CoverView>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
index 39e23fed..7dda4fb4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
@@ -1,21 +1,21 @@
 <UserControl x:Class="HandyControlDemo.UserControl.DatePickerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
-            <controls:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}"/>
-            <controls:DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}"/>
+            <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}"/>
+            <hc:DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}"/>
 
-            <controls:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
-            <controls:DatePicker SelectedDate="{x:Static system:DateTime.Now}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+            <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
+            <hc:DatePicker SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-            <controls:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
-            <controls:DatePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+            <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
+            <hc:DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
index d47ea7a3..8dd7c112 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
@@ -1,31 +1,31 @@
 <UserControl x:Class="HandyControlDemo.UserControl.DateTimePickerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
-                <controls:DateTimePicker ShowClearButton="True"/>
-                <controls:DateTimePicker Margin="0,16,0,0" IsEnabled="False"/>
+                <hc:DateTimePicker ShowClearButton="True"/>
+                <hc:DateTimePicker Margin="0,16,0,0" IsEnabled="False"/>
 
-                <controls:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
-                <controls:DateTimePicker controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource DateTimePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
+                <hc:DateTimePicker hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <controls:DateTimePicker ShowClearButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" Style="{StaticResource DateTimePickerExtend}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
-                <controls:DateTimePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource DateTimePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:DateTimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
+                <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
             </StackPanel>
             <StackPanel Margin="32,0,0,0">
-                <controls:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus}"/>
-                <controls:DateTimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource DateTimePickerPlus}"/>
+                <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus}"/>
+                <hc:DateTimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource DateTimePickerPlus}"/>
 
-                <controls:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
-                <controls:DateTimePicker controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource DateTimePickerPlus}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
+                <hc:DateTimePicker hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <controls:DateTimePicker ShowClearButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" Style="{StaticResource DateTimePickerPlus}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
-                <controls:DateTimePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource DateTimePickerPlus}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:DateTimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
+                <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
index c6772db1..21072d9a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
@@ -2,16 +2,16 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}"
              MinWidth="300"
              DataContext="{Binding DialogDemo,Source={StaticResource Locator}}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" VerticalAlignment="Center">
             <Button Content="{x:Static langs:Lang.TextDialog}" Command="{Binding ShowTextCmd}" />
-            <TextBox Margin="0,32,0,0" Text="{Binding DialogResult,UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource TextBoxExtend}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PleaseInput}"/>
+            <TextBox Margin="0,32,0,0" Text="{Binding DialogResult,UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource TextBoxExtend}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PleaseInput}"/>
             <Button Margin="0,10,0,0" Content="{x:Static langs:Lang.InteractiveDialog}" Command="{Binding ShowInteractiveDialogCmd}"/>
             <Button Margin="0,32,0,0" Content="{x:Static langs:Lang.NewWindow}" Command="{Binding NewWindowCmd}"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml
index e5e902a9..8e2f08b2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml
@@ -2,8 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-        <controls:FlipClock Margin="32"/>
-    </controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+        <hc:FlipClock Margin="32"/>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml
index 46b410b7..a35701a0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml
@@ -1,13 +1,13 @@
 <UserControl x:Class="HandyControlDemo.UserControl.GifImageDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:GifImage x:Name="GifImageMain" Margin="32" Width="400" Height="300">
-            <controls:GifImage.Source>
+    <hc:TransitioningContentControl>
+        <hc:GifImage x:Name="GifImageMain" Margin="32" Width="400" Height="300">
+            <hc:GifImage.Source>
                 <BitmapImage UriSource="/HandyControlDemo;component/Resources/Img/car_chase.gif"/>
-            </controls:GifImage.Source>
-        </controls:GifImage>
-    </controls:TransitioningContentControl>
+            </hc:GifImage.Source>
+        </hc:GifImage>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
index 5f6821a0..6ccca191 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="HandyControlDemo.UserControl.GotoTopDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:SimplePanel Width="500" Height="400">
-            <controls:ScrollViewer Name="ScrollViewerDemo" IsEnableInertia="True" Margin="0,10,0,0">
+    <hc:TransitioningContentControl>
+        <hc:SimplePanel Width="500" Height="400">
+            <hc:ScrollViewer Name="ScrollViewerDemo" IsEnableInertia="True" Margin="0,10,0,0">
                 <Border Height="2000" Margin="8,0">
                     <Border.Background>
                         <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
@@ -14,8 +14,8 @@
                         </LinearGradientBrush>
                     </Border.Background>
                 </Border>
-            </controls:ScrollViewer>
-            <controls:GotoTop Animated="True" AutoHiding="True" AnimationTime="500" Target="{Binding ElementName=ScrollViewerDemo}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,20,20"/>
-        </controls:SimplePanel>
-    </controls:TransitioningContentControl>
+            </hc:ScrollViewer>
+            <hc:GotoTop Animated="True" AutoHiding="True" AnimationTime="500" Target="{Binding ElementName=ScrollViewerDemo}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,20,20"/>
+        </hc:SimplePanel>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml
index 25d5f2ea..98ecc600 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml
@@ -1,27 +1,27 @@
 <UserControl x:Class="HandyControlDemo.UserControl.GravatarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <UniformGrid Rows="3" Columns="3" Width="240" Height="240">
-                <controls:Gravatar Id="User1"/>
-                <controls:Gravatar Id="User2"/>
-                <controls:Gravatar Style="{StaticResource GravatarCircleImg}">
+                <hc:Gravatar Id="User1"/>
+                <hc:Gravatar Id="User2"/>
+                <hc:Gravatar Style="{StaticResource GravatarCircleImg}">
                     <Image Source="/HandyControlDemo;component/Resources/Img/Album/2.jpg"/>
-                </controls:Gravatar>
-                <controls:Gravatar Id="User4"/>
-                <controls:Gravatar Id="User5" Style="{StaticResource GravatarCircle}"/>
-                <controls:Gravatar Id="User6"/>
-                <controls:Gravatar Style="{StaticResource GravatarCircle}" Source="/HandyControlDemo;component/Resources/Img/Album/1.jpg"/>
-                <controls:Gravatar Id="User8"/>
-                <controls:Gravatar Id="User9"/>
+                </hc:Gravatar>
+                <hc:Gravatar Id="User4"/>
+                <hc:Gravatar Id="User5" Style="{StaticResource GravatarCircle}"/>
+                <hc:Gravatar Id="User6"/>
+                <hc:Gravatar Style="{StaticResource GravatarCircle}" Source="/HandyControlDemo;component/Resources/Img/Album/1.jpg"/>
+                <hc:Gravatar Id="User8"/>
+                <hc:Gravatar Id="User9"/>
             </UniformGrid>
             <StackPanel Margin="16,0,0,0" Height="220" VerticalAlignment="Center">
                 <TextBox Text="User1" Name="TextBoxName" Width="180"/>
-                <controls:Gravatar Height="180" Width="180" Id="{Binding Text,ElementName=TextBoxName}" Margin="10"/>
+                <hc:Gravatar Height="180" Width="180" Id="{Binding Text,ElementName=TextBoxName}" Margin="10"/>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml
index f07af0f9..eccc1566 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml
@@ -1,157 +1,157 @@
 <UserControl x:Class="HandyControlDemo.UserControl.GridDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:extension="clr-namespace:HandyControl.Tools.Extension;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
     <ScrollViewer>
         <StackPanel Margin="32">
             <TextBlock Text="{x:Static langs:Lang.BasicLayout}" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
-            <controls:Row Margin="0,20,0,0">
-                <controls:Col Span="24">
+            <hc:Row Margin="0,20,0,0">
+                <hc:Col Span="24">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
-            <controls:Row Margin="0,20,0,0">
-                <controls:Col Span="12">
+                </hc:Col>
+            </hc:Row>
+            <hc:Row Margin="0,20,0,0">
+                <hc:Col Span="12">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="12">
+                </hc:Col>
+                <hc:Col Span="12">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
-            <controls:Row Margin="0,20,0,0">
-                <controls:Col Span="8">
+                </hc:Col>
+            </hc:Row>
+            <hc:Row Margin="0,20,0,0">
+                <hc:Col Span="8">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="8">
+                </hc:Col>
+                <hc:Col Span="8">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="8">
+                </hc:Col>
+                <hc:Col Span="8">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
-            <controls:Row Margin="0,20,0,0">
-                <controls:Col Span="6">
+                </hc:Col>
+            </hc:Row>
+            <hc:Row Margin="0,20,0,0">
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="6">
+                </hc:Col>
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="6">
+                </hc:Col>
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="6">
+                </hc:Col>
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
-            <controls:Row Margin="0,20,0,0">
-                <controls:Col Span="4">
+                </hc:Col>
+            </hc:Row>
+            <hc:Row Margin="0,20,0,0">
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="4">
+                </hc:Col>
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="4">
+                </hc:Col>
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="4">
+                </hc:Col>
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="4">
+                </hc:Col>
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="4">
+                </hc:Col>
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
+                </hc:Col>
+            </hc:Row>
             <TextBlock Text="{x:Static langs:Lang.ColumnSpacing}" Margin="0,32,0,0" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
-            <controls:Row Margin="0,20,0,0" Gutter="20">
-                <controls:Col Span="6">
+            <hc:Row Margin="0,20,0,0" Gutter="20">
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="6">
+                </hc:Col>
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="6">
+                </hc:Col>
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="6">
+                </hc:Col>
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
+                </hc:Col>
+            </hc:Row>
             <TextBlock Text="{x:Static langs:Lang.HybridLayout}" Margin="0,32,0,0" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
-            <controls:Row Margin="0,20,0,0" Gutter="20">
-                <controls:Col Span="16">
+            <hc:Row Margin="0,20,0,0" Gutter="20">
+                <hc:Col Span="16">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="8">
+                </hc:Col>
+                <hc:Col Span="8">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
-            <controls:Row Margin="0,20,0,0" Gutter="20">
-                <controls:Col Span="8">
+                </hc:Col>
+            </hc:Row>
+            <hc:Row Margin="0,20,0,0" Gutter="20">
+                <hc:Col Span="8">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="8">
+                </hc:Col>
+                <hc:Col Span="8">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="4">
+                </hc:Col>
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="4">
+                </hc:Col>
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
-            <controls:Row Margin="0,20,0,0" Gutter="20">
-                <controls:Col Span="4">
+                </hc:Col>
+            </hc:Row>
+            <hc:Row Margin="0,20,0,0" Gutter="20">
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="16">
+                </hc:Col>
+                <hc:Col Span="16">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="4">
+                </hc:Col>
+                <hc:Col Span="4">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
+                </hc:Col>
+            </hc:Row>
             <TextBlock Text="{x:Static langs:Lang.ColumnOffset}" Margin="0,32,0,0" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
-            <controls:Row Margin="0,20,0,0" Gutter="20">
-                <controls:Col Span="6">
+            <hc:Row Margin="0,20,0,0" Gutter="20">
+                <hc:Col Span="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="6" Offset="6">
+                </hc:Col>
+                <hc:Col Span="6" Offset="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
-            <controls:Row Margin="0,20,0,0" Gutter="20">
-                <controls:Col Span="6" Offset="6">
+                </hc:Col>
+            </hc:Row>
+            <hc:Row Margin="0,20,0,0" Gutter="20">
+                <hc:Col Span="6" Offset="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Span="6" Offset="6">
+                </hc:Col>
+                <hc:Col Span="6" Offset="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
-            <controls:Row Margin="0,20,0,0" Gutter="20">
-                <controls:Col Span="12" Offset="6">
+                </hc:Col>
+            </hc:Row>
+            <hc:Row Margin="0,20,0,0" Gutter="20">
+                <hc:Col Span="12" Offset="6">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
+                </hc:Col>
+            </hc:Row>
             <TextBlock Text="{x:Static langs:Lang.ResponsiveLayout}" Margin="0,32,0,0" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
-            <controls:Row Margin="0,20,0,0" Gutter="10">
-                <controls:Col Layout="{extension:ColLayout Xs=8, Sm=6, Md=4, Lg=3, Xl=1}">
+            <hc:Row Margin="0,20,0,0" Gutter="10">
+                <hc:Col Layout="{extension:ColLayout Xs=8, Sm=6, Md=4, Lg=3, Xl=1}">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Layout="{extension:ColLayout Xs=4, Sm=6, Md=8, Lg=9, Xl=11}">
+                </hc:Col>
+                <hc:Col Layout="{extension:ColLayout Xs=4, Sm=6, Md=8, Lg=9, Xl=11}">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Layout="{extension:ColLayout Xs=4, Sm=6, Md=8, Lg=9, Xl=11}">
+                </hc:Col>
+                <hc:Col Layout="{extension:ColLayout Xs=4, Sm=6, Md=8, Lg=9, Xl=11}">
                     <Border Background="{DynamicResource BorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-                <controls:Col Layout="{extension:ColLayout Xs=8, Sm=6, Md=4, Lg=3, Xl=1}">
+                </hc:Col>
+                <hc:Col Layout="{extension:ColLayout Xs=8, Sm=6, Md=4, Lg=3, Xl=1}">
                     <Border Background="{DynamicResource SecondaryBorderBrush}" Height="36" CornerRadius="4"/>
-                </controls:Col>
-            </controls:Row>
+                </hc:Col>
+            </hc:Row>
         </StackPanel>
     </ScrollViewer>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml
index 7739acc0..5d229ef7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="HandyControlDemo.UserControl.GrowlDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding GrowlDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
             <WrapPanel VerticalAlignment="Center">
                 <Button Command="{Binding InfoCmd}" Content="{x:Static langs:Lang.Info}" Margin="0,5,5,5" Style="{StaticResource ButtonInfo}"/>
@@ -18,5 +18,5 @@
             </WrapPanel>
             <Button Command="{Binding NewWindowCmd}" Content="{x:Static langs:Lang.NewWindow}" Margin="0,5,0,0" HorizontalAlignment="Left"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml
index 224355dc..075be8e5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml
@@ -4,11 +4,11 @@
              Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding ImageBrowserDemo,Source={StaticResource Locator}}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
-            <controls:ImageViewer Background="{DynamicResource BackgroundBrush}" Width="600" Height="330" ImageSource="/HandyControlDemo;component/Resources/Img/1.jpg"/>
+            <hc:ImageViewer Background="{DynamicResource SecondaryRegionBrush}" Width="600" Height="330" ImageSource="/HandyControlDemo;component/Resources/Img/1.jpg"/>
             <Button Margin="0,32,0,0" Command="{Binding OpenImgCmd}" Content="{x:Static langs:Lang.OpenImageBrowser}" Style="{StaticResource ButtonPrimary}" HorizontalAlignment="Center"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml
index ee2c5dc0..ca7525bc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml
@@ -2,17 +2,17 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
         <StackPanel Width="600" Margin="32" VerticalAlignment="Center">
-            <controls:LoadingLine/>
-            <controls:LoadingLine Margin="0,30" Foreground="BlueViolet" Style="{StaticResource LoadingLineLarge}"/>
+            <hc:LoadingLine/>
+            <hc:LoadingLine Margin="0,30" Foreground="BlueViolet" Style="{StaticResource LoadingLineLarge}"/>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <controls:LoadingCircle/>
+                <hc:LoadingCircle/>
                 <Border VerticalAlignment="Center" Margin="32,0,0,0" Background="{DynamicResource PrimaryBrush}" CornerRadius="10">
-                    <controls:LoadingCircle Style="{StaticResource LoadingCircleLight}" Margin="10"/>
+                    <hc:LoadingCircle Style="{StaticResource LoadingCircleLight}" Margin="10"/>
                 </Border>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml
index bcb6864b..98d1ac7c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml
@@ -2,75 +2,74 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:command="http://www.galasoft.ch/mvvmlight"
              DataContext="{Binding NotifyIconDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:SimplePanel Margin="32">
+    <hc:TransitioningContentControl>
+        <hc:SimplePanel Margin="32">
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <GroupBox Header="ContextMenu" Padding="10">
                     <StackPanel>
-                        <GroupBox controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Visibility}">
+                        <GroupBox hc:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Visibility}">
                             <ToggleButton IsChecked="{Binding ContextMenuIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
                         </GroupBox>
                         <TextBlock Foreground="{DynamicResource InfoBrush}" Visibility="{Binding ContextMenuIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{x:Static langs:Lang.Try2CloseApp}" Margin="0,6,0,0"/>
-                        <GroupBox Margin="0,10,0,0" controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Blink}">
+                        <GroupBox Margin="0,10,0,0" hc:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Blink}">
                             <ToggleButton IsChecked="{Binding ContextMenuIsBlink}" IsEnabled="{Binding ContextMenuIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
                         </GroupBox>
                     </StackPanel>
                 </GroupBox>
                 <GroupBox Header="ContextContent" Margin="16,0,0,0" Padding="10">
                     <StackPanel>
-                        <GroupBox controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Visibility}">
+                        <GroupBox hc:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Visibility}">
                             <ToggleButton IsChecked="{Binding ContextContentIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
                         </GroupBox>
                         <TextBlock Foreground="{DynamicResource InfoBrush}" Visibility="{Binding ContextContentIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{x:Static langs:Lang.Try2CloseApp}" Margin="0,6,0,0"/>
-                        <GroupBox Margin="0,10,0,0" controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Blink}">
+                        <GroupBox Margin="0,10,0,0" hc:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Blink}">
                             <ToggleButton IsChecked="{Binding ContextContentIsBlink}" IsEnabled="{Binding ContextContentIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
                         </GroupBox>
                     </StackPanel>
                 </GroupBox>
             </StackPanel>
-            <controls:NotifyIcon Text="HandyControl" IsBlink="{Binding ContextMenuIsBlink}" Visibility="{Binding ContextMenuIsShow,Converter={StaticResource Boolean2VisibilityConverter}}">
-                <controls:NotifyIcon.ContextMenu>
+            <hc:NotifyIcon Text="HandyControl" IsBlink="{Binding ContextMenuIsBlink}" Visibility="{Binding ContextMenuIsShow,Converter={StaticResource Boolean2VisibilityConverter}}">
+                <hc:NotifyIcon.ContextMenu>
                     <ContextMenu>
-                        <MenuItem Command="interactivity:ControlCommands.PushMainWindow2Top" Header="{x:Static langs:Lang.OpenPanel}"/>
-                        <MenuItem Command="interactivity:ControlCommands.ShutdownApp" Header="{x:Static langs:Lang.Exit}"/>
+                        <MenuItem Command="hc:ControlCommands.PushMainWindow2Top" Header="{x:Static langs:Lang.OpenPanel}"/>
+                        <MenuItem Command="hc:ControlCommands.ShutdownApp" Header="{x:Static langs:Lang.Exit}"/>
                     </ContextMenu>
-                </controls:NotifyIcon.ContextMenu>
+                </hc:NotifyIcon.ContextMenu>
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Click">
-                        <command:EventToCommand Command="interactivity:ControlCommands.PushMainWindow2Top"/>
+                        <command:EventToCommand Command="hc:ControlCommands.PushMainWindow2Top"/>
                     </i:EventTrigger>
                     <i:EventTrigger EventName="MouseDoubleClick">
                         <command:EventToCommand Command="{Binding MouseCmd}" CommandParameter="MouseDoubleClick"/>
                     </i:EventTrigger>
                 </i:Interaction.Triggers>
-            </controls:NotifyIcon>
-            <controls:NotifyIcon x:Name="NotifyIconContextContent" Text="HandyControl" IsBlink="{Binding ContextContentIsBlink}" Visibility="{Binding ContextContentIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Icon="/HandyControlDemo;component/Resources/Img/icon-white.ico">
-                <controls:NotifyIcon.ContextContent>
+            </hc:NotifyIcon>
+            <hc:NotifyIcon x:Name="NotifyIconContextContent" Text="HandyControl" IsBlink="{Binding ContextContentIsBlink}" Visibility="{Binding ContextContentIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Icon="/HandyControlDemo;component/Resources/Img/icon-white.ico">
+                <hc:NotifyIcon.ContextContent>
                     <Border CornerRadius="4" Margin="10" Background="White" Effect="{StaticResource EffectShadow2}">
                         <StackPanel VerticalAlignment="Center" Margin="16">
                             <Path Width="100" Height="100" Fill="#f06632" Data="{StaticResource LogoGeometry}"/>
                             <StackPanel Margin="0,16,0,0" HorizontalAlignment="Center" Orientation="Horizontal">
-                                <Button Click="ButtonPush_OnClick"  Command="interactivity:ControlCommands.PushMainWindow2Top" MinWidth="100" Content="{x:Static langs:Lang.OpenPanel}"/>
-                                <Button Command="interactivity:ControlCommands.ShutdownApp" Margin="16,0,0,0" MinWidth="100" Style="{StaticResource ButtonPrimary}" Content="{x:Static langs:Lang.Exit}"/>
+                                <Button Click="ButtonPush_OnClick"  Command="hc:ControlCommands.PushMainWindow2Top" MinWidth="100" Content="{x:Static langs:Lang.OpenPanel}"/>
+                                <Button Command="hc:ControlCommands.ShutdownApp" Margin="16,0,0,0" MinWidth="100" Style="{StaticResource ButtonPrimary}" Content="{x:Static langs:Lang.Exit}"/>
                             </StackPanel>
                         </StackPanel>
                     </Border>
-                </controls:NotifyIcon.ContextContent>
+                </hc:NotifyIcon.ContextContent>
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Click">
-                        <command:EventToCommand Command="interactivity:ControlCommands.PushMainWindow2Top"/>
+                        <command:EventToCommand Command="hc:ControlCommands.PushMainWindow2Top"/>
                     </i:EventTrigger>
                     <i:EventTrigger EventName="MouseDoubleClick">
                         <command:EventToCommand Command="{Binding MouseCmd}" CommandParameter="MouseDoubleClick"/>
                     </i:EventTrigger>
                 </i:Interaction.Triggers>
-            </controls:NotifyIcon>
-        </controls:SimplePanel>
-    </controls:TransitioningContentControl>
+            </hc:NotifyIcon>
+        </hc:SimplePanel>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
index 181773f5..77fb878d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
@@ -1,29 +1,29 @@
 <UserControl x:Class="HandyControlDemo.UserControl.NumericUpDownDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
-                <controls:NumericUpDown/>
-                <controls:NumericUpDown Margin="0,32,0,0" IsEnabled="False"/>
+                <hc:NumericUpDown/>
+                <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False"/>
 
-                <controls:NumericUpDown controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownExtend}"/>
-                <controls:NumericUpDown controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" controls:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownExtend}"/>
-                <controls:NumericUpDown Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource NumericUpDownExtend}" Margin="0,32,0,0"/>
-                <controls:NumericUpDown Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource NumericUpDownExtend}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:NumericUpDown hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownExtend}"/>
+                <hc:NumericUpDown hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownExtend}"/>
+                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource NumericUpDownExtend}" Margin="0,32,0,0"/>
+                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource NumericUpDownExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
             <StackPanel Margin="32,0,0,0">
-                <controls:NumericUpDown Name="NumericUpDownCustomVerify" ShowClearButton="True" Style="{StaticResource NumericUpDownPlus}"/>
-                <controls:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDownPlus}"/>
+                <hc:NumericUpDown Name="NumericUpDownCustomVerify" ShowClearButton="True" Style="{StaticResource NumericUpDownPlus}"/>
+                <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDownPlus}"/>
 
-                <controls:NumericUpDown ShowClearButton="True" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus}"/>
-                <controls:NumericUpDown controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" controls:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownPlus}"/>
-                <controls:NumericUpDown Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource NumericUpDownPlus}" Margin="0,32,0,0"/>
-                <controls:NumericUpDown DecimalPlaces="2" ShowClearButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource NumericUpDownPlus}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:NumericUpDown ShowClearButton="True" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus}"/>
+                <hc:NumericUpDown hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownPlus}"/>
+                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource NumericUpDownPlus}" Margin="0,32,0,0"/>
+                <hc:NumericUpDown DecimalPlaces="2" ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource NumericUpDownPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
index c0872fd0..a8ccd7e0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
@@ -1,16 +1,16 @@
 <UserControl x:Class="HandyControlDemo.UserControl.OutlineTextDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Width="400">
-            <controls:OutlineText TextWrapping="Wrap" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=20}"/>
-            <controls:OutlineText Margin="0,10,0,0" FontSize="30" Fill="{DynamicResource SuccessBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
-            <controls:OutlineText Margin="0,10,0,0" FontSize="30" FontStyle="Italic" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
-            <controls:OutlineText Margin="0,10,0,0" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" FontSize="50" StrokeThickness="2" Fill="{DynamicResource DangerBrush}" Stroke="{DynamicResource PrimaryBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
-            <controls:OutlineText Margin="0,10,0,0" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+            <hc:OutlineText TextWrapping="Wrap" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=20}"/>
+            <hc:OutlineText Margin="0,10,0,0" FontSize="30" Fill="{DynamicResource SuccessBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
+            <hc:OutlineText Margin="0,10,0,0" FontSize="30" FontStyle="Italic" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
+            <hc:OutlineText Margin="0,10,0,0" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" FontSize="50" StrokeThickness="2" Fill="{DynamicResource DangerBrush}" Stroke="{DynamicResource PrimaryBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
+            <hc:OutlineText Margin="0,10,0,0" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml
index ac0ead50..f4695b25 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml
@@ -3,22 +3,21 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
              DataContext="{Binding PaginationDemo,Source={StaticResource Locator}}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:i="clr-namespace:HandyControl.Interactivity;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs">
+    <hc:TransitioningContentControl>
         <Grid Margin="32">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <controls:Pagination MaxPageCount="10" PageIndex="{Binding PageIndex}">
-                <i:Interaction.Triggers>
-                    <i:EventTrigger EventName="PageUpdated">
-                        <i:EventToCommand Command="{Binding PageUpdatedCmd}" PassEventArgsToCommand="True" />
-                    </i:EventTrigger>
-                </i:Interaction.Triggers>
-            </controls:Pagination>
+            <hc:Pagination MaxPageCount="10" PageIndex="{Binding PageIndex}">
+                <hc:Interaction.Triggers>
+                    <hc:EventTrigger EventName="PageUpdated">
+                        <hc:EventToCommand Command="{Binding PageUpdatedCmd}" PassEventArgsToCommand="True" />
+                    </hc:EventTrigger>
+                </hc:Interaction.Triggers>
+            </hc:Pagination>
             <DataGrid IsReadOnly="True" Width="600" Margin="0,16,0,0" Grid.Row="1" HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
                 <DataGrid.RowHeaderTemplate>
                     <DataTemplate>
@@ -41,5 +40,5 @@
                 </DataGrid.Columns>
             </DataGrid>
         </Grid>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
index fad81202..32b35dc6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
@@ -1,20 +1,20 @@
 <UserControl x:Class="HandyControlDemo.UserControl.PasswordBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
-            <controls:PasswordBox ShowClearButton="True" Password="123456"/>
-            <controls:PasswordBox Password="123456" Margin="0,16,0,0"/>
+            <hc:PasswordBox ShowClearButton="True" Password="123456"/>
+            <hc:PasswordBox Password="123456" Margin="0,16,0,0"/>
 
-            <controls:PasswordBox ShowClearButton="True" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Password="123456" Margin="0,32,0,0"/>
-            <controls:PasswordBox ShowEyeButton="True" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+            <hc:PasswordBox ShowClearButton="True" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Password="123456" Margin="0,32,0,0"/>
+            <hc:PasswordBox ShowEyeButton="True" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
 
-            <controls:PasswordBox ShowClearButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Password="123456"/>
-            <controls:PasswordBox ShowClearButton="True" ShowEyeButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+            <hc:PasswordBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Password="123456"/>
+            <hc:PasswordBox ShowClearButton="True" ShowEyeButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
 
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml
index f18f784e..8fb39b03 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml
@@ -1,13 +1,13 @@
 <UserControl x:Class="HandyControlDemo.UserControl.PreviewSliderDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:PreviewSlider Name="PreviewSlider" Width="800" Value="500" Maximum="1000" VerticalAlignment="Center" Margin="32">
-            <controls:PreviewSlider.PreviewContent>
+    <hc:TransitioningContentControl>
+        <hc:PreviewSlider Name="PreviewSlider" Width="800" Value="500" Maximum="1000" VerticalAlignment="Center" Margin="32">
+            <hc:PreviewSlider.PreviewContent>
                 <Label Style="{StaticResource LabelPrimary}" Content="{Binding PreviewPosition,ElementName=PreviewSlider}" ContentStringFormat="{}{0:#0.0}"/>
-            </controls:PreviewSlider.PreviewContent>
-        </controls:PreviewSlider>
-    </controls:TransitioningContentControl>
+            </hc:PreviewSlider.PreviewContent>
+        </hc:PreviewSlider>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml
index f1955091..71863f11 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml
@@ -1,31 +1,31 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ProgressBarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
             <Slider Value="50" Name="SliderDemo" Maximum="100"/>
             <StackPanel Orientation="Horizontal" Margin="0,32,0,0">
-                <controls:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}"/>
-                <controls:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" FontSize="30" Margin="16,0,0,0"/>
-                <controls:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="20" Height="20" ArcThickness="2" Style="{StaticResource ProgressBarSuccessCircle}"/>
-                <controls:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="30" Height="30" ArcThickness="6" Style="{StaticResource ProgressBarInfoCircle}"/>
-                <controls:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="40" Height="40" ArcThickness="10" Style="{StaticResource ProgressBarWarningCircle}"/>
-                <controls:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" Width="50" Height="50" Style="{StaticResource ProgressBarDangerCircle}"/>
+                <hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}"/>
+                <hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" FontSize="30" Margin="16,0,0,0"/>
+                <hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="20" Height="20" ArcThickness="2" Style="{StaticResource ProgressBarSuccessCircle}"/>
+                <hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="30" Height="30" ArcThickness="6" Style="{StaticResource ProgressBarInfoCircle}"/>
+                <hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="40" Height="40" ArcThickness="10" Style="{StaticResource ProgressBarWarningCircle}"/>
+                <hc:CircleProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" Width="50" Height="50" Style="{StaticResource ProgressBarDangerCircle}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,32,0,0">
-                <controls:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}"/>
-                <controls:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}" FontSize="20" Margin="16,0,0,0" WaveThickness="4" WaveStroke="#FFFF0080">
-                    <controls:WaveProgressBar.WaveFill>
+                <hc:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}"/>
+                <hc:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}" FontSize="20" Margin="16,0,0,0" WaveThickness="4" WaveStroke="#FFFF0080">
+                    <hc:WaveProgressBar.WaveFill>
                         <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
                             <GradientStop Color="#66FF0080" Offset="0"/>
                             <GradientStop Color="#FFFF0080" Offset="1"/>
                         </LinearGradientBrush>
-                    </controls:WaveProgressBar.WaveFill>
-                </controls:WaveProgressBar>
-                <controls:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="50" Height="50" Style="{StaticResource ProgressBarWarningWave}"/>
+                    </hc:WaveProgressBar.WaveFill>
+                </hc:WaveProgressBar>
+                <hc:WaveProgressBar Value="{Binding Value,ElementName=SliderDemo}" Margin="16,0,0,0" ShowText="False" Width="50" Height="50" Style="{StaticResource ProgressBarWarningWave}"/>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml
index 4b78b122..0785e4c3 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml
@@ -2,16 +2,16 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Width="300" Button.Click="ButtonProgress_OnClick" VerticalAlignment="Center">
-            <controls:ProgressButton IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-            <controls:ProgressButton Style="{StaticResource ProgressButtonPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-            <controls:ProgressButton Style="{StaticResource ProgressButtonSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-            <controls:ProgressButton Style="{StaticResource ProgressButtonInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-            <controls:ProgressButton Style="{StaticResource ProgressButtonWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-            <controls:ProgressButton Style="{StaticResource ProgressButtonDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+            <hc:ProgressButton IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+            <hc:ProgressButton Style="{StaticResource ProgressButtonPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+            <hc:ProgressButton Style="{StaticResource ProgressButtonSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+            <hc:ProgressButton Style="{StaticResource ProgressButtonInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+            <hc:ProgressButton Style="{StaticResource ProgressButtonWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+            <hc:ProgressButton Style="{StaticResource ProgressButtonDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml
index 5f4cd7eb..0201ae69 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml
@@ -1,15 +1,15 @@
 <UserControl x:Class="HandyControlDemo.UserControl.RateDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center" Width="170">
-            <controls:Rate Value="2"/>
-            <controls:Rate Value="5" Count="6" Margin="0,16,0,0" Foreground="{DynamicResource SuccessBrush}"/>
-            <controls:Rate DefaultValue="3" IsReadOnly="True" AllowHalf="True" Margin="0,16,0,0" Foreground="{DynamicResource WarningBrush}"/>
-            <controls:Rate DefaultValue="1" AllowClear="False" AllowHalf="True" Margin="0,16,0,0" Foreground="{DynamicResource DangerBrush}" Icon="{StaticResource LoveGeometry}"/>
-            <controls:Rate Value="4.5" AllowHalf="True" ShowText="True" Margin="0,16,0,0" Foreground="{DynamicResource DangerBrush}" Icon="{StaticResource LoveGeometry}"/>
+            <hc:Rate Value="2"/>
+            <hc:Rate Value="5" Count="6" Margin="0,16,0,0" Foreground="{DynamicResource SuccessBrush}"/>
+            <hc:Rate DefaultValue="3" IsReadOnly="True" AllowHalf="True" Margin="0,16,0,0" Foreground="{DynamicResource WarningBrush}"/>
+            <hc:Rate DefaultValue="1" AllowClear="False" AllowHalf="True" Margin="0,16,0,0" Foreground="{DynamicResource DangerBrush}" Icon="{StaticResource LoveGeometry}"/>
+            <hc:Rate Value="4.5" AllowHalf="True" ShowText="True" Margin="0,16,0,0" Foreground="{DynamicResource DangerBrush}" Icon="{StaticResource LoveGeometry}"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
index aad157d0..f3838904 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
@@ -1,19 +1,19 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ScrollViewerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}"
              Width="550"
              Height="600">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <Grid Margin="32">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-                <controls:ScrollViewer Orientation="Horizontal" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" IsEnableInertia="True">
+                <hc:ScrollViewer Orientation="Horizontal" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" IsEnableInertia="True">
                     <StackPanel Orientation="Horizontal">
                         <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
@@ -41,10 +41,10 @@
                             </Border>
                         </Border>
                     </StackPanel>
-                </controls:ScrollViewer>
+                </hc:ScrollViewer>
             </Border>
             <Border Grid.Row="1" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="0,16,0,0">
-                <controls:ScrollViewer IsEnableInertia="True">
+                <hc:ScrollViewer IsEnableInertia="True">
                     <WrapPanel Orientation="Horizontal">
                         <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="10,10,32,10">
                             <Border Background="{DynamicResource PrimaryBrush}">
@@ -72,8 +72,8 @@
                             </Border>
                         </Border>
                     </WrapPanel>
-                </controls:ScrollViewer>
+                </hc:ScrollViewer>
             </Border>
         </Grid>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
index cc484896..e3a154a0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
@@ -1,30 +1,30 @@
 <UserControl x:Class="HandyControlDemo.UserControl.SearchBarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding SearchBarDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
-                <controls:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}"/>
-                <controls:SearchBar Margin="0,32,0,0" IsEnabled="False"/>
+                <hc:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}"/>
+                <hc:SearchBar Margin="0,32,0,0" IsEnabled="False"/>
 
-                <controls:SearchBar controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource SearchBarExtend}"/>
-                <controls:SearchBar controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" controls:InfoElement.Necessary="True" Style="{StaticResource SearchBarExtend}"/>
-                <controls:SearchBar Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource SearchBarExtend}" Margin="0,32,0,0"/>
-                <controls:SearchBar Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource SearchBarExtend}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:SearchBar hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource SearchBarExtend}"/>
+                <hc:SearchBar hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarExtend}"/>
+                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource SearchBarExtend}" Margin="0,32,0,0"/>
+                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource SearchBarExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
             <StackPanel Margin="32,0,0,0">
-                <controls:SearchBar Name="SearchBarCustomVerify" ShowClearButton="True" Style="{StaticResource SearchBarPlus}"/>
-                <controls:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBarPlus}"/>
+                <hc:SearchBar Name="SearchBarCustomVerify" ShowClearButton="True" Style="{StaticResource SearchBarPlus}"/>
+                <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBarPlus}"/>
 
-                <controls:SearchBar ShowClearButton="True" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus}"/>
-                <controls:SearchBar TextType="Mail" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterEmail}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" controls:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus}"/>
-                <controls:SearchBar Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource SearchBarPlus}" Margin="0,32,0,0"/>
-                <controls:SearchBar ShowClearButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource SearchBarPlus}" controls:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:SearchBar ShowClearButton="True" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus}"/>
+                <hc:SearchBar TextType="Mail" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterEmail}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus}"/>
+                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource SearchBarPlus}" Margin="0,32,0,0"/>
+                <hc:SearchBar ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml
index 6676c3ef..1eb74b5a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml
@@ -1,16 +1,15 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ShieldDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Orientation="Horizontal" Margin="32">
-            <controls:Shield Subject=".net" Status=">=4.0" Color="#1182c3"/>
-            <controls:Shield Subject="c#" Status="7.0" Margin="4,0,0,0" Color="#1182c3"/>
-            <controls:Shield Subject="IDE" Status="2017" Margin="4,0,0,0" Color="#1182c3"/>
-            <controls:Shield Subject="chat" Status="on gitter" Margin="4,0,0,0" Color="#4eb899" Command="interactivity:ControlCommands.OpenLink" controls:LinkElement.Link="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
-            <controls:Shield Subject="qq" Status="714704041" Margin="4,0,0,0" Color="#d8624c" Command="interactivity:ControlCommands.OpenLink" controls:LinkElement.Link="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
+            <hc:Shield Subject=".net" Status=">=4.0" Color="#1182c3"/>
+            <hc:Shield Subject="c#" Status="7.0" Margin="4,0,0,0" Color="#1182c3"/>
+            <hc:Shield Subject="IDE" Status="2017" Margin="4,0,0,0" Color="#1182c3"/>
+            <hc:Shield Subject="chat" Status="on gitter" Margin="4,0,0,0" Color="#4eb899" Command="hc:ControlCommands.OpenLink" hc:LinkElement.Link="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
+            <hc:Shield Subject="qq" Status="714704041" Margin="4,0,0,0" Color="#d8624c" Command="hc:ControlCommands.OpenLink" hc:LinkElement.Link="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml
index b056b8ce..141f9322 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml
@@ -1,155 +1,155 @@
 <UserControl x:Class="HandyControlDemo.UserControl.SideMenuDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:command="http://www.galasoft.ch/mvvmlight"
              DataContext="{Binding SideMenuDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
 
-    <controls:TransitioningContentControl>
-        <controls:SideMenu BorderThickness="1" Width="200" Margin="32">
+    <hc:TransitioningContentControl>
+        <hc:SideMenu BorderThickness="1" Width="200" Margin="32">
             <i:Interaction.Triggers>
                 <i:EventTrigger EventName="SelectionChanged">
                     <command:EventToCommand Command="{Binding SwitchItemCmd}" PassEventArgsToCommand="True" />
                 </i:EventTrigger>
             </i:Interaction.Triggers>
-            <controls:SideMenuItem Header="Overview">
-                <controls:SideMenuItem.Icon>
+            <hc:SideMenuItem Header="Overview">
+                <hc:SideMenuItem.Icon>
                     <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-Overview.png" Width="24" Height="24"/>
-                </controls:SideMenuItem.Icon>
-                <controls:SideMenuItem Header="Summary">
-                    <controls:SideMenuItem.Icon>
+                </hc:SideMenuItem.Icon>
+                <hc:SideMenuItem Header="Summary">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf2cb;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Dashboards">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Dashboards">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf246;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Wiki">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Wiki">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xe82d;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-            </controls:SideMenuItem>
-            <controls:SideMenuItem Header="Boards">
-                <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+            </hc:SideMenuItem>
+            <hc:SideMenuItem Header="Boards">
+                <hc:SideMenuItem.Icon>
                     <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-Boards.png" Width="24" Height="24"/>
-                </controls:SideMenuItem.Icon>
-                <controls:SideMenuItem Header="Work Items">
-                    <controls:SideMenuItem.Icon>
+                </hc:SideMenuItem.Icon>
+                <hc:SideMenuItem Header="Work Items">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf314;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Boards">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Boards">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf444;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Backlogs">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Backlogs">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf6bf;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Sprints">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Sprints">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf3b0;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Queries">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Queries">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf2b8;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-            </controls:SideMenuItem>
-            <controls:SideMenuItem Header="Repos">
-                <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+            </hc:SideMenuItem>
+            <hc:SideMenuItem Header="Repos">
+                <hc:SideMenuItem.Icon>
                     <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-Repos.png" Width="24" Height="24"/>
-                </controls:SideMenuItem.Icon>
-                <controls:SideMenuItem Header="Files">
-                    <controls:SideMenuItem.Icon>
+                </hc:SideMenuItem.Icon>
+                <hc:SideMenuItem Header="Files">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf30e;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Commits">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Commits">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf293;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Pushes">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Pushes">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf298;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Branches">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Branches">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xebc2;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Tags">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Tags">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xe8ec;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Pull requests">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Pull requests">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf296;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-            </controls:SideMenuItem>
-            <controls:SideMenuItem Header="Pipelines">
-                <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+            </hc:SideMenuItem>
+            <hc:SideMenuItem Header="Pipelines">
+                <hc:SideMenuItem.Icon>
                     <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-Pipelines.png" Width="24" Height="24"/>
-                </controls:SideMenuItem.Icon>
-                <controls:SideMenuItem Header="Builds">
-                    <controls:SideMenuItem.Icon>
+                </hc:SideMenuItem.Icon>
+                <hc:SideMenuItem Header="Builds">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf28f;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Releases">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Releases">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf3b3;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Library">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Library">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xe8f1;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Task groups">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Task groups">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf2ae;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Deployment groups">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Deployment groups">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf29d;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-            </controls:SideMenuItem>
-            <controls:SideMenuItem Header="Test Plans">
-                <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+            </hc:SideMenuItem>
+            <hc:SideMenuItem Header="Test Plans">
+                <hc:SideMenuItem.Icon>
                     <Image Source="/HandyControlDemo;component/Resources/Img/DevOps/DevOps-TestPlans.png" Width="24" Height="24"/>
-                </controls:SideMenuItem.Icon>
-                <controls:SideMenuItem Header="Test Plans">
-                    <controls:SideMenuItem.Icon>
+                </hc:SideMenuItem.Icon>
+                <hc:SideMenuItem Header="Test Plans">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf3ab;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Runs">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Runs">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xf3ac;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-                <controls:SideMenuItem Header="Load test">
-                    <controls:SideMenuItem.Icon>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+                <hc:SideMenuItem Header="Load test">
+                    <hc:SideMenuItem.Icon>
                         <TextBlock Text="&#xe8a9;" Style="{StaticResource TextBlockFabricIcons}"/>
-                    </controls:SideMenuItem.Icon>
-                </controls:SideMenuItem>
-            </controls:SideMenuItem>
-        </controls:SideMenu>
-    </controls:TransitioningContentControl>
+                    </hc:SideMenuItem.Icon>
+                </hc:SideMenuItem>
+            </hc:SideMenuItem>
+        </hc:SideMenu>
+    </hc:TransitioningContentControl>
 
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml
index 581718ca..dbce1495 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="HandyControlDemo.UserControl.StepBarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding StepBarDemo,Source={StaticResource Locator}}"
              FocusManager.FocusedElement="{Binding RelativeSource={x:Static RelativeSource.Self}, Mode=OneTime}"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <Grid Margin="32" Name="PanelMain">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
@@ -18,42 +18,42 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <controls:StepBar Grid.ColumnSpan="2">
-                <controls:StepBarItem Content="{x:Static langs:Lang.Register}"/>
-                <controls:StepBarItem Content="{x:Static langs:Lang.BasicInfo}"/>
-                <controls:StepBarItem Content="{x:Static langs:Lang.UploadFile}"/>
-                <controls:StepBarItem Content="{x:Static langs:Lang.Complete}"/>
-            </controls:StepBar>
+            <hc:StepBar Grid.ColumnSpan="2">
+                <hc:StepBarItem Content="{x:Static langs:Lang.Register}"/>
+                <hc:StepBarItem Content="{x:Static langs:Lang.BasicInfo}"/>
+                <hc:StepBarItem Content="{x:Static langs:Lang.UploadFile}"/>
+                <hc:StepBarItem Content="{x:Static langs:Lang.Complete}"/>
+            </hc:StepBar>
             <StackPanel Margin="0,32" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center">
                 <Button Command="{Binding PrevCmd}" CommandParameter="{Binding ElementName=PanelMain}" Width="180" Content="{x:Static langs:Lang.Prev}" Style="{StaticResource ButtonPrimary}"/>
                 <Button Command="{Binding NextCmd}" CommandParameter="{Binding ElementName=PanelMain}" Width="180" Margin="0,16,0,0" Content="{x:Static langs:Lang.Next}" Style="{StaticResource ButtonPrimary}"/>
             </StackPanel>
-            <controls:StepBar Margin="0,0,0,32" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Dock="Bottom">
-                <controls:StepBarItem Content="{x:Static langs:Lang.Register}"/>
-                <controls:StepBarItem Content="{x:Static langs:Lang.BasicInfo}"/>
-                <controls:StepBarItem Content="{x:Static langs:Lang.UploadFile}"/>
-                <controls:StepBarItem Content="{x:Static langs:Lang.Complete}"/>
-            </controls:StepBar>
-            <controls:StepBar Grid.Column="0" Grid.Row="3" ItemsSource="{Binding DataList}" Dock="Left">
-                <controls:StepBar.ItemTemplate>
+            <hc:StepBar Margin="0,0,0,32" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Dock="Bottom">
+                <hc:StepBarItem Content="{x:Static langs:Lang.Register}"/>
+                <hc:StepBarItem Content="{x:Static langs:Lang.BasicInfo}"/>
+                <hc:StepBarItem Content="{x:Static langs:Lang.UploadFile}"/>
+                <hc:StepBarItem Content="{x:Static langs:Lang.Complete}"/>
+            </hc:StepBar>
+            <hc:StepBar Grid.Column="0" Grid.Row="3" ItemsSource="{Binding DataList}" Dock="Left">
+                <hc:StepBar.ItemTemplate>
                     <DataTemplate>
                         <StackPanel>
                             <TextBlock Text="{Binding Header}" FontSize="16" FontWeight="Bold" HorizontalAlignment="Left"/>
                             <TextBlock Margin="0,4,0,0" Text="{Binding Content}"/>
                         </StackPanel>
                     </DataTemplate>
-                </controls:StepBar.ItemTemplate>
-            </controls:StepBar>
-            <controls:StepBar Grid.Column="1" Grid.Row="3" ItemsSource="{Binding DataList}" Dock="Right">
-                <controls:StepBar.ItemTemplate>
+                </hc:StepBar.ItemTemplate>
+            </hc:StepBar>
+            <hc:StepBar Grid.Column="1" Grid.Row="3" ItemsSource="{Binding DataList}" Dock="Right">
+                <hc:StepBar.ItemTemplate>
                     <DataTemplate>
                         <StackPanel>
                             <TextBlock Text="{Binding Header}" FontSize="16" FontWeight="Bold" HorizontalAlignment="Left"/>
                             <TextBlock Margin="0,4,0,0" Text="{Binding Content}"/>
                         </StackPanel>
                     </DataTemplate>
-                </controls:StepBar.ItemTemplate>
-            </controls:StepBar>
+                </hc:StepBar.ItemTemplate>
+            </hc:StepBar>
         </Grid>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
index 2b293612..a59e9b15 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
@@ -3,73 +3,72 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
              DataContext="{Binding TabControlDemo,Source={StaticResource Locator}}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-        <controls:ScrollViewer HorizontalScrollBarVisibility="Auto">
-            <interactivity:Interaction.Triggers>
-                <interactivity:RoutedEventTrigger RoutedEvent="controls:TabItem.Closing">
-                    <interactivity:EventToCommand Command="{Binding ClosingCmd}" PassEventArgsToCommand="True" />
-                </interactivity:RoutedEventTrigger>
-                <interactivity:RoutedEventTrigger RoutedEvent="controls:TabItem.Closed">
-                    <interactivity:EventToCommand Command="{Binding ClosedCmd}" PassEventArgsToCommand="True" />
-                </interactivity:RoutedEventTrigger>
-            </interactivity:Interaction.Triggers>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+        <hc:ScrollViewer HorizontalScrollBarVisibility="Auto">
+            <hc:Interaction.Triggers>
+                <hc:RoutedEventTrigger RoutedEvent="hc:TabItem.Closing">
+                    <hc:EventToCommand Command="{Binding ClosingCmd}" PassEventArgsToCommand="True" />
+                </hc:RoutedEventTrigger>
+                <hc:RoutedEventTrigger RoutedEvent="hc:TabItem.Closed">
+                    <hc:EventToCommand Command="{Binding ClosedCmd}" PassEventArgsToCommand="True" />
+                </hc:RoutedEventTrigger>
+            </hc:Interaction.Triggers>
             <StackPanel>
                 <Label Style="{StaticResource LabelPrimary}" Content="Default" Margin="32,32,0,0" HorizontalAlignment="Left"/>
-                <controls:TabControl ShowOverflowButton="False" ShowScrollButton="True" Margin="32,16,32,0" Width="800" Height="300" IsScrollable="True">
-                    <controls:TabItem Header="TabItem1">
-                        <controls:SimplePanel Background="White"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem2">
-                        <controls:SimplePanel Background="{DynamicResource DarkDangerBrush}"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem3" IsSelected="True">
-                        <controls:SimplePanel Background="{DynamicResource PrimaryBrush}"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem4">
-                        <controls:SimplePanel Background="{DynamicResource DarkInfoBrush}"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem5">
-                        <controls:SimplePanel Background="{DynamicResource DarkSuccessBrush}"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem6">
-                        <controls:SimplePanel Background="{DynamicResource DarkWarningBrush}"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem7">
-                        <controls:SimplePanel Background="{DynamicResource DarkAccentBrush}"/>
-                    </controls:TabItem>
-                </controls:TabControl>
+                <hc:TabControl ShowOverflowButton="False" ShowScrollButton="True" Margin="32,16,32,0" Width="800" Height="300" IsScrollable="True">
+                    <hc:TabItem Header="TabItem1">
+                        <hc:SimplePanel Background="White"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem2">
+                        <hc:SimplePanel Background="{DynamicResource DarkDangerBrush}"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem3" IsSelected="True">
+                        <hc:SimplePanel Background="{DynamicResource PrimaryBrush}"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem4">
+                        <hc:SimplePanel Background="{DynamicResource DarkInfoBrush}"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem5">
+                        <hc:SimplePanel Background="{DynamicResource DarkSuccessBrush}"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem6">
+                        <hc:SimplePanel Background="{DynamicResource DarkWarningBrush}"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem7">
+                        <hc:SimplePanel Background="{DynamicResource DarkAccentBrush}"/>
+                    </hc:TabItem>
+                </hc:TabControl>
                 <StackPanel Orientation="Horizontal" Margin="32,32,32,16">
                     <Label Style="{StaticResource LabelPrimary}" Margin="0" Content="IsEnableTabFill = True"/>
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="ShowCloseButton = True"/>
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsDraggable = True"/>
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsEnableAnimation = True"/>
                 </StackPanel>
-                <controls:TabControl IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
-                    <controls:TabItem Header="TabItem1">
-                        <controls:SimplePanel Background="White"/>
-                    </controls:TabItem>
-                    <controls:TabItem IsSelected="True" Header="TabItem2">
-                        <controls:SimplePanel Background="#FFE8563F"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem3">
-                        <controls:SimplePanel Background="#FF3F4EE8"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem4">
-                        <controls:SimplePanel Background="#FFE83F6D"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem5">
-                        <controls:SimplePanel Background="#FFB23FE8"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem6">
-                        <controls:SimplePanel Background="#FF3FE8E8"/>
-                    </controls:TabItem>
-                    <controls:TabItem Header="TabItem7">
-                        <controls:SimplePanel Background="#FFE8E03F"/>
-                    </controls:TabItem>
-                </controls:TabControl>
+                <hc:TabControl IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
+                    <hc:TabItem Header="TabItem1">
+                        <hc:SimplePanel Background="White"/>
+                    </hc:TabItem>
+                    <hc:TabItem IsSelected="True" Header="TabItem2">
+                        <hc:SimplePanel Background="#FFE8563F"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem3">
+                        <hc:SimplePanel Background="#FF3F4EE8"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem4">
+                        <hc:SimplePanel Background="#FFE83F6D"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem5">
+                        <hc:SimplePanel Background="#FFB23FE8"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem6">
+                        <hc:SimplePanel Background="#FF3FE8E8"/>
+                    </hc:TabItem>
+                    <hc:TabItem Header="TabItem7">
+                        <hc:SimplePanel Background="#FFE8E03F"/>
+                    </hc:TabItem>
+                </hc:TabControl>
             </StackPanel>
-        </controls:ScrollViewer>
-    </controls:TransitioningContentControl>
+        </hc:ScrollViewer>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml
index 8d499982..0ac67347 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml
@@ -3,19 +3,19 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-        <controls:TagPanel AddTagButtonClick="TagPanel_OnAddTagButtonClick" Margin="32" Orientation="Horizontal" MaxWidth="400" VerticalAlignment="Center" ShowAddButton="True">
-            <controls:Tag ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
-            <controls:Tag Selectable="True" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
-            <controls:Tag ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
-            <controls:Tag Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
-            <controls:Tag IsSelected="True" Selectable="True" ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
-            <controls:Tag Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
-            <controls:Tag ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
-            <controls:Tag IsSelected="True" Selectable="True" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
-            <controls:Tag ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
-            <controls:Tag Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
-        </controls:TagPanel>   
-    </controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+        <hc:TagPanel AddTagButtonClick="TagPanel_OnAddTagButtonClick" Margin="32" Orientation="Horizontal" MaxWidth="400" VerticalAlignment="Center" ShowAddButton="True">
+            <hc:Tag ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+            <hc:Tag Selectable="True" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
+            <hc:Tag ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
+            <hc:Tag Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
+            <hc:Tag IsSelected="True" Selectable="True" ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
+            <hc:Tag Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
+            <hc:Tag ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+            <hc:Tag IsSelected="True" Selectable="True" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
+            <hc:Tag ShowCloseButton="False" Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
+            <hc:Tag Content="{Binding Source={x:Static langs:Lang.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
+        </hc:TagPanel>   
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
index 3f111f30..6e89f2a4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
@@ -3,16 +3,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
-            <controls:TextBox ShowClearButton="True" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-            <controls:TextBox Text="{x:Static langs:Lang.ContentDemoStr}" Margin="0,16,0,0" IsEnabled="False"/>
+            <hc:TextBox ShowClearButton="True" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+            <hc:TextBox Text="{x:Static langs:Lang.ContentDemoStr}" Margin="0,16,0,0" IsEnabled="False"/>
 
-            <controls:TextBox ShowClearButton="True" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-            <controls:TextBox TextType="Mail" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterEmail}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-            <controls:TextBox Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-            <controls:TextBox ShowClearButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+            <hc:TextBox ShowClearButton="True" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+            <hc:TextBox TextType="Mail" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterEmail}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+            <hc:TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+            <hc:TextBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml
index af1a3915..1ac842a5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="HandyControlDemo.UserControl.TimeBarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:TimeBar BorderThickness="0" Margin="32" Width="600"  VerticalAlignment="Center"/>
-    </controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
+        <hc:TimeBar BorderThickness="0" Margin="32" Width="600"  VerticalAlignment="Center"/>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
index 0c4355c8..b79b4d8c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
@@ -1,35 +1,35 @@
 <UserControl x:Class="HandyControlDemo.UserControl.TimePickerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
-                <controls:TimePicker ShowClearButton="True"/>
-                <controls:TimePicker Margin="0,16,0,0" IsEnabled="False"/>
+                <hc:TimePicker ShowClearButton="True"/>
+                <hc:TimePicker Margin="0,16,0,0" IsEnabled="False"/>
 
-                <controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerExtend}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
-                <controls:TimePicker controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource TimePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
+                <hc:TimePicker hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <controls:TimePicker ShowClearButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" Style="{StaticResource TimePickerExtend}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
-                <controls:TimePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TimePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:TimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
+                <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
             </StackPanel>
             <StackPanel Margin="32,0,0,0">
-                <controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}">
-                    <controls:TimePicker.Clock>
-                        <controls:ListClock/>
-                    </controls:TimePicker.Clock>
-                </controls:TimePicker>
-                <controls:TimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TimePickerPlus}"/>
+                <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}">
+                    <hc:TimePicker.Clock>
+                        <hc:ListClock/>
+                    </hc:TimePicker.Clock>
+                </hc:TimePicker>
+                <hc:TimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TimePickerPlus}"/>
 
-                <controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
-                <controls:TimePicker controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource TimePickerPlus}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
+                <hc:TimePicker hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <controls:TimePicker ShowClearButton="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" Style="{StaticResource TimePickerPlus}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
-                <controls:TimePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TimePickerPlus}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:TimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
+                <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml
index 26fe4d17..ff19fa3e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml
@@ -2,14 +2,14 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-        <controls:Transfer ItemsSource="{Binding DataList}" Margin="32" Height="300">
-            <controls:Transfer.ItemTemplate>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+        <hc:Transfer ItemsSource="{Binding DataList}" Margin="32" Height="300">
+            <hc:Transfer.ItemTemplate>
                 <DataTemplate>
                     <TextBlock Text="{Binding Name}"/>
                 </DataTemplate>
-            </controls:Transfer.ItemTemplate>
-        </controls:Transfer>
-    </controls:TransitioningContentControl>
+            </hc:Transfer.ItemTemplate>
+        </hc:Transfer>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml
index 7ba4b060..fbde3ef4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml
@@ -1,20 +1,19 @@
 <UserControl x:Class="HandyControlDemo.UserControl.WaterfallPanelDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <Grid Margin="32">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <controls:NumericUpDown x:Name="UpDownGroups" HorizontalAlignment="Center" Value="2" Minimum="1" Maximum="3" Width="200" Style="{StaticResource NumericUpDownExtend}" controls:TitleElement.Title="{x:Static langs:Lang.Groups}" controls:TitleElement.TitleWidth="50" controls:TitleElement.TitleAlignment="Left"/>
+            <hc:NumericUpDown x:Name="UpDownGroups" HorizontalAlignment="Center" Value="2" Minimum="1" Maximum="3" Width="200" Style="{StaticResource NumericUpDownExtend}" hc:TitleElement.Title="{x:Static langs:Lang.Groups}" hc:TitleElement.TitleWidth="50" hc:TitleElement.TitleAlignment="Left"/>
             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,16,0,0">
-                <controls:ScrollViewer MaxHeight="300">
-                    <controls:WaterfallPanel VerticalAlignment="Center" Width="300" Groups="{Binding Value,ElementName=UpDownGroups}" controls:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}">
+                <hc:ScrollViewer MaxHeight="300">
+                    <hc:WaterfallPanel VerticalAlignment="Center" Width="300" Groups="{Binding Value,ElementName=UpDownGroups}" hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}">
                         <Border Height="100" Background="{DynamicResource PrimaryBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
                             <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                         </Border>
@@ -30,10 +29,10 @@
                         <Border Height="100" Background="{DynamicResource WarningBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
                             <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                         </Border>
-                    </controls:WaterfallPanel>
-                </controls:ScrollViewer>
-                <controls:ScrollViewer Margin="32,0,0,0" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" Orientation="Horizontal" MaxWidth="300">
-                    <controls:WaterfallPanel VerticalAlignment="Center" Height="300" Orientation="Vertical" Groups="{Binding Value,ElementName=UpDownGroups}" controls:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}">
+                    </hc:WaterfallPanel>
+                </hc:ScrollViewer>
+                <hc:ScrollViewer Margin="32,0,0,0" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" Orientation="Horizontal" MaxWidth="300">
+                    <hc:WaterfallPanel VerticalAlignment="Center" Height="300" Orientation="Vertical" Groups="{Binding Value,ElementName=UpDownGroups}" hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}">
                         <Border Width="100" Background="{DynamicResource PrimaryBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
                             <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                         </Border>
@@ -49,9 +48,9 @@
                         <Border Width="100" Background="{DynamicResource WarningBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
                             <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                         </Border>
-                    </controls:WaterfallPanel>
-                </controls:ScrollViewer>
+                    </hc:WaterfallPanel>
+                </hc:ScrollViewer>
             </StackPanel>
         </Grid>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
index 52dc1d5f..7417064e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="HandyControlDemo.UserControl.WindowDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:data="clr-namespace:HandyControlDemo.Data"
              DataContext="{Binding WindowDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <UniformGrid Margin="32" Columns="3" Rows="3" Height="200">
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CommonWindow}" Content="{x:Static langs:Lang.OpenCommonWindow}"/>
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.BlurWindow}" Content="{x:Static langs:Lang.OpenBlurWindow}"/>
@@ -17,5 +17,5 @@
             <Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{x:Static langs:Lang.OpenMouseFollowWindow}"/>
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{x:Static langs:Lang.OpenNoNonClientAreaDragableWindow}"/>
         </UniformGrid>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index 5ec9a609..68c9e290 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -1,11 +1,11 @@
-<Border controls:ScrollViewer.IsEnableInertia="True"
+<Border hc:ScrollViewer.IsEnableInertia="True"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:command="http://www.galasoft.ch/mvvmlight"
         x:Class="HandyControlDemo.UserControl.LeftMainContent"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:data="clr-namespace:HandyControlDemo.Data"
         Background="{Binding Background,RelativeSource={RelativeSource AncestorType=Window}}"
-        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
     <DockPanel>
@@ -26,150 +26,150 @@
                         <ColumnDefinition/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <controls:SearchBar x:Name="SearchBarStyle" SearchStarted="SearchBarStyle_OnSearchStarted" Style="{StaticResource SearchBarPlus}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4"/>
+                    <hc:SearchBar x:Name="SearchBarStyle" SearchStarted="SearchBarStyle_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4"/>
                     <ToggleButton Name="ButtonStyleAscending" Click="ButtonStyleAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
                         <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
                             <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
                         </Border>
-                        <controls:StatusSwitchElement.CheckedElement>
+                        <hc:StatusSwitchElement.CheckedElement>
                             <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
-                        </controls:StatusSwitchElement.CheckedElement>
+                        </hc:StatusSwitchElement.CheckedElement>
                     </ToggleButton>
                     <ListBox Name="ListBoxStyle" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
                         <ListBoxItem Tag="{x:Static data:MessageToken.BrushDemoCtl}" Content="{x:Static langs:Lang.Brush}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Brush_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ButtonDemoCtl}" Content="{x:Static langs:Lang.Button}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ButtonClick_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.RepeatButtonDemoCtl}" Content="{x:Static langs:Lang.RepeatButton}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/RepeatButton_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ToggleButtonDemoCtl}" Content="{x:Static langs:Lang.ToggleButton}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Toggle_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.RadioButtonDemoCtl}" Content="{x:Static langs:Lang.RadioButton}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/RadioButton_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.CheckBoxDemoCtl}" Content="{x:Static langs:Lang.CheckBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/CheckBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NativeScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.SliderDemoCtl}" Content="{x:Static langs:Lang.Slider}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Slider_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.TextBlockDemoCtl}" Content="{x:Static langs:Lang.TextBlock}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NativeTextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NativeComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NativePasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ExpanderDemoCtl}" Content="{x:Static langs:Lang.Expander}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Expander_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NativeProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.CalendarDemoCtl}" Content="{x:Static langs:Lang.Calendar}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NativeDatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NativeTabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.DataGridDemoCtl}" Content="{x:Static langs:Lang.DataGrid}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/DataGrid_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.TreeViewDemoCtl}" Content="{x:Static langs:Lang.TreeView}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/TreeView_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ListBoxDemoCtl}" Content="{x:Static langs:Lang.ListBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ListBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ListViewDemoCtl}" Content="{x:Static langs:Lang.ListView}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ListView_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.GroupBoxDemoCtl}" Content="{x:Static langs:Lang.GroupBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/GroupBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.MenuDemoCtl}" Content="{x:Static langs:Lang.Menu}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ContextMenu_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.RichTextBoxDemoCtl}" Content="{x:Static langs:Lang.RichTextBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/RichTextBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ToolBarDemoCtl}" Content="{x:Static langs:Lang.ToolBar}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ToolBar_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.BorderDemoCtl}" Name="ListBoxItemBorder">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/BorderElement_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.LabelDemoCtl}" Content="{x:Static langs:Lang.Label}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Label_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
 
                     </ListBox>
@@ -185,240 +185,240 @@
                         <ColumnDefinition/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <controls:SearchBar SearchStarted="SearchBarControl_OnSearchStarted" Style="{StaticResource SearchBarPlus}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4"/>
+                    <hc:SearchBar SearchStarted="SearchBarControl_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterKey}" Margin="4"/>
                     <ToggleButton Name="ButtonControlAscending" Click="ButtonControlAscending_OnClick" Grid.Row="0" Grid.Column="1" Margin="0,0,4,0" Style="{StaticResource ToggleButtonCustom}">
                         <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" Height="30" Width="30" >
                             <Image Stretch="None" Source="/HandyControlDemo;component/Resources/Img/LeftMainContent/SortAscending_grey_16x.png"/>
                         </Border>
-                        <controls:StatusSwitchElement.CheckedElement>
+                        <hc:StatusSwitchElement.CheckedElement>
                             <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
-                        </controls:StatusSwitchElement.CheckedElement>
+                        </hc:StatusSwitchElement.CheckedElement>
                     </ToggleButton>
                     <ListBox Name="ListBoxControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single"  Style="{StaticResource ListBoxTransparent}">
                         <ListBoxItem Tag="{x:Static data:MessageToken.GravatarDemoCtl}" Content="{x:Static langs:Lang.Gravatar}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/User_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.BadgeDemoCtl}" Content="{x:Static langs:Lang.Badge}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/DotLarge_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.GotoTopDemoCtl}" Content="{x:Static langs:Lang.GotoTop}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/GoToTop_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ProgressButtonDemoCtl}" Content="{x:Static langs:Lang.ProgressButton}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ProgressButton_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ChatBubbleDemoCtl}" Content="{x:Static langs:Lang.ChatBubble}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Bubble_16xLG.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.NotifyIconDemoCtl}" Content="{x:Static langs:Lang.NotifyIcon}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/NotificationHub_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NumericUpDownDemoCtl}" Content="{x:Static langs:Lang.NumericUpDown}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/NumericListBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.TextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.PasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.DatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ClockDemoCtl}" Content="{x:Static langs:Lang.Clock}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Time_color_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.TimePickerDemoCtl}" Content="{x:Static langs:Lang.TimePicker}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/TimePicker_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.CalendarWithClockDemoCtl}" Content="{x:Static langs:Lang.CalendarWithClock}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.DateTimePickerDemoCtl}" Content="{x:Static langs:Lang.DateTimePicker}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.TransferDemoCtl}" Content="{x:Static langs:Lang.Transfer}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Transfer_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.FlipClockDemoCtl}" Content="{x:Static langs:Lang.FlipClock}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/FlipVertical_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.RateDemoCtl}" Content="{x:Static langs:Lang.Rate}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Star.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ShieldDemoCtl}" Content="{x:Static langs:Lang.Shield}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Shield_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.SearchBarDemoCtl}" Content="{x:Static langs:Lang.SearchBar}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Search_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.TagDemoCtl}" Content="{x:Static langs:Lang.Tag}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Tag_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.GifImageDemoCtl}" Content="{x:Static langs:Lang.GifImage}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Animation_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.OutlineTextDemoCtl}" Content="{x:Static langs:Lang.OutlineText}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.CirclePanelDemoCtl}" Content="{x:Static langs:Lang.CirclePanel}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ColorWheel_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.GridDemoCtl}" Content="{x:Static langs:Lang.Grid}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/GridPane_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.WaterfallPanelDemoCtl}" Content="{x:Static langs:Lang.WaterfallPanel}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Panel_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.CoverViewDemoCtl}" Content="{x:Static langs:Lang.CoverView}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/DetailDataView_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.CoverFlowDemoCtl}" Content="{x:Static langs:Lang.CoverFlow}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/LinearCarousel_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.StepBarDemoCtl}" Content="{x:Static langs:Lang.StepBar}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Flow_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.GrowlDemoCtl}" Content="{x:Static langs:Lang.Growl}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Message_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.LoadingDemoCtl}" Content="{x:Static langs:Lang.Loading}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Loading_Blue_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ImageBrowserDemoCtl}" Content="{x:Static langs:Lang.ImageBrowser}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ImageBrowser_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ColorPickerDemoCtl}" Content="{x:Static langs:Lang.ColorPicker}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ColorPalette_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.CarouselDemoCtl}" Content="{x:Static langs:Lang.Carousel}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Carousel_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.CompareSliderDemoCtl}" Content="{x:Static langs:Lang.CompareSlider}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/SplitterControl_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.PreviewSliderDemoCtl}" Content="{x:Static langs:Lang.PreviewSlider}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/HoverMenu_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.TimeBarDemoCtl}" Content="{x:Static langs:Lang.TimeBar}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Timeline_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.PaginationDemoCtl}" Content="{x:Static langs:Lang.Pagination}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Paginator_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.AnimationPathDemoCtl}" Content="{x:Static langs:Lang.AnimationPath}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Path_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.TabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.SideMenuDemoCtl}" Content="{x:Static langs:Lang.SideMenu}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/MainMenuControl_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.ScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.DialogDemoCtl}" Content="{x:Static langs:Lang.Dialog}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Dialog_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
-                            <controls:EdgeElement.LeftContent>
+                            <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
+                            </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
                     </ListBox>
                 </Grid>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
index 2cde78c4..20b57781 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
@@ -2,48 +2,47 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
-             Background="{DynamicResource RegionBrush}"
+             Background="{DynamicResource SecondaryRegionBrush}"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
-             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl">
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:userControl="clr-namespace:HandyControlDemo.UserControl">
     <ScrollViewer HorizontalScrollBarVisibility="Auto">
-        <Canvas HorizontalAlignment="Center" VerticalAlignment="Center" Name="CanvasMain" Margin="32" Width="1665" Height="1300" Effect="{StaticResource EffectShadow5}">
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4">
+        <Canvas HorizontalAlignment="Center" VerticalAlignment="Center" Name="CanvasMain" Margin="32" Width="1665" Height="1300">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4">
                 <StackPanel>
                     <Button Width="80" Content="Button" Margin="0,0,0,10"/>
                     <Button Width="80" Content="Button" Style="{StaticResource ButtonPrimary}" Margin="0,0,0,10"/>
-                    <Button Width="80" Padding="16,8" controls:IconElement.Geometry="{StaticResource DeleteGeometry}" Margin="0,0,0,10"/>
-                    <Button Width="80" Content="Clock"  Margin="0,0,0,10" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                    <Button Width="80"  Margin="0,0,0,10" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="Button" Style="{StaticResource ButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
-                    <Button Width="80" Padding="16,8" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                    <Button Width="80" Padding="16,8" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Margin="0,0,0,10"/>
+                    <Button Width="80" Content="Clock"  Margin="0,0,0,10" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                    <Button Width="80"  Margin="0,0,0,10" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="Button" Style="{StaticResource ButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                    <Button Width="80" Padding="16,8" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                 </StackPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128">
                 <StackPanel>
                     <ToggleButton Width="128" Margin="0,0,0,10" IsChecked="True" Content="ToggleButton"/>
                     <ToggleButton Width="128" Margin="0,0,0,10" Content="ToggleButton" Style="{StaticResource ToggleButtonPrimary}"/>
-                    <ToggleButton Width="128" Margin="0,0,0,10" Style="{StaticResource ToggleButtonIcon}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                    <ToggleButton Width="128" Margin="0,0,0,10" IsChecked="True" Content="ToggleButton" controls:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonPrimary}"/>
-                    <ToggleButton Margin="0,0,0,10" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" controls:StatusSwitchElement.HideUncheckedElement="True">
-                        <controls:StatusSwitchElement.CheckedElement>
+                    <ToggleButton Width="128" Margin="0,0,0,10" Style="{StaticResource ToggleButtonIcon}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                    <ToggleButton Width="128" Margin="0,0,0,10" IsChecked="True" Content="ToggleButton" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonPrimary}"/>
+                    <ToggleButton Margin="0,0,0,10" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+                        <hc:StatusSwitchElement.CheckedElement>
                             <Border Width="128" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                                 <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                             </Border>
-                        </controls:StatusSwitchElement.CheckedElement>
+                        </hc:StatusSwitchElement.CheckedElement>
                         <Border Width="128" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                             <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                         </Border>
                     </ToggleButton>
                     <ToggleButton Margin="0,0,0,10" IsChecked="True" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonSwitch}"/>
-                    <ToggleButton Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                    <ToggleButton Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
                 </StackPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611">
                 <userControl:SideMenuDemoCtl Height="424" Margin="-32" Background="Transparent"/>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="304">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="304">
                 <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                         <StackPanel>
@@ -53,41 +52,41 @@
                             <RadioButton Margin="0,16,0,0" Content="Radio" IsEnabled="False"/>
                         </StackPanel>
                         <UniformGrid Margin="22,0,0,0" Rows="2" Columns="2">
-                            <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="Radio"/>
+                            <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="Radio"/>
                             <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" Style="{StaticResource RadioButtonIcon}" Content="Radio" IsChecked="True"/>
-                            <RadioButton Margin="10,0,0,0" BorderThickness="1" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="Radio"/>
+                            <RadioButton Margin="10,0,0,0" BorderThickness="1" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="Radio"/>
                             <RadioButton Margin="10,0,0,0" BorderThickness="1" Style="{StaticResource RadioButtonIcon}" Content="Radio"/>
                         </UniformGrid>
                     </StackPanel>
-                    <controls:RadioGroup Margin="0,32,0,0">
+                    <hc:RadioGroup Margin="0,32,0,0">
                         <RadioButton Content="Radio" IsChecked="True"/>
                         <RadioButton Content="Radio"/>
                         <RadioButton IsEnabled="False" Content="Radio"/>
                         <RadioButton Content="Radio"/>
-                    </controls:RadioGroup>
-                    <controls:RadioGroup Margin="0,16,0,0" Style="{StaticResource RadioGroupSolid}">
+                    </hc:RadioGroup>
+                    <hc:RadioGroup Margin="0,16,0,0" Style="{StaticResource RadioGroupSolid}">
                         <RadioButton Content="Radio"/>
                         <RadioButton Content="Radio"/>
                         <RadioButton IsEnabled="False" Content="Radio"/>
                         <RadioButton Content="Radio" IsChecked="True"/>
-                    </controls:RadioGroup>
+                    </hc:RadioGroup>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <controls:RadioGroup Margin="0,16,8,0" Orientation="Vertical">
+                        <hc:RadioGroup Margin="0,16,8,0" Orientation="Vertical">
                             <RadioButton Content="Radio" IsChecked="True"/>
                             <RadioButton Content="Radio"/>
                             <RadioButton IsEnabled="False" Content="Radio"/>
                             <RadioButton Content="Radio"/>
-                        </controls:RadioGroup>
-                        <controls:RadioGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource RadioGroupSolid}">
+                        </hc:RadioGroup>
+                        <hc:RadioGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource RadioGroupSolid}">
                             <RadioButton Content="Radio"/>
                             <RadioButton Content="Radio"/>
                             <RadioButton IsEnabled="False" Content="Radio"/>
                             <RadioButton Content="Radio" IsChecked="True"/>
-                        </controls:RadioGroup>
+                        </hc:RadioGroup>
                     </StackPanel>
                 </StackPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="276" Height="226">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="276" Height="226">
                 <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                     <CheckBox Content="CheckBox" IsChecked="True"/>
                     <CheckBox Margin="0,16,0,0" Content="CheckBox" IsChecked="True" IsEnabled="False"/>
@@ -97,16 +96,16 @@
                     <CheckBox Margin="0,16,0,0" Content="CheckBox" IsChecked="{x:Null}" IsEnabled="False"/>
                 </StackPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="516">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="516">
                 <StackPanel>
                     <Slider Width="400" IsSnapToTickEnabled="True" Value="8"/>
                     <Slider Width="400" IsSnapToTickEnabled="True" Value="3" Margin="0,32,0,0" IsEnabled="False"/>
                     <Slider Width="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="10" SelectionEnd="80" Margin="0,32,0,0"/>
-                    <Slider Width="400" controls:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
-                    <Slider Width="400" controls:TipElement.Visibility="Visible" controls:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="0,32,0,0"/>
+                    <Slider Width="400" hc:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
+                    <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="0,32,0,0"/>
                 </StackPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="806" Width="349">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="806" Width="349">
                 <TabControl Height="200" Style="{StaticResource TabControlInLine}">
                     <TabItem Header="Title" HeaderStringFormat="{}{0}1">
                         <Border Background="{DynamicResource PrimaryBrush}">
@@ -150,14 +149,14 @@
                     </TabItem>
                 </TabControl>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="859" Width="240">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="859" Width="240">
                 <StackPanel>
                     <ProgressBar Value="20" Margin="0,0,0,10"/>
                     <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" Margin="0,0,0,10" Value="120" Maximum="200" />
                     <ProgressBar Style="{StaticResource ProgressBarFlat}" Margin="0,8,0,10" Value="110" Maximum="200" />
                 </StackPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="859" Height="264" Canvas.Top="130">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="859" Height="264" Canvas.Top="130">
                 <ScrollViewer>
                     <StackPanel VerticalAlignment="Top">
                         <Expander Header="Title" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Width="206" HorizontalAlignment="Left">
@@ -175,13 +174,13 @@
                     </StackPanel>
                 </ScrollViewer>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113">
                 <Calendar SelectionMode="MultipleRange"/>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1421" Height="346">
-                <controls:Clock/>
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1421" Height="346">
+                <hc:Clock/>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Height="326" Canvas.Top="408" Width="488">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Height="326" Canvas.Top="408" Width="488">
                 <DataGrid HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
                     <DataGrid.RowHeaderTemplate>
                         <DataTemplate>
@@ -204,7 +203,7 @@
                     </DataGrid.Columns>
                 </DataGrid>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="363" Height="234" Canvas.Top="806">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="363" Height="234" Canvas.Top="806">
                 <TreeView Width="200" ItemsSource="{Binding DataList}">
                     <TreeView.ItemTemplate>
                         <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
@@ -213,7 +212,7 @@
                     </TreeView.ItemTemplate>
                 </TreeView>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1158" Height="334" Canvas.Top="748" Width="219">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1158" Height="334" Canvas.Top="748" Width="219">
                 <ListBox ItemsSource="{Binding DataList}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
@@ -222,14 +221,14 @@
                     </ListBox.ItemTemplate>
                 </ListBox>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113" Canvas.Top="360" Width="264">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113" Canvas.Top="360" Width="264">
                 <GroupBox Height="200" Header="GroupBox" Padding="10" Margin="0,0,-2,0" >
                     <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
                         <TextBlock Text="GroupBox" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                     </Border>
                 </GroupBox>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="1054" Width="597">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Top="1054" Width="597">
                 <ToolBarTray VerticalAlignment="Center">
                     <ToolBar Padding="6">
                         <CheckBox IsChecked="True" Margin="10,0,0,0"/>
@@ -281,83 +280,83 @@
                     </ToolBar>
                 </ToolBarTray>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1391" Canvas.Top="360">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1391" Canvas.Top="360">
                 <UniformGrid Rows="3" Columns="3" Width="240" Height="240">
-                    <controls:Gravatar Id="User1"/>
-                    <controls:Gravatar Id="User2"/>
-                    <controls:Gravatar Style="{StaticResource GravatarCircleImg}">
+                    <hc:Gravatar Id="User1"/>
+                    <hc:Gravatar Id="User2"/>
+                    <hc:Gravatar Style="{StaticResource GravatarCircleImg}">
                         <Image Source="/HandyControlDemo;component/Resources/Img/Album/2.jpg"/>
-                    </controls:Gravatar>
-                    <controls:Gravatar Id="User4"/>
-                    <controls:Gravatar Id="User5" Style="{StaticResource GravatarCircle}"/>
-                    <controls:Gravatar Id="User6"/>
-                    <controls:Gravatar Style="{StaticResource GravatarCircle}" Source="/HandyControlDemo;component/Resources/Img/Album/1.jpg"/>
-                    <controls:Gravatar Id="User8"/>
-                    <controls:Gravatar Id="User9"/>
+                    </hc:Gravatar>
+                    <hc:Gravatar Id="User4"/>
+                    <hc:Gravatar Id="User5" Style="{StaticResource GravatarCircle}"/>
+                    <hc:Gravatar Id="User6"/>
+                    <hc:Gravatar Style="{StaticResource GravatarCircle}" Source="/HandyControlDemo;component/Resources/Img/Album/1.jpg"/>
+                    <hc:Gravatar Id="User8"/>
+                    <hc:Gravatar Id="User9"/>
                 </UniformGrid>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="448" Canvas.Top="516" Height="276" Width="149">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="448" Canvas.Top="516" Height="276" Width="149">
                 <StackPanel VerticalAlignment="Center">
-                    <controls:Badge HorizontalAlignment="Center" Text="New" BadgeMargin="0,-14,-20,0" Height="30">
+                    <hc:Badge HorizontalAlignment="Center" Text="New" BadgeMargin="0,-14,-20,0" Height="30">
                         <Button Content="Comment"/>
-                    </controls:Badge>
-                    <controls:Badge DataContext="{Binding BadgeDemo, Source={StaticResource Locator}}" HorizontalAlignment="Center" Value="{Binding Count}" BadgeMargin="0,-14,-10,0" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgePrimary}">
+                    </hc:Badge>
+                    <hc:Badge DataContext="{Binding BadgeDemo, Source={StaticResource Locator}}" HorizontalAlignment="Center" Value="{Binding Count}" BadgeMargin="0,-14,-10,0" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgePrimary}">
                         <Button Content="Click2Count" Command="{Binding CountCmd}"/>
-                    </controls:Badge>
-                    <controls:Badge HorizontalAlignment="Center" Value="100" BadgeMargin="0,-14,-20,0" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
+                    </hc:Badge>
+                    <hc:Badge HorizontalAlignment="Center" Value="100" BadgeMargin="0,-14,-20,0" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
                         <Button Content="Comment"/>
-                    </controls:Badge>
-                    <controls:Badge HorizontalAlignment="Center" Status="Dot" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
+                    </hc:Badge>
+                    <hc:Badge HorizontalAlignment="Center" Status="Dot" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
                         <Button Content="Reply"/>
-                    </controls:Badge>
-                    <controls:Badge HorizontalAlignment="Center" Status="Processing" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
+                    </hc:Badge>
+                    <hc:Badge HorizontalAlignment="Center" Status="Processing" Height="30" Margin="0,16,0,0" Style="{StaticResource BadgeDanger}">
                         <Button Content="Reply" />
-                    </controls:Badge>
+                    </hc:Badge>
                 </StackPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128" Canvas.Top="310" Width="162" Height="84">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128" Canvas.Top="310" Width="162" Height="84">
                 <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <controls:Shield Subject="chat" Status="on gitter" Margin="0,0,0,0" Color="#4eb899" Command="interactivity:ControlCommands.OpenLink" controls:LinkElement.Link="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
-                    <controls:Shield Subject="qq" Status="714704041" Margin="0,4,0,0" Color="#d8624c" Command="interactivity:ControlCommands.OpenLink" controls:LinkElement.Link="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
+                    <hc:Shield Subject="chat" Status="on gitter" Margin="0,0,0,0" Color="#4eb899" Command="hc:ControlCommands.OpenLink" hc:LinkElement.Link="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
+                    <hc:Shield Subject="qq" Status="714704041" Margin="0,4,0,0" Color="#d8624c" Command="hc:ControlCommands.OpenLink" hc:LinkElement.Link="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
                 </WrapPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128" Canvas.Top="408">
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128" Canvas.Top="408">
                 <StackPanel Orientation="Horizontal">
                     <StackPanel Width="271" VerticalAlignment="Center" Margin="0,0,32,0">
-                        <controls:LoadingLine/>
-                        <controls:LoadingLine Margin="0,28,0,0" Foreground="BlueViolet" Style="{StaticResource LoadingLineLarge}"/>
+                        <hc:LoadingLine/>
+                        <hc:LoadingLine Margin="0,28,0,0" Foreground="BlueViolet" Style="{StaticResource LoadingLineLarge}"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <controls:LoadingCircle/>
+                        <hc:LoadingCircle/>
                         <Border VerticalAlignment="Center" Margin="32,0,0,0" Background="{DynamicResource PrimaryBrush}" CornerRadius="10">
-                            <controls:LoadingCircle Style="{StaticResource LoadingCircleLight}" Margin="10"/>
+                            <hc:LoadingCircle Style="{StaticResource LoadingCircleLight}" Margin="10"/>
                         </Border>
                     </StackPanel>
                 </StackPanel>
             </Border>
-            <Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Canvas.Top="748" Height="214">
-                <controls:Transfer ItemsSource="{Binding DataList}">
-                    <controls:Transfer.ItemTemplate>
+            <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Canvas.Top="748" Height="214">
+                <hc:Transfer ItemsSource="{Binding DataList}">
+                    <hc:Transfer.ItemTemplate>
                         <DataTemplate>
                             <TextBlock Text="{Binding Name}"/>
                         </DataTemplate>
-                    </controls:Transfer.ItemTemplate>
-                </controls:Transfer>
+                    </hc:Transfer.ItemTemplate>
+                </hc:Transfer>
             </Border>
-            <Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Canvas.Top="976">
+            <Border Visibility="Collapsed" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Canvas.Top="976">
                 <userControl:CoverFlowDemoCtl Width="563" Margin="-32" Background="Transparent"/>
             </Border>
-            <Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1391" Canvas.Top="648" Width="274">
+            <Border Visibility="Collapsed" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1391" Canvas.Top="648" Width="274">
                 <userControl:ColorPickerDemoCtl Margin="-32" Background="Transparent"/>
             </Border>
-            <Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113" Canvas.Top="608" Width="264" Height="126">
-                <controls:TagPanel Orientation="Horizontal" MaxWidth="400" VerticalAlignment="Center">
-                    <controls:Tag ShowCloseButton="False" Content="TextText"/>
-                    <controls:Tag Content="Text"/>
-                    <controls:Tag IsSelected="True" Selectable="True" ShowCloseButton="False" Content="Text"/>
-                    <controls:Tag IsSelected="True" Selectable="True" Content="Text"/>
-                    <controls:Tag ShowCloseButton="False" Content="TextText"/>
-                </controls:TagPanel>
+            <Border Visibility="Collapsed" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113" Canvas.Top="608" Width="264" Height="126">
+                <hc:TagPanel Orientation="Horizontal" MaxWidth="400" VerticalAlignment="Center">
+                    <hc:Tag ShowCloseButton="False" Content="TextText"/>
+                    <hc:Tag Content="Text"/>
+                    <hc:Tag IsSelected="True" Selectable="True" ShowCloseButton="False" Content="Text"/>
+                    <hc:Tag IsSelected="True" Selectable="True" Content="Text"/>
+                    <hc:Tag ShowCloseButton="False" Content="TextText"/>
+                </hc:TagPanel>
             </Border>
         </Canvas>
     </ScrollViewer>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml
index c03acb47..2dd4bb1b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml
@@ -1,17 +1,17 @@
 <UserControl x:Class="HandyControlDemo.UserControl.UnderConstruction"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
        <StackPanel Margin="32">
-            <controls:GifImage Width="400" Height="300">
-                <controls:GifImage.Source>
+            <hc:GifImage Width="400" Height="300">
+                <hc:GifImage.Source>
                     <BitmapImage UriSource="/HandyControlDemo;component/Resources/Img/under_construction.gif"/>
-                </controls:GifImage.Source>
-            </controls:GifImage>
+                </hc:GifImage.Source>
+            </hc:GifImage>
            <TextBlock Margin="0,16,0,0" HorizontalAlignment="Center" Text="{x:Static langs:Lang.ComingSoon}" Style="{StaticResource TextBlockLargeBold}"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml
index 9687d634..c04d1b51 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="HandyControlDemo.UserControl.BorderDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <UniformGrid Margin="32,32,0,0" Columns="3" Rows="2">
             <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="0,0,32,32">
                 <Border Background="{DynamicResource PrimaryBrush}">
@@ -37,5 +37,5 @@
                 </Border>
             </Border>
         </UniformGrid>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml
index c84b9048..fc406aa0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="HandyControlDemo.UserControl.BrushDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <UniformGrid Margin="24" VerticalAlignment="Center" Columns="4" Rows="7">
             <Label Content="PrimaryBrush" Style="{StaticResource LabelPrimary}" Margin="8" HorizontalAlignment="Stretch"/>
             <Label Content="DarkPrimaryBrush" Background="{DynamicResource DarkPrimaryBrush}" Foreground="White" BorderThickness="0" Margin="8" HorizontalAlignment="Stretch"/>
@@ -39,5 +39,5 @@
             <Label Content="DarkMaskBrush" BorderThickness="0" Background="{DynamicResource DarkMaskBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
             <Label Content="DarkOpacityBrush" BorderThickness="0" Background="{DynamicResource DarkOpacityBrush}" Foreground="White" Margin="8" HorizontalAlignment="Stretch"/>
         </UniformGrid>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
index 2bfb5148..c2faa4c7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ButtonDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:ScrollViewer IsEnableInertia="True">
+    <hc:TransitioningContentControl>
+        <hc:ScrollViewer IsEnableInertia="True">
             <StackPanel Margin="32">
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
@@ -40,49 +40,49 @@
                 </WrapPanel>
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
-                        <Button Width="50" Padding="16,8" Margin="5" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <Button Width="50" Padding="16,8" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="Default（DeleteGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <Button Content="{x:Static langs:Lang.Clock}" Margin="5" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                        <Button Content="{x:Static langs:Lang.Clock}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                        <Button Content="{x:Static langs:Lang.Clock}" Margin="5" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                        <Button Content="{x:Static langs:Lang.Clock}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonPrimary（ClockGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <Button Content="{x:Static langs:Lang.Calendar}" Margin="5" Style="{StaticResource ButtonSuccess}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                        <Button Content="{x:Static langs:Lang.Calendar}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonSuccess}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        <Button Content="{x:Static langs:Lang.Calendar}" Margin="5" Style="{StaticResource ButtonSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        <Button Content="{x:Static langs:Lang.Calendar}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonSuccess（CalendarGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonInfo}" controls:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonInfo}" controls:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                        <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonInfo（DownGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <Button Width="50" Margin="5" Style="{StaticResource ButtonWarning}" controls:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                        <Button Width="50" IsEnabled="False" Margin="5" Style="{StaticResource ButtonWarning}" controls:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        <Button Width="50" Margin="5" Style="{StaticResource ButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        <Button Width="50" IsEnabled="False" Margin="5" Style="{StaticResource ButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonWarning（LeftGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonDanger}" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDanger}" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonDanger（DeleteGeometry）"/>
                     </StackPanel>
                 </WrapPanel>
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
-                        <Button Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource ButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
-                        <Button Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource ButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                        <Button Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource ButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                        <Button Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource ButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
                         <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonCustom"/>
                     </StackPanel>
                     <StackPanel>
-                        <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}"  controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                        <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}"  hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonIcon（UpDownGeometry）"/>
                     </StackPanel>
                 </WrapPanel>
             </StackPanel>
-        </controls:ScrollViewer>
-    </controls:TransitioningContentControl>
+        </hc:ScrollViewer>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml
index c5550a21..e904a771 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="HandyControlDemo.UserControl.CalendarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <Calendar Margin="32" SelectionMode="MultipleRange"/>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml
index f68c6e74..1558cafd 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="HandyControlDemo.UserControl.CheckBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}"
              Width="400">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center">
             <CheckBox Content="{x:Static langs:Lang.CheckBox}" IsChecked="True"/>
             <CheckBox Margin="0,16,0,0" Content="{x:Static langs:Lang.CheckBox}" IsChecked="True" IsEnabled="False"/>
@@ -14,5 +14,5 @@
             <CheckBox Margin="0,16,0,0" Content="{x:Static langs:Lang.CheckBox}" IsChecked="{x:Null}"/>
             <CheckBox Margin="0,16,0,0" Content="{x:Static langs:Lang.CheckBox}" IsChecked="{x:Null}" IsEnabled="False"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml
index 118055e7..3e4086ea 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml
@@ -4,8 +4,8 @@
              Background="{DynamicResource RegionBrush}"
              MaxWidth="800"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
         <TabControl Style="{StaticResource TabControlInLine}">
             <TabItem Header="{x:Static langs:Lang.Common}">
                 <DataGrid HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
@@ -31,7 +31,7 @@
                 </DataGrid>
             </TabItem>
             <TabItem Header="{x:Static langs:Lang.ShowRowNumber}">
-                <DataGrid HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}" controls:DataGridAttach.ShowRowNumber="True">
+                <DataGrid HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}" hc:DataGridAttach.ShowRowNumber="True">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="60" CanUserResize="False">
                             <DataGridTemplateColumn.CellTemplate>
@@ -48,5 +48,5 @@
                 </DataGrid>
             </TabItem>
         </TabControl>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml
index 934beb22..f7e9dfa0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" VerticalAlignment="Center">
             <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Width="240" HorizontalAlignment="Left">
                 <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
@@ -19,5 +19,5 @@
                 <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
             </Expander>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
index 53fdfe45..fa87081c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
         <ScrollViewer>
             <Grid Margin="32">
                 <Grid.RowDefinitions>
@@ -22,7 +22,7 @@
                         <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                     </Border>
                 </GroupBox>
-                <GroupBox Grid.Row="0" Grid.Column="1" Width="300" Height="200" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" Margin="16" controls:TitleElement.TitleAlignment="Left">
+                <GroupBox Grid.Row="0" Grid.Column="1" Width="300" Height="200" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" Margin="16" hc:TitleElement.TitleAlignment="Left">
                     <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
                         <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                     </Border>
@@ -32,7 +32,7 @@
                         <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                     </Border>
                 </GroupBox>
-                <GroupBox Grid.Row="1" Grid.Column="1" Width="300" Height="200" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" Margin="16" Style="{StaticResource GroupBoxTab}" controls:TitleElement.TitleAlignment="Left">
+                <GroupBox Grid.Row="1" Grid.Column="1" Width="300" Height="200" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" Margin="16" Style="{StaticResource GroupBoxTab}" hc:TitleElement.TitleAlignment="Left">
                     <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
                         <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                     </Border>
@@ -40,10 +40,10 @@
                 <GroupBox Grid.Row="2" Grid.Column="0" Width="300" Header="{x:Static langs:Lang.TitleDemoStr1}" Margin="16" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left">
                     <TextBox/>
                 </GroupBox>
-                <GroupBox Grid.Row="2" VerticalAlignment="Bottom" Grid.Column="1" Width="300" controls:TitleElement.TitleWidth="100" Header="{x:Static langs:Lang.TitleDemoStr1}" Margin="16" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left" controls:TitleElement.TitleAlignment="Left">
+                <GroupBox Grid.Row="2" VerticalAlignment="Bottom" Grid.Column="1" Width="300" hc:TitleElement.TitleWidth="100" Header="{x:Static langs:Lang.TitleDemoStr1}" Margin="16" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left" hc:TitleElement.TitleAlignment="Left">
                     <ComboBox DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}" ItemsSource="{Binding DataList}"/>
                 </GroupBox>
             </Grid>
         </ScrollViewer>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml
index c4b9dff7..d5ae8b3f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="HandyControlDemo.UserControl.LabelDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
             <Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
             <Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelDanger}"/>
@@ -13,5 +13,5 @@
             <Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelSuccess}"/>
             <Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelWarning}"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml
index 4ed7e5fc..6cc672a3 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ListBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
           <ListBox Width="200" Margin="32" ItemsSource="{Binding DataList}">
               <ListBox.ItemTemplate>
                   <DataTemplate>
@@ -11,5 +11,5 @@
                   </DataTemplate>
               </ListBox.ItemTemplate>
           </ListBox>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml
index 02ef496a..18d645a0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ListViewDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <ListView ItemsSource="{Binding DataList}">
             <ListView.View>
                 <GridView>
@@ -14,5 +14,5 @@
                 </GridView>
             </ListView.View>
         </ListView>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml
index abdf0364..87b87e22 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="HandyControlDemo.UserControl.MenuDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:SimplePanel Margin="32">
+    <hc:TransitioningContentControl>
+        <hc:SimplePanel Margin="32">
              <TextBlock Text="{x:Static langs:Lang.RightClickHere}" Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}"/>
              <Rectangle Width="200" Height="112" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
              <Border Width="200" Height="112" Background="Transparent">
@@ -19,6 +19,6 @@
                      </ContextMenu>
                  </Border.ContextMenu>
              </Border>
-         </controls:SimplePanel>
-    </controls:TransitioningContentControl>
+         </hc:SimplePanel>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
index 074f91c2..4503f163 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
@@ -1,27 +1,27 @@
 <UserControl x:Class="HandyControlDemo.UserControl.NativeComboBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <ScrollViewer>
             <StackPanel Margin="32">
                 <ComboBox ItemsSource="{Binding DataList}" SelectedIndex="0"/>
                 <ComboBox ItemsSource="{Binding DataList}" Margin="0,16,0,0" SelectedIndex="0" IsEnabled="False"/>
                 <ComboBox ItemsSource="{Binding DataList}" SelectedIndex="0" Margin="0,16,0,0" IsEditable="True"/>
 
-                <ComboBox ItemsSource="{Binding DataList}" SelectedIndex="0" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Style="{StaticResource ComboBoxExtend}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <ComboBox ItemsSource="{Binding DataList}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource ComboBoxExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-                <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" SelectedIndex="0" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Style="{StaticResource ComboBoxExtend}" Margin="0,16,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource ComboBoxExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <ComboBox ItemsSource="{Binding DataList}" SelectedIndex="0" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Style="{StaticResource ComboBoxExtend}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+                <ComboBox ItemsSource="{Binding DataList}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource ComboBoxExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" SelectedIndex="0" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Style="{StaticResource ComboBoxExtend}" Margin="0,16,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+                <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource ComboBoxExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <ComboBox ItemsSource="{Binding DataList}" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource ComboBoxExtend}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <ComboBox ItemsSource="{Binding DataList}" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Style="{StaticResource ComboBoxExtend}" Margin="0,16,0,0"/>
-                <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource ComboBoxExtend}" Margin="0,16,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-                <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Style="{StaticResource ComboBoxExtend}" Margin="0,16,0,0"/>
+                <ComboBox ItemsSource="{Binding DataList}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource ComboBoxExtend}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+                <ComboBox ItemsSource="{Binding DataList}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Style="{StaticResource ComboBoxExtend}" Margin="0,16,0,0"/>
+                <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource ComboBoxExtend}" Margin="0,16,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+                <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Style="{StaticResource ComboBoxExtend}" Margin="0,16,0,0"/>
             </StackPanel>
         </ScrollViewer>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
index e579d305..736159f5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
@@ -1,21 +1,21 @@
 <UserControl x:Class="HandyControlDemo.UserControl.NativeDatePickerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
             <DatePicker SelectedDate="{x:Static system:DateTime.Now}"/>
             <DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}"/>
 
-            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePickerExtend}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
-            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource DatePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
+            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" Style="{StaticResource DatePickerExtend}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
-            <DatePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource DatePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Margin="0,32,0,0"/>
+            <DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
index aa6296d4..5057ee4b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
@@ -1,20 +1,20 @@
 <UserControl x:Class="HandyControlDemo.UserControl.NativePasswordBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
             <PasswordBox Password="123456"/>
             <PasswordBox Password="123456" IsEnabled="False" Margin="0,16,0,0"/>
 
-            <PasswordBox controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Password="123456" Margin="0,32,0,0" Style="{StaticResource PasswordBoxExtend}"/>
-            <PasswordBox controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource PasswordBoxExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+            <PasswordBox hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Password="123456" Margin="0,32,0,0" Style="{StaticResource PasswordBoxExtend}"/>
+            <PasswordBox hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource PasswordBoxExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-            <PasswordBox Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource PasswordBoxExtend}" Margin="0,32,0,0" Password="123456"/>
-            <PasswordBox Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Style="{StaticResource PasswordBoxExtend}" Margin="0,16,0,0"/>
+            <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource PasswordBoxExtend}" Margin="0,32,0,0" Password="123456"/>
+            <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Style="{StaticResource PasswordBoxExtend}" Margin="0,16,0,0"/>
 
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
index d4818d86..1cd461b3 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
@@ -2,8 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
         <WrapPanel Margin="32" ItemWidth="600">
             <StackPanel Orientation="Horizontal">
                 <StackPanel Width="400">
@@ -40,5 +40,5 @@
                 </StackPanel>
             </StackPanel>
         </WrapPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
index 5a37771c..ebc8a046 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="HandyControlDemo.UserControl.NativeScrollViewerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}" 
              Width="550"
              Height="600">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <Grid Margin="32">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
@@ -75,5 +75,5 @@
                 </ScrollViewer>
             </Border>
         </Grid>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
index 0eaf3152..a1351432 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="HandyControlDemo.UserControl.NativeTabControlDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <ScrollViewer>
             <UniformGrid Rows="2" Columns="2" Margin="16">
                 <TabControl TabStripPlacement="Right" Margin="16" Width="400" Height="200">
@@ -177,5 +177,5 @@
                 </TabControl>
             </UniformGrid>
         </ScrollViewer>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml
index b9832881..9eeeff3b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml
@@ -1,18 +1,18 @@
 <UserControl x:Class="HandyControlDemo.UserControl.NativeTextBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32">
             <TextBox Text="{x:Static langs:Lang.ContentDemoStr}"/>
             <TextBox Text="{x:Static langs:Lang.ContentDemoStr}" Margin="0,16,0,0" IsEnabled="False"/>
 
-            <TextBox controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Style="{StaticResource TextBoxExtend}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-            <TextBox controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource TextBoxExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-            <TextBox Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TextBoxExtend}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
-            <TextBox Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" controls:InfoElement.Necessary="True" Style="{StaticResource TextBoxExtend}" Margin="0,16,0,0"/>
+            <TextBox hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Style="{StaticResource TextBoxExtend}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+            <TextBox hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" Style="{StaticResource TextBoxExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+            <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TextBoxExtend}" Margin="0,32,0,0" Text="{x:Static langs:Lang.ContentDemoStr}"/>
+            <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" hc:InfoElement.TitleAlignment="Left" hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" hc:InfoElement.Necessary="True" Style="{StaticResource TextBoxExtend}" Margin="0,16,0,0"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml
index b162a657..2b5e794b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="HandyControlDemo.UserControl.RadioButtonDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                 <StackPanel>
@@ -14,38 +14,38 @@
                     <RadioButton Margin="0,16,0,0" Content="{x:Static langs:Lang.RadioButton}" IsEnabled="False"/>
                 </StackPanel>
                 <UniformGrid Margin="22,0,0,0" Rows="2" Columns="2">
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="{x:Static langs:Lang.RadioButton}"/>
+                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="{x:Static langs:Lang.RadioButton}"/>
                     <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" Style="{StaticResource RadioButtonIcon}" Content="{x:Static langs:Lang.RadioButton}" IsChecked="True"/>
-                    <RadioButton Margin="10,0,0,0" BorderThickness="1" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="{x:Static langs:Lang.RadioButton}"/>
+                    <RadioButton Margin="10,0,0,0" BorderThickness="1" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="{x:Static langs:Lang.RadioButton}"/>
                     <RadioButton Margin="10,0,0,0" BorderThickness="1" Style="{StaticResource RadioButtonIcon}" Content="{x:Static langs:Lang.RadioButton}"/>
                 </UniformGrid>
             </StackPanel>
-            <controls:RadioGroup Margin="0,32,0,0">
+            <hc:RadioGroup Margin="0,32,0,0">
                 <RadioButton Content="{x:Static langs:Lang.RadioButton}" IsChecked="True"/>
                 <RadioButton Content="{x:Static langs:Lang.RadioButton}"/>
                 <RadioButton IsEnabled="False" Content="{x:Static langs:Lang.RadioButton}"/>
                 <RadioButton Content="{x:Static langs:Lang.RadioButton}"/>
-            </controls:RadioGroup>
-            <controls:RadioGroup Margin="0,16,0,0" Style="{StaticResource RadioGroupSolid}">
+            </hc:RadioGroup>
+            <hc:RadioGroup Margin="0,16,0,0" Style="{StaticResource RadioGroupSolid}">
                 <RadioButton Content="{x:Static langs:Lang.RadioButton}"/>
                 <RadioButton Content="{x:Static langs:Lang.RadioButton}"/>
                 <RadioButton IsEnabled="False" Content="{x:Static langs:Lang.RadioButton}"/>
                 <RadioButton Content="{x:Static langs:Lang.RadioButton}" IsChecked="True"/>
-            </controls:RadioGroup>
+            </hc:RadioGroup>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <controls:RadioGroup Margin="0,16,8,0" Orientation="Vertical">
+                <hc:RadioGroup Margin="0,16,8,0" Orientation="Vertical">
                     <RadioButton Content="{x:Static langs:Lang.RadioButton}" IsChecked="True"/>
                     <RadioButton Content="{x:Static langs:Lang.RadioButton}"/>
                     <RadioButton IsEnabled="False" Content="{x:Static langs:Lang.RadioButton}"/>
                     <RadioButton Content="{x:Static langs:Lang.RadioButton}"/>
-                </controls:RadioGroup>
-                <controls:RadioGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource RadioGroupSolid}">
+                </hc:RadioGroup>
+                <hc:RadioGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource RadioGroupSolid}">
                     <RadioButton Content="{x:Static langs:Lang.RadioButton}"/>
                     <RadioButton Content="{x:Static langs:Lang.RadioButton}"/>
                     <RadioButton IsEnabled="False" Content="{x:Static langs:Lang.RadioButton}"/>
                     <RadioButton Content="{x:Static langs:Lang.RadioButton}" IsChecked="True"/>
-                </controls:RadioGroup>
+                </hc:RadioGroup>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
index 14b3f749..9ee471ed 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="HandyControlDemo.UserControl.RepeatButtonDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
-        <controls:ScrollViewer IsEnableInertia="True">
+    <hc:TransitioningContentControl>
+        <hc:ScrollViewer IsEnableInertia="True">
             <StackPanel Margin="32">
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
@@ -40,49 +40,49 @@
                 </WrapPanel>
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
-                        <RepeatButton Width="50" Padding="16,8" Margin="5" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="Default（DeleteGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <RepeatButton Content="{x:Static langs:Lang.Clock}" Margin="5" Style="{StaticResource RepeatButtonPrimary}" controls:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                        <RepeatButton Content="{x:Static langs:Lang.Clock}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonPrimary}" controls:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                        <RepeatButton Content="{x:Static langs:Lang.Clock}" Margin="5" Style="{StaticResource RepeatButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                        <RepeatButton Content="{x:Static langs:Lang.Clock}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonPrimary（ClockGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <RepeatButton Content="{x:Static langs:Lang.Calendar}" Margin="5" Style="{StaticResource RepeatButtonSuccess}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                        <RepeatButton Content="{x:Static langs:Lang.Calendar}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonSuccess}" controls:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        <RepeatButton Content="{x:Static langs:Lang.Calendar}" Margin="5" Style="{StaticResource RepeatButtonSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        <RepeatButton Content="{x:Static langs:Lang.Calendar}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonSuccess（CalendarGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonInfo}" controls:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonInfo}" controls:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonInfo（DownGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <RepeatButton Width="50" Margin="5" Style="{StaticResource RepeatButtonWarning}" controls:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                        <RepeatButton Width="50" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonWarning}" controls:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        <RepeatButton Width="50" Margin="5" Style="{StaticResource RepeatButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        <RepeatButton Width="50" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonWarning（LeftGeometry）"/>
                     </StackPanel>
                     <StackPanel>
-                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonDanger}" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDanger}" controls:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonDanger（DeleteGeometry）"/>
                     </StackPanel>
                 </WrapPanel>
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
-                        <RepeatButton Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource RepeatButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
-                        <RepeatButton Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource RepeatButtonCustom}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                        <RepeatButton Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource RepeatButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                        <RepeatButton Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonCustom}" Style="{StaticResource RepeatButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
                         <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonCustom"/>
                     </StackPanel>
                     <StackPanel>
-                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}"  controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                        <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}"  hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="RepeatButtonIcon（UpDownGeometry）"/>
                     </StackPanel>
                 </WrapPanel>
             </StackPanel>
-        </controls:ScrollViewer>
-    </controls:TransitioningContentControl>
+        </hc:ScrollViewer>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml
index a2113a68..3353839a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="HandyControlDemo.UserControl.RichTextBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <RichTextBox Margin="32" Width="400" Height="300" ScrollViewer.VerticalScrollBarVisibility="Auto">
             <FlowDocument>
                 <Paragraph>
@@ -18,5 +18,5 @@
                 </Paragraph>
             </FlowDocument>
         </RichTextBox>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
index 6bfa5cd0..06347065 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
@@ -1,24 +1,24 @@
 <UserControl x:Class="HandyControlDemo.UserControl.SliderDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
                 <Slider Width="400" IsSnapToTickEnabled="True" Value="8"/>
                 <Slider Width="400" IsSnapToTickEnabled="True" Value="3" Margin="0,32,0,0" IsEnabled="False"/>
                 <Slider Width="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="10" SelectionEnd="80" Margin="0,32,0,0"/>
-                <Slider Width="400" controls:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
-                <Slider Width="400" controls:TipElement.Visibility="Visible" controls:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="0,32,0,0"/>
+                <Slider Width="400" hc:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
+                <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="0,32,0,0"/>
             </StackPanel>
             <StackPanel Margin="32,0,0,0" Orientation="Horizontal">
                 <Slider Height="400" IsSnapToTickEnabled="True" Value="8" Orientation="Vertical"/>
                 <Slider Height="400" IsSnapToTickEnabled="True" Value="3" Margin="32,0,0,0" IsEnabled="False" Orientation="Vertical"/>
                 <Slider Height="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="80" Margin="32,0,0,0" Orientation="Vertical"/>
-                <Slider Height="400" controls:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="32,0,0,0" Orientation="Vertical"/>
-                <Slider Height="400" controls:TipElement.Visibility="Visible" controls:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="32,0" Orientation="Vertical"/>
+                <Slider Height="400" hc:TipElement.Visibility="Visible" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="32,0,0,0" Orientation="Vertical"/>
+                <Slider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="BottomRight" IsSnapToTickEnabled="True" Value="5" TickPlacement="Both" Margin="32,0" Orientation="Vertical"/>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml
index 37a0ad6a..55dde26f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml
@@ -1,10 +1,10 @@
 <UserControl x:Class="HandyControlDemo.UserControl.TextBlockDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
                 <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLargeBold" Style="{StaticResource TextBlockLargeBold}"/>
@@ -45,5 +45,5 @@
                 <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultSuccess}"/>
             </StackPanel>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
index 2a71ecd2..bc4d4ca7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
@@ -3,9 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-        <controls:ScrollViewer IsEnableInertia="True">
+             xmlns:hc="https://handyorg.github.io/handycontrol">
+    <hc:TransitioningContentControl>
+        <hc:ScrollViewer IsEnableInertia="True">
             <StackPanel Margin="32">
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
@@ -13,12 +13,12 @@
                         <ToggleButton IsEnabled="False" IsChecked="True" Content="{x:Static langs:Lang.Default}" Margin="5"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton IsChecked="True" Content="{x:Static langs:Lang.Primary}" Margin="5" controls:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonPrimary}"/>
+                        <ToggleButton IsChecked="True" Content="{x:Static langs:Lang.Primary}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonPrimary}"/>
                         <ToggleButton IsEnabled="False" IsChecked="True" Content="{x:Static langs:Lang.Primary}" Margin="5" Style="{StaticResource ToggleButtonPrimary}"/>
                         <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonPrimary"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton IsChecked="True" Content="{x:Static langs:Lang.Success}" Margin="5" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource ToggleButtonSuccess}"/>
+                        <ToggleButton IsChecked="True" Content="{x:Static langs:Lang.Success}" Margin="5" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource ToggleButtonSuccess}"/>
                         <ToggleButton IsEnabled="False" IsChecked="True" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ToggleButtonSuccess}"/>
                         <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonSuccess"/>
                     </StackPanel>
@@ -40,59 +40,59 @@
                 </WrapPanel>
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIcon}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIcon}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIcon}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIcon}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIcon"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconPrimary}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconPrimary}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconPrimary}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconPrimary}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconPrimary"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconSuccess}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconSuccess}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconSuccess}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconSuccess}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconSuccess"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconInfo}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconInfo}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconInfo}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconInfo}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconInfo"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconWarning}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconWarning}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconWarning}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconWarning}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconWarning"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconDanger}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconDanger}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconDanger}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconDanger}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconDanger"/>
                     </StackPanel>
                 </WrapPanel>
                 <WrapPanel ItemWidth="160" ItemHeight="130">
                     <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
+                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconTransparent"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton IsChecked="True" Style="{StaticResource ToggleButtonCustom}" controls:StatusSwitchElement.HideUncheckedElement="True">
-                            <controls:StatusSwitchElement.CheckedElement>
+                        <ToggleButton IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+                            <hc:StatusSwitchElement.CheckedElement>
                                 <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
                                     <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                                 </Border>
-                            </controls:StatusSwitchElement.CheckedElement>
+                            </hc:StatusSwitchElement.CheckedElement>
                             <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
                                 <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                             </Border>
                         </ToggleButton>
-                        <ToggleButton IsEnabled="False" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" controls:StatusSwitchElement.HideUncheckedElement="True">
-                            <controls:StatusSwitchElement.CheckedElement>
+                        <ToggleButton IsEnabled="False" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+                            <hc:StatusSwitchElement.CheckedElement>
                                 <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
                                     <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                                 </Border>
-                            </controls:StatusSwitchElement.CheckedElement>
+                            </hc:StatusSwitchElement.CheckedElement>
                             <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
                                 <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                             </Border>
@@ -106,6 +106,6 @@
                     </StackPanel>
                 </WrapPanel>
             </StackPanel>
-        </controls:ScrollViewer>
-    </controls:TransitioningContentControl>
+        </hc:ScrollViewer>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml
index 327e0e47..37c127e3 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ToolBarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <ToolBarTray Margin="32" VerticalAlignment="Center">
             <ToolBar Padding="6" Header="{x:Static langs:Lang.Title}">
                 <CheckBox IsChecked="True" Margin="10,0,0,0"/>
@@ -57,5 +57,5 @@
                 </Menu>
             </ToolBar>
         </ToolBarTray>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
index f5d020e8..088c6b16 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="HandyControlDemo.UserControl.TreeViewDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
           <TreeView Width="200" Margin="32" ItemsSource="{Binding DataList}">
               <TreeView.ItemTemplate>
                   <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
@@ -11,5 +11,5 @@
                   </HierarchicalDataTemplate>
               </TreeView.ItemTemplate>
           </TreeView>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml
index 1591a6eb..460eefcf 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml
@@ -1,9 +1,9 @@
-<controls:Window x:Class="HandyControlDemo.Window.AboutWindow"
+<hc:Window x:Class="HandyControlDemo.Window.AboutWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                 xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+                 xmlns:hc="https://handyorg.github.io/handycontrol"
                  mc:Ignorable="d"
                  xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
                  Title="{x:Static langs:Lang.About}"
@@ -16,11 +16,11 @@
                  WindowStartupLocation="CenterOwner"
                  Width="340"
                  Height="220">
-    <controls:SimplePanel>
+    <hc:SimplePanel>
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,30,0,0">
             <TextBlock Text="HandyControl" FontSize="30" Foreground="{StaticResource PrimaryBrush}" VerticalAlignment="Top" HorizontalAlignment="Center"/>
             <TextBlock Text="{Binding Version}" HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="{StaticResource PrimaryBrush}"/>
         </StackPanel>
         <TextBlock Text="{Binding CopyRight}" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,14" Foreground="{StaticResource ThirdlyTextBrush}"/>
-    </controls:SimplePanel>
-</controls:Window>
+    </hc:SimplePanel>
+</hc:Window>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
index 05575e8f..ff45192d 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml
@@ -1,9 +1,9 @@
-<controls:BlurWindow x:Class="HandyControlDemo.Window.BlurWindow"
+<hc:BlurWindow x:Class="HandyControlDemo.Window.BlurWindow"
                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                     xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+                     xmlns:hc="https://handyorg.github.io/handycontrol"
                      xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
                      mc:Ignorable="d"
                      WindowStartupLocation="CenterScreen"
@@ -13,4 +13,4 @@
                      Height="450" 
                      Width="800" 
                      Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
-</controls:BlurWindow>
+</hc:BlurWindow>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml
index 698164d1..d8fe867b 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml
@@ -1,18 +1,18 @@
-<controls:Window x:Class="HandyControlDemo.Window.CommonWindow"
-                           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                           xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-                           xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-                           mc:Ignorable="d"
-                           ShowTitle="True"
-                           Background="{DynamicResource MainContentBackgroundBrush}"
-                           WindowStartupLocation="CenterScreen"
-                           Style="{StaticResource WindowWin10}"
-                           Title="{x:Static langs:Lang.Title}" 
-                           Height="450" 
-                           Width="800" 
-                           Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
+<hc:Window x:Class="HandyControlDemo.Window.CommonWindow"
+           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+           xmlns:hc="https://handyorg.github.io/handycontrol"
+           xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+           mc:Ignorable="d"
+           ShowTitle="True"
+           Background="{DynamicResource MainContentBackgroundBrush}"
+           WindowStartupLocation="CenterScreen"
+           Style="{StaticResource WindowWin10}"
+           Title="{x:Static langs:Lang.Title}" 
+           Height="450" 
+           Width="800" 
+           Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
     <Border Background="{DynamicResource MainContentForegroundDrawingBrush}"/>
-</controls:Window>
\ No newline at end of file
+</hc:Window>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
index bd0f96dd..0fe5543a 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml
@@ -1,23 +1,23 @@
-<controls:Window x:Class="HandyControlDemo.Window.CustomNonClientAreaWindow"
-                           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                           xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-                           xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-                           mc:Ignorable="d"
-                           OtherButtonForeground="{DynamicResource ReverseTextBrush}"
-                           CloseButtonForeground="{DynamicResource ReverseTextBrush}"
-                           OtherButtonHoverBackground="{DynamicResource ReverseTextBrush}"
-                           NonClientAreaBackground="{DynamicResource ToolBarBackground}"
-                           NonClientAreaHeight="69"
-                           Background="{DynamicResource MainContentBackgroundBrush}"
-                           WindowStartupLocation="CenterScreen"
-                           Style="{StaticResource WindowWin10}"
-                           Title="{x:Static langs:Lang.Title}" 
-                           Height="450" 
-                           Width="800">
-    <controls:Window.NonClientAreaContent>
+<hc:Window x:Class="HandyControlDemo.Window.CustomNonClientAreaWindow"
+           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+           xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+           xmlns:hc="https://handyorg.github.io/handycontrol"
+           mc:Ignorable="d"
+           OtherButtonForeground="{DynamicResource ReverseTextBrush}"
+           CloseButtonForeground="{DynamicResource ReverseTextBrush}"
+           OtherButtonHoverBackground="{DynamicResource ReverseTextBrush}"
+           NonClientAreaBackground="{DynamicResource ToolBarBackground}"
+           NonClientAreaHeight="69"
+           Background="{DynamicResource MainContentBackgroundBrush}"
+           WindowStartupLocation="CenterScreen"
+           Style="{StaticResource WindowWin10}"
+           Title="{x:Static langs:Lang.Title}" 
+           Height="450" 
+           Width="800">
+    <hc:Window.NonClientAreaContent>
         <StackPanel Orientation="Horizontal" Height="69">
             <Path Data="{StaticResource LogoGeometry}" Width="40" Height="40" Stretch="Uniform" Fill="#F76B1C" Margin="20,0,0,0"></Path>
             <Button Style="{StaticResource ButtonCustom}" Margin="32,0,0,0">
@@ -56,6 +56,6 @@
                 </Border>
             </Button>
         </StackPanel>
-    </controls:Window.NonClientAreaContent>
+    </hc:Window.NonClientAreaContent>
     <Border Background="{DynamicResource MainContentForegroundDrawingBrush}"/>
-</controls:Window>
\ No newline at end of file
+</hc:Window>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml
index aac18ca8..c4e14637 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml
@@ -1,18 +1,18 @@
 <Window x:Class="HandyControlDemo.Window.DialogDemoWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
         xmlns:data="clr-namespace:HandyControlDemo.Data"
-        controls:Dialog.Token="{x:Static data:MessageToken.DialogDemoWindow}"
+        hc:Dialog.Token="{x:Static data:MessageToken.DialogDemoWindow}"
         DataContext="{Binding DialogDemo,Source={StaticResource Locator}}"
         Title="{x:Static langs:Lang.DialogDemo}"
         Width="800"
         Height="500">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
         <StackPanel Margin="32" VerticalAlignment="Center">
             <Button Content="{x:Static langs:Lang.ShowInCurrentWindow}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{x:Static data:MessageToken.DialogDemoWindow}"/>
             <Button Margin="0,10,0,0" Content="{x:Static langs:Lang.ShowInMainWindow}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{x:Static data:MessageToken.MainWindow}"/>
         </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </Window>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
index acee9654..9a329f26 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
@@ -1,15 +1,15 @@
 <Window x:Class="HandyControlDemo.Window.GrowlDemoWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
         xmlns:data="clr-namespace:HandyControlDemo.Data"
         DataContext="{Binding GrowlDemoWithToken,Source={StaticResource Locator}}"
         Title="{x:Static langs:Lang.GrowlDemo}"
         Width="800"
         Height="500">
-    <controls:TransitioningContentControl>
-        <controls:SimplePanel Margin="32">
+    <hc:TransitioningContentControl>
+        <hc:SimplePanel Margin="32">
             <WrapPanel>
                 <Button Command="{Binding InfoCmd}" Content="{x:Static langs:Lang.Info}" Margin="0,5,5,5" Style="{StaticResource ButtonInfo}"/>
                 <Button Command="{Binding SuccessCmd}" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ButtonSuccess}"/>
@@ -19,9 +19,9 @@
                 <Button Command="{Binding FatalCmd}" Content="{x:Static langs:Lang.Fatal}" Margin="5,0"/>
                 <Button Command="{Binding ClearCmd}" Content="{x:Static langs:Lang.Clear}" Margin="5,0,0,0" Style="{StaticResource ButtonPrimary}"/>
             </WrapPanel>
-            <controls:ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
-                <StackPanel controls:Growl.Token="{x:Static data:MessageToken.GrowlDemoPanel}" VerticalAlignment="Top" Margin="0,10,10,10"/>
-            </controls:ScrollViewer>
-        </controls:SimplePanel>
-    </controls:TransitioningContentControl>
+            <hc:ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
+                <StackPanel hc:Growl.Token="{x:Static data:MessageToken.GrowlDemoPanel}" VerticalAlignment="Top" Margin="0,10,10,10"/>
+            </hc:ScrollViewer>
+        </hc:SimplePanel>
+    </hc:TransitioningContentControl>
 </Window>
diff --git a/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml
index a6ba0100..7a9199fe 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml
@@ -1,24 +1,24 @@
-<controls:BlurWindow x:Class="HandyControlDemo.Window.NoNonClientAreaDragableWindow"
-                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                     xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-                     xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-                     mc:Ignorable="d"
-                     WindowStartupLocation="CenterScreen"
-                     ShowTitle="True"
-                     Style="{StaticResource WindowBlur}"
-                     Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
-                     ShowNonClientArea="False"
-                     Title="NoClientDragableWindow" 
-                     Height="450" 
-                     Width="800">
-    <controls:SimplePanel>
+<hc:BlurWindow x:Class="HandyControlDemo.Window.NoNonClientAreaDragableWindow"
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+               xmlns:hc="https://handyorg.github.io/handycontrol"
+               xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+               mc:Ignorable="d"
+               WindowStartupLocation="CenterScreen"
+               ShowTitle="True"
+               Style="{StaticResource WindowBlur}"
+               Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
+               ShowNonClientArea="False"
+               Title="NoClientDragableWindow" 
+               Height="450" 
+               Width="800">
+    <hc:SimplePanel>
         <Rectangle VerticalAlignment="Top" Margin="10" Height="30" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
-        <Border controls:WindowAttach.IsDragElement="True" VerticalAlignment="Top" Margin="11" Height="28" Background="{DynamicResource DarkDefaultBrush}" CornerRadius="4">
+        <Border hc:WindowAttach.IsDragElement="True" VerticalAlignment="Top" Margin="11" Height="28" Background="{DynamicResource DarkDefaultBrush}" CornerRadius="4">
             <TextBlock Text="{x:Static langs:Lang.DragHere}" Style="{StaticResource TextBlockDefault}"/>
         </Border>
-        <Button Click="ButtonClose_OnClick" HorizontalAlignment="Right" Margin="0,15,15,0" VerticalAlignment="Top" Padding="0" Height="20" Width="20" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource CloseGeometry}" controls:BorderElement.CornerRadius="15"/>
-    </controls:SimplePanel>
-</controls:BlurWindow>
+        <Button Click="ButtonClose_OnClick" HorizontalAlignment="Right" Margin="0,15,15,0" VerticalAlignment="Top" Padding="0" Height="20" Width="20" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource CloseGeometry}" hc:BorderElement.CornerRadius="15"/>
+    </hc:SimplePanel>
+</hc:BlurWindow>
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
index 08ffd909..03cfc734 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
@@ -137,11 +137,6 @@ namespace HandyControl.Controls
         /// </summary>
         private double _imgWidHeiScale;
 
-        /// <summary>
-        ///     是否已经初始化
-        /// </summary>
-        private bool _isLoaded;
-
         /// <summary>
         ///     图片是否倾斜
         /// </summary>
@@ -168,8 +163,6 @@ namespace HandyControl.Controls
 
         public ImageViewer()
         {
-            Loaded += ImageViewer_OnLoaded;
-
             CommandBindings.Add(new CommandBinding(ControlCommands.Save, ButtonSave_OnClick));
             CommandBindings.Add(new CommandBinding(ControlCommands.Open, ButtonWindowsOpen_OnClick));
             CommandBindings.Add(new CommandBinding(ControlCommands.Restore, ButtonActual_OnClick));
@@ -410,7 +403,7 @@ namespace HandyControl.Controls
             if (_imageMain != null)
             {
                 var t = new RotateTransform();
-                BindingOperations.SetBinding(t, RotateTransform.AngleProperty, new Binding(ImageRotateProperty.Name) {Source = this});
+                BindingOperations.SetBinding(t, RotateTransform.AngleProperty, new Binding(ImageRotateProperty.Name) { Source = this });
                 _imageMain.LayoutTransform = t;
                 _imageMain.MouseLeftButtonDown += ImageMain_OnMouseLeftButtonDown;
             }
@@ -422,6 +415,8 @@ namespace HandyControl.Controls
                 _canvasSmallImg.MouseMove += CanvasSmallImg_OnMouseMove;
                 _canvasSmallImg.MouseLeave += CanvasSmallImg_OnMouseLeave;
             }
+
+            Init();
         }
 
         private static void OnImageScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -469,25 +464,28 @@ namespace HandyControl.Controls
             }
 
             _imgWidHeiScale = width / height;
-            var scaleWindow = ActualWidth / ActualHeight;
+            Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            var scaleWindow = DesiredSize.Width / DesiredSize.Height;
             if (_imgWidHeiScale > scaleWindow)
             {
-                if (width > ActualWidth)
-                    ImageScale = ActualWidth / width;
+                if (width > DesiredSize.Width)
+                    ImageScale = DesiredSize.Width / width;
             }
-            else if (height > ActualHeight)
+            else if (height > DesiredSize.Height)
             {
-                ImageScale = ActualHeight / height;
+                ImageScale = DesiredSize.Height / height;
             }
             else
             {
                 ImageScale = 1;
             }
 
-            ImageMargin = new Thickness((ActualWidth - ImageWidth) / 2, (ActualHeight - ImageHeight) / 2, 0, 0);
+            ImageMargin = new Thickness((DesiredSize.Width - ImageWidth) / 2, (DesiredSize.Height - ImageHeight) / 2, 0, 0);
 
-            _imgActualScale = 1;
+            _imgActualScale = ImageScale;
             _imgActualMargin = ImageMargin;
+
+            InitBorderSmall();
         }
 
         private void ButtonActual_OnClick(object sender, RoutedEventArgs e)
@@ -571,8 +569,11 @@ namespace HandyControl.Controls
         {
             base.OnRenderSizeChanged(sizeInfo);
 
-            if (!_isLoaded) return;
+            OnRenderSizeChanged();
+        }
 
+        private void OnRenderSizeChanged()
+        {
             if (ImageWidth < 0.001 || ImageHeight < 0.001) return;
 
             _canMoveX = true;
@@ -601,13 +602,6 @@ namespace HandyControl.Controls
             MoveSmallImg(_imgSmallMouseDownMargin.Left, _imgSmallMouseDownMargin.Top);
         }
 
-        private void ImageViewer_OnLoaded(object sender, RoutedEventArgs e)
-        {
-            if (_isLoaded) return;
-            Init();
-            _isLoaded = true;
-        }
-
         private void ImageMain_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             _imgMouseDownPoint = Mouse.GetPosition(_panelMain);
@@ -773,7 +767,7 @@ namespace HandyControl.Controls
         {
             _imgActualRotate = rotate;
 
-            _isOblique = ((int) _imgActualRotate - 90) % 180 == 0;
+            _isOblique = ((int)_imgActualRotate - 90) % 180 == 0;
             ShowSmallImgInternal = false;
             Init();
             InitBorderSmall();
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index 07dd7a5e..fa59e270 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -159,7 +159,10 @@ namespace HandyControl.Controls
         {
             var ctl = (NumericUpDown) d;
             var v = (double) e.NewValue;
-            ctl._textBox.Text = v.ToString();
+            if (ctl._textBox != null)
+            {
+                ctl._textBox.Text = v.ToString();
+            }
 
             ctl.OnValueChanged(new FunctionEventArgs<double>(ValueChangedEvent, ctl)
             {
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
index afe715ae..1658b40f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
@@ -24,6 +24,8 @@ namespace HandyControl.Controls
 
         private readonly Dictionary<object, TransferEntry> _entryDic = new Dictionary<object, TransferEntry>();
 
+        private readonly List<TransferEntry> _entryList = new List<TransferEntry>();
+
         private SimpleItemsControl _itemsOrigin;
 
         private SimpleItemsControl _itemsSelected;
@@ -113,6 +115,7 @@ namespace HandyControl.Controls
                 SelectedItem = selected
             };
             _entryDic.Add(item, entry);
+            _entryList.Add(entry);
             _itemsOrigin.Items.Add(origin);
             _itemsSelected.Items.Add(selected);
         }
@@ -124,12 +127,14 @@ namespace HandyControl.Controls
                 _itemsOrigin.Items.Remove(entry.OriginItem);
                 _itemsSelected.Items.Remove(entry.SelectedItem);
                 _entryDic.Remove(item);
+                _entryList.Remove(entry);
             }
         }
 
         private void ClearItems()
         {
             _entryDic.Clear();
+            _entryList.Clear();
             _itemsOrigin.Items.Clear();
             _itemsSelected.Items.Clear();
         }
@@ -224,10 +229,10 @@ namespace HandyControl.Controls
 
         protected override void Refresh()
         {
-            if (_entryDic.Count > 0)
+            if (_entryList.Count > 0)
             {
-                _entryDic.Select(item => item.Value.OriginItem).Do(item => _itemsOrigin.Items.Add(item));
-                _entryDic.Select(item => item.Value.SelectedItem).Do(item => _itemsSelected.Items.Add(item));
+                _entryList.Select(item => item.OriginItem).Do(item => _itemsOrigin.Items.Add(item));
+                _entryList.Select(item => item.SelectedItem).Do(item => _itemsSelected.Items.Add(item));
             }
         }
 
diff --git a/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs b/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs
index b57f5e1a..34b09cbd 100644
--- a/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs
+++ b/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-#if !Core
+using System.Windows.Markup;
+#if !Core
 using System.Reflection;
 using System.Runtime.InteropServices;
 
@@ -12,4 +13,14 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: AssemblyVersion("1.5.5")]
-#endif
\ No newline at end of file
+#endif
+
+[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Controls")]
+[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Tools")]
+[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Tools.Converter")]
+[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Interactivity")]
+[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Expression.Shapes")]
+[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Expression.Media")]
+[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Data")]
+[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Properties.Langs")]
+[assembly: XmlnsPrefix("https://handyorg.github.io/handycontrol", "hc")]
\ No newline at end of file

From 084cd55af63c9baf3f430decd27065dabe14ff5a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 22 May 2019 22:27:00 +0800
Subject: [PATCH 04/17] fixed a bug of ImageBrowser

---
 .../Controls/Image/ImageViewer.cs             | 28 ++++++++++++-------
 .../Controls/Window/ImageBrowser.cs           |  1 +
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
index 03cfc734..a531d8d6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
@@ -170,6 +170,8 @@ namespace HandyControl.Controls
             CommandBindings.Add(new CommandBinding(ControlCommands.Enlarge, ButtonEnlarge_OnClick));
             CommandBindings.Add(new CommandBinding(ControlCommands.RotateLeft, ButtonRotateLeft_OnClick));
             CommandBindings.Add(new CommandBinding(ControlCommands.RotateRight, ButtonRotateRight_OnClick));
+
+            Loaded += (s, e) => Init();
         }
 
         /// <summary>
@@ -210,7 +212,13 @@ namespace HandyControl.Controls
             "ShowImgMap", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
 
         public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register(
-            "ImageSource", typeof(BitmapFrame), typeof(ImageViewer), new PropertyMetadata(default(BitmapFrame)));
+            "ImageSource", typeof(BitmapFrame), typeof(ImageViewer), new PropertyMetadata(default(BitmapFrame), OnImageSourceChanged));
+
+        private static void OnImageSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (ImageViewer) d;
+            ctl.Init();
+        }
 
         public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
             "IsFullScreen", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
@@ -416,7 +424,7 @@ namespace HandyControl.Controls
                 _canvasSmallImg.MouseLeave += CanvasSmallImg_OnMouseLeave;
             }
 
-            Init();
+            _borderSmallIsLoaded = false;
         }
 
         private static void OnImageScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -434,7 +442,7 @@ namespace HandyControl.Controls
         /// </summary>
         private void Init()
         {
-            if (ImageSource == null) return;
+            if (ImageSource == null || !IsLoaded) return;
 
             double width;
             double height;
@@ -464,23 +472,22 @@ namespace HandyControl.Controls
             }
 
             _imgWidHeiScale = width / height;
-            Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            var scaleWindow = DesiredSize.Width / DesiredSize.Height;
+            var scaleWindow = ActualWidth / ActualHeight;
             if (_imgWidHeiScale > scaleWindow)
             {
-                if (width > DesiredSize.Width)
-                    ImageScale = DesiredSize.Width / width;
+                if (width > ActualWidth)
+                    ImageScale = ActualWidth / width;
             }
-            else if (height > DesiredSize.Height)
+            else if (height > ActualHeight)
             {
-                ImageScale = DesiredSize.Height / height;
+                ImageScale = ActualHeight / height;
             }
             else
             {
                 ImageScale = 1;
             }
 
-            ImageMargin = new Thickness((DesiredSize.Width - ImageWidth) / 2, (DesiredSize.Height - ImageHeight) / 2, 0, 0);
+            ImageMargin = new Thickness((ActualWidth - ImageWidth) / 2, (ActualHeight - ImageHeight) / 2, 0, 0);
 
             _imgActualScale = ImageScale;
             _imgActualMargin = ImageMargin;
@@ -643,6 +650,7 @@ namespace HandyControl.Controls
         /// </summary>
         private void InitBorderSmall()
         {
+            if (_canvasSmallImg == null) return;
             var scaleWindow = _canvasSmallImg.MaxWidth / _canvasSmallImg.MaxHeight;
             if (_imgWidHeiScale > scaleWindow)
             {
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs b/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
index c9741b62..cfcc61ac 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
@@ -58,6 +58,7 @@ namespace HandyControl.Controls
                 {
                     _imageViewer.ImageSource = BitmapFrame.Create(uri);
                     _imageViewer.ImgPath = uri.AbsolutePath;
+
                     if (File.Exists(_imageViewer.ImgPath))
                     {
                         var info = new FileInfo(_imageViewer.ImgPath);

From 983b2e8c02d80407c57e7191a82fe3e1f3408da6 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 22 May 2019 23:32:12 +0800
Subject: [PATCH 05/17] add KeyboardHook

---
 .../Controls/Time/TimeBar/TimeBar.cs          |  1 -
 .../Data/Args/KeyboardHookEventArgs.cs        | 15 +++++
 .../HandyControl_Shared.projitems             |  4 +-
 .../MouseDragElementBehaviorEx.cs             |  4 +-
 .../Tools/Hook/KeyboardHook.cs                | 57 +++++++++++++++++++
 .../Tools/Interop/NativeMethods.cs            |  2 +
 .../Tools/Interop/UnsafeNativeMethods.cs      |  3 +-
 7 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
 rename src/Shared/HandyControl_Shared/{Tools => Interactivity}/MouseDragElementBehaviorEx.cs (99%)
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs

diff --git a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
index fcc658bf..fa0c9a9f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
@@ -6,7 +6,6 @@ using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Interactivity;
-using HandyControl.Tools;
 
 
 namespace HandyControl.Controls
diff --git a/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
new file mode 100644
index 00000000..3d3eb0b3
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Windows.Input;
+
+namespace HandyControl.Data
+{
+    internal class KeyboardHookEventArgs : EventArgs
+    {
+        public Key Key { get; }
+
+        public KeyboardHookEventArgs(int virtualKey)
+        {
+            Key = KeyInterop.KeyFromVirtualKey(virtualKey);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 39535ac9..0b15d2bc 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -113,6 +113,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\Window.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Args\CancelRoutedEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Args\FunctionEventArgs!1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\Args\KeyboardHookEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Args\MouseHookEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\ColorRange.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\BadgeStatus.cs" />
@@ -246,6 +247,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\SingleOpenHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\ValidateHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\VisualHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Hook\KeyboardHook.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Hook\MouseHook.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\BitmapHandle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\BITMAPINFO.cs" />
@@ -261,7 +263,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\UnsafeNativeMethods.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\WNDCLASS.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\WpfSafeHandle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tools\MouseDragElementBehaviorEx.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\MouseDragElementBehaviorEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\RegularJudgment.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\RegularPatterns.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\StyleSelector\RadioGroupItemStyleSelector.cs" />
diff --git a/src/Shared/HandyControl_Shared/Tools/MouseDragElementBehaviorEx.cs b/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs
similarity index 99%
rename from src/Shared/HandyControl_Shared/Tools/MouseDragElementBehaviorEx.cs
rename to src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs
index a598f167..9232676f 100644
--- a/src/Shared/HandyControl_Shared/Tools/MouseDragElementBehaviorEx.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs
@@ -2,9 +2,9 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
-using HandyControl.Interactivity;
+using HandyControl.Tools;
 
-namespace HandyControl.Tools
+namespace HandyControl.Interactivity
 {
     /// <summary>
     ///     鼠标拖动行为，该类是反编译微软的System.Windows.Interactivity程序集得到的，并对其做了些扩展
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
new file mode 100644
index 00000000..0bd562fd
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using HandyControl.Data;
+using HandyControl.Tools.Interop;
+
+namespace HandyControl.Tools
+{
+    internal class KeyboardHook
+    {
+        public static event EventHandler<KeyboardHookEventArgs> KeyDown;
+
+        public static event EventHandler<KeyboardHookEventArgs> KeyUp;
+
+        private static IntPtr HookId = IntPtr.Zero;
+
+        private static readonly UnsafeNativeMethods.HookProc Proc = HookCallback;
+
+        public static void Start() => HookId = SetHook(Proc);
+
+        public static void Stop() => UnsafeNativeMethods.UnhookWindowsHookEx(HookId);
+
+        private static IntPtr SetHook(UnsafeNativeMethods.HookProc proc)
+        {
+            using (var curProcess = Process.GetCurrentProcess())
+            using (var curModule = curProcess.MainModule)
+            {
+                if (curModule != null)
+                {
+                    return UnsafeNativeMethods.SetWindowsHookEx((int)UnsafeNativeMethods.HookType.WH_KEYBOARD_LL, proc,
+                        UnsafeNativeMethods.GetModuleHandle(curModule.ModuleName), 0);
+                }
+                return IntPtr.Zero;
+            }
+        }
+
+        private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
+        {
+            if (nCode >= 0)
+            {
+                if (wParam == (IntPtr)NativeMethods.WM_KEYDOWN)
+                {
+                    var virtualKey = Marshal.ReadInt32(lParam);
+
+                    KeyDown?.Invoke(null, new KeyboardHookEventArgs(virtualKey));
+                }
+                else if (wParam == (IntPtr)NativeMethods.WM_KEYUP)
+                {
+                    var virtualKey = Marshal.ReadInt32(lParam);
+
+                    KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey));
+                }
+            }
+            return UnsafeNativeMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
index dcff9ac8..94ae1c3b 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
@@ -31,6 +31,8 @@ namespace HandyControl.Tools.Interop
             NIIF_INFO = 0x00000001,
             NIIF_WARNING = 0x00000002,
             NIIF_ERROR = 0x00000003,
+            WM_KEYDOWN = 0x0100,
+            WM_KEYUP = 0x0101,
             WM_MOUSEMOVE = 0x0200,
             WM_LBUTTONDOWN = 0x0201,
             WM_LBUTTONUP = 0x0202,
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
index 1c893525..2e4d1908 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/UnsafeNativeMethods.cs
@@ -186,7 +186,8 @@ namespace HandyControl.Tools.Interop
 
         public enum HookType
         {
-            WH_MOUSE_LL = 14,
+            WH_KEYBOARD_LL = 13,
+            WH_MOUSE_LL = 14
         }
 
         [StructLayout(LayoutKind.Sequential)]

From 6e3171259ee5c941227b599efd6fd28d1c2f130a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 23 May 2019 23:50:07 +0800
Subject: [PATCH 06/17] Completed the main functions

---
 .../HandyControlDemo_Shared/App.xaml.cs       |   3 -
 .../HandyControlDemo_Shared/MainWindow.xaml   |   4 +
 .../MainWindow.xaml.cs                        |   3 +
 .../ViewModel/Main/MainViewModel.cs           |  11 +-
 .../Data/Args/KeyboardHookEventArgs.cs        |   5 +-
 .../HandyControl_Shared.projitems             |   1 +
 .../Tools/GlobalShortcut.cs                   | 116 ++++++++++++++++++
 .../Tools/Hook/KeyboardHook.cs                |  55 +++++++--
 .../Tools/Hook/MouseHook.cs                   |   9 +-
 .../Tools/Interop/NativeMethods.cs            |   2 +
 10 files changed, 195 insertions(+), 14 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs

diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index b597e60c..3f67d7c5 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Globalization;
-using System.Threading;
 using System.Windows;
-using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControlDemo.Data;
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index fabf5ef1..51e33d9b 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -23,6 +23,10 @@
                      hc:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
                      d:DesignHeight="800" 
                      d:DesignWidth="1400">
+    <hc:GlobalShortcut.KeyBindings>
+        <KeyBinding Modifiers="Control+Alt" Key="I" Command="{Binding GlobalShortcutInfoCmd}"/>
+        <KeyBinding Modifiers="Control+Alt" Key="E" Command="{Binding GlobalShortcutErrorCmd}"/>
+    </hc:GlobalShortcut.KeyBindings>
     <hc:Window.NonClientAreaContent>
         <userControl:NoUserContent/>
     </hc:Window.NonClientAreaContent>
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
index ec24646f..5b5db38e 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
+using HandyControl.Tools;
 using HandyControlDemo.Data;
 using HandyControlDemo.Tools;
 
@@ -21,6 +22,8 @@ namespace HandyControlDemo
             Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
             Messenger.Default.Send(true, MessageToken.FullSwitch);
             Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.OverView}"), MessageToken.LoadShowContent);
+
+            GlobalShortcut.Init(this);
         }
 
         protected override void OnClosing(CancelEventArgs e)
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
index c2d992cb..6382450c 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
@@ -6,6 +6,7 @@ using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.CommandWpf;
 #endif
 using GalaSoft.MvvmLight.Messaging;
+using HandyControl.Controls;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 using HandyControlDemo.Tools;
@@ -98,9 +99,15 @@ namespace HandyControlDemo.ViewModel
         public RelayCommand OpenOverviewCmd => new Lazy<RelayCommand>(() =>
             new RelayCommand(OpenOverview)).Value;
 
-#endregion
+        public RelayCommand GlobalShortcutInfoCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(() => Growl.Info("Global Shortcut Info"))).Value;
 
-#region 方法
+        public RelayCommand GlobalShortcutErrorCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(() => Growl.Info("Global Shortcut Error"))).Value;
+
+        #endregion
+
+        #region 方法
 
         /// <summary>
         ///     切换例子
diff --git a/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
index 3d3eb0b3..717c6384 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
@@ -5,10 +5,13 @@ namespace HandyControl.Data
 {
     internal class KeyboardHookEventArgs : EventArgs
     {
+        public bool IsSystemKey { get; }
+
         public Key Key { get; }
 
-        public KeyboardHookEventArgs(int virtualKey)
+        public KeyboardHookEventArgs(int virtualKey, bool isSystemKey)
         {
+            IsSystemKey = isSystemKey;
             Key = KeyInterop.KeyFromVirtualKey(virtualKey);
         }
     }
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 0b15d2bc..1c6a298b 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -19,6 +19,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\LinkElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\PanelElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\PasswordBoxMonitor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\GlobalShortcut.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\StatusSwitchElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\TipElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\TitleElement.cs" />
diff --git a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
new file mode 100644
index 00000000..2c51ef61
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Input;
+using HandyControl.Data;
+
+namespace HandyControl.Tools
+{
+    public class GlobalShortcut
+    {
+        private static ModifierKeys ModifierKeys;
+
+        private static readonly Dictionary<string, KeyBinding> CommandDic = new Dictionary<string, KeyBinding>();
+
+        static GlobalShortcut()
+        {
+            KeyboardHook.KeyDown += KeyboardHook_KeyDown;
+        }
+
+        private static void KeyboardHook_KeyDown(object sender, KeyboardHookEventArgs e) => HitTest(e.Key);
+
+        private static void HitTest(Key key)
+        {
+            Console.WriteLine(key.ToString());
+            if (IsModifierKey(key))
+            {
+                ModifierKeys |= GetModifierKey(key);
+            }
+            else
+            {
+                var keyStr = ModifierKeys != ModifierKeys.None ? $"{ModifierKeys.ToString()}, {key.ToString()}" : key.ToString();
+                ExecuteCommand(keyStr);
+            }
+        }
+
+        private static void ExecuteCommand(string key)
+        {
+            if (string.IsNullOrEmpty(key)) return;
+            if (CommandDic.ContainsKey(key))
+            {
+                var keyBinding = CommandDic[key];
+                var command = keyBinding.Command;
+                if (command != null && command.CanExecute(keyBinding.CommandParameter))
+                {
+                    command.Execute(keyBinding.CommandParameter);
+                }
+            }
+        }
+
+        private static ModifierKeys GetModifierKey(Key key)
+        {
+            switch (key)
+            {
+                case Key.LeftCtrl:
+                case Key.RightCtrl:
+                    return ModifierKeys.Control;
+                case Key.LeftAlt:
+                case Key.RightAlt:
+                    return ModifierKeys.Alt;
+                case Key.LeftShift:
+                case Key.RightShift:
+                    return ModifierKeys.Shift;
+                case Key.LWin:
+                case Key.RWin:
+                    return ModifierKeys.Windows;
+                default:
+                    return ModifierKeys.None;
+            }
+        }
+
+        private static bool IsModifierKey(Key key)
+        {
+            return key == Key.LeftCtrl || key == Key.LeftAlt || key == Key.LeftShift || key == Key.LWin ||
+                   key == Key.RightCtrl || key == Key.RightAlt || key == Key.RightShift || key == Key.RWin;
+        }
+
+        public static void Init(DependencyObject host)
+        {
+            CommandDic.Clear();
+
+            if (host == null) return;
+
+            var keyBindings = GetKeyBindings(host);
+            if (keyBindings == null || keyBindings.Count == 0) return;
+
+            foreach (KeyBinding item in keyBindings)
+            {
+                if (item.Key == Key.None)
+                {
+                    continue;
+                }
+
+                if (item.Modifiers == ModifierKeys.None)
+                {
+                    CommandDic[item.Key.ToString()] = item;
+                }
+                else
+                {
+                    var keyStr = $"{item.Modifiers.ToString()}, {item.Key.ToString()}";
+                    CommandDic[keyStr] = item;
+                }
+            }
+
+            KeyboardHook.Start();
+        }
+
+        public static readonly DependencyProperty KeyBindingsProperty = DependencyProperty.RegisterAttached(
+            "KeyBindings", typeof(InputBindingCollection), typeof(GlobalShortcut), new PropertyMetadata(new InputBindingCollection()));
+
+        public static void SetKeyBindings(DependencyObject element, InputBindingCollection value)
+            => element.SetValue(KeyBindingsProperty, value);
+
+        public static InputBindingCollection GetKeyBindings(DependencyObject element)
+            => (InputBindingCollection) element.GetValue(KeyBindingsProperty);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
index 0bd562fd..9f171d48 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
@@ -16,7 +16,24 @@ namespace HandyControl.Tools
 
         private static readonly UnsafeNativeMethods.HookProc Proc = HookCallback;
 
-        public static void Start() => HookId = SetHook(Proc);
+        private static int VirtualKey;
+
+        private static readonly IntPtr KeyDownIntPtr = (IntPtr)NativeMethods.WM_KEYDOWN;
+
+        private static readonly IntPtr KeyUpIntPtr = (IntPtr)NativeMethods.WM_KEYUP;
+
+        private static readonly IntPtr SyskeyDownIntPtr = (IntPtr)NativeMethods.WM_SYSKEYDOWN;
+
+        private static readonly IntPtr SyskeyUpIntPtr = (IntPtr)NativeMethods.WM_SYSKEYUP;
+
+        public static void Start()
+        {
+            if (HookId != IntPtr.Zero)
+            {
+                Stop();
+            }
+            HookId = SetHook(Proc);
+        }
 
         public static void Stop() => UnsafeNativeMethods.UnhookWindowsHookEx(HookId);
 
@@ -38,17 +55,41 @@ namespace HandyControl.Tools
         {
             if (nCode >= 0)
             {
-                if (wParam == (IntPtr)NativeMethods.WM_KEYDOWN)
+                if (wParam == KeyDownIntPtr)
                 {
                     var virtualKey = Marshal.ReadInt32(lParam);
-
-                    KeyDown?.Invoke(null, new KeyboardHookEventArgs(virtualKey));
+                    if (VirtualKey != virtualKey)
+                    {
+                        VirtualKey = virtualKey;
+                        KeyDown?.Invoke(null, new KeyboardHookEventArgs(virtualKey, false));
+                    }
                 }
-                else if (wParam == (IntPtr)NativeMethods.WM_KEYUP)
+                else if (wParam == SyskeyDownIntPtr)
                 {
                     var virtualKey = Marshal.ReadInt32(lParam);
-
-                    KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey));
+                    if (VirtualKey != virtualKey)
+                    {
+                        VirtualKey = virtualKey;
+                        KeyDown?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
+                    }
+                }
+                else if (wParam == KeyUpIntPtr)
+                {
+                    var virtualKey = Marshal.ReadInt32(lParam);
+                    if (VirtualKey != virtualKey)
+                    {
+                        VirtualKey = virtualKey;
+                        KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, false));
+                    }
+                }
+                else if (wParam == SyskeyUpIntPtr)
+                {
+                    var virtualKey = Marshal.ReadInt32(lParam);
+                    if (VirtualKey != virtualKey)
+                    {
+                        VirtualKey = virtualKey;
+                        KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
+                    }
                 }
             }
             return UnsafeNativeMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
index e7e2d0d1..5405c6cf 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
@@ -14,7 +14,14 @@ namespace HandyControl.Tools
 
         private static readonly UnsafeNativeMethods.HookProc Proc = HookCallback;
 
-        public static void Start() => HookId = SetHook(Proc);
+        public static void Start()
+        {
+            if (HookId != IntPtr.Zero)
+            {
+                Stop();
+            }
+            HookId = SetHook(Proc);
+        }
 
         public static void Stop() => UnsafeNativeMethods.UnhookWindowsHookEx(HookId);
 
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
index 94ae1c3b..66c17772 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/NativeMethods.cs
@@ -33,6 +33,8 @@ namespace HandyControl.Tools.Interop
             NIIF_ERROR = 0x00000003,
             WM_KEYDOWN = 0x0100,
             WM_KEYUP = 0x0101,
+            WM_SYSKEYDOWN = 0x0104,
+            WM_SYSKEYUP = 0x0105,
             WM_MOUSEMOVE = 0x0200,
             WM_LBUTTONDOWN = 0x0201,
             WM_LBUTTONUP = 0x0202,

From a269739949b2103ffa9f6839afccae594464c88b Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 24 May 2019 00:27:40 +0800
Subject: [PATCH 07/17] completed the branch

---
 .../HandyControlDemo_Shared/MainWindow.xaml   |  4 +-
 .../ViewModel/Main/MainViewModel.cs           |  4 +-
 .../Tools/GlobalShortcut.cs                   | 41 +++----------------
 .../Tools/Hook/KeyboardHook.cs                | 14 ++-----
 4 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index 51e33d9b..cde47eb6 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -24,8 +24,8 @@
                      d:DesignHeight="800" 
                      d:DesignWidth="1400">
     <hc:GlobalShortcut.KeyBindings>
-        <KeyBinding Modifiers="Control+Alt" Key="I" Command="{Binding GlobalShortcutInfoCmd}"/>
-        <KeyBinding Modifiers="Control+Alt" Key="E" Command="{Binding GlobalShortcutErrorCmd}"/>
+        <KeyBinding Modifiers="Control+Alt" Key="I" Command="{Binding Main.GlobalShortcutInfoCmd, Source={StaticResource Locator}}"/>
+        <KeyBinding Modifiers="Control+Alt" Key="E" Command="{Binding Main.GlobalShortcutWarningCmd, Source={StaticResource Locator}}"/>
     </hc:GlobalShortcut.KeyBindings>
     <hc:Window.NonClientAreaContent>
         <userControl:NoUserContent/>
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
index 6382450c..5b3c1691 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
@@ -102,8 +102,8 @@ namespace HandyControlDemo.ViewModel
         public RelayCommand GlobalShortcutInfoCmd => new Lazy<RelayCommand>(() =>
             new RelayCommand(() => Growl.Info("Global Shortcut Info"))).Value;
 
-        public RelayCommand GlobalShortcutErrorCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(() => Growl.Info("Global Shortcut Error"))).Value;
+        public RelayCommand GlobalShortcutWarningCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(() => Growl.Warning("Global Shortcut Warning"))).Value;
 
         #endregion
 
diff --git a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
index 2c51ef61..ce248ba5 100644
--- a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
+++ b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Input;
 using HandyControl.Data;
@@ -8,8 +7,6 @@ namespace HandyControl.Tools
 {
     public class GlobalShortcut
     {
-        private static ModifierKeys ModifierKeys;
-
         private static readonly Dictionary<string, KeyBinding> CommandDic = new Dictionary<string, KeyBinding>();
 
         static GlobalShortcut()
@@ -21,16 +18,11 @@ namespace HandyControl.Tools
 
         private static void HitTest(Key key)
         {
-            Console.WriteLine(key.ToString());
-            if (IsModifierKey(key))
-            {
-                ModifierKeys |= GetModifierKey(key);
-            }
-            else
-            {
-                var keyStr = ModifierKeys != ModifierKeys.None ? $"{ModifierKeys.ToString()}, {key.ToString()}" : key.ToString();
-                ExecuteCommand(keyStr);
-            }
+            if (IsModifierKey(key)) return;
+
+            var modifierKeys = Keyboard.Modifiers;
+            var keyStr = modifierKeys != ModifierKeys.None ? $"{modifierKeys.ToString()}, {key.ToString()}" : key.ToString();
+            ExecuteCommand(keyStr);
         }
 
         private static void ExecuteCommand(string key)
@@ -47,27 +39,6 @@ namespace HandyControl.Tools
             }
         }
 
-        private static ModifierKeys GetModifierKey(Key key)
-        {
-            switch (key)
-            {
-                case Key.LeftCtrl:
-                case Key.RightCtrl:
-                    return ModifierKeys.Control;
-                case Key.LeftAlt:
-                case Key.RightAlt:
-                    return ModifierKeys.Alt;
-                case Key.LeftShift:
-                case Key.RightShift:
-                    return ModifierKeys.Shift;
-                case Key.LWin:
-                case Key.RWin:
-                    return ModifierKeys.Windows;
-                default:
-                    return ModifierKeys.None;
-            }
-        }
-
         private static bool IsModifierKey(Key key)
         {
             return key == Key.LeftCtrl || key == Key.LeftAlt || key == Key.LeftShift || key == Key.LWin ||
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
index 9f171d48..32bb8dcf 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
@@ -76,20 +76,14 @@ namespace HandyControl.Tools
                 else if (wParam == KeyUpIntPtr)
                 {
                     var virtualKey = Marshal.ReadInt32(lParam);
-                    if (VirtualKey != virtualKey)
-                    {
-                        VirtualKey = virtualKey;
-                        KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, false));
-                    }
+                    VirtualKey = -1;
+                    KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, false));
                 }
                 else if (wParam == SyskeyUpIntPtr)
                 {
                     var virtualKey = Marshal.ReadInt32(lParam);
-                    if (VirtualKey != virtualKey)
-                    {
-                        VirtualKey = virtualKey;
-                        KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
-                    }
+                    VirtualKey = -1;
+                    KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
                 }
             }
             return UnsafeNativeMethods.CallNextHookEx(HookId, nCode, wParam, lParam);

From ee4125e2bf965e795431748c563ba77bc53f9002 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 27 May 2019 23:32:04 +0800
Subject: [PATCH 08/17] add FocusVisualStyle for some controls

---
 README.md                                     |  2 +-
 .../HandyControlDemo_Shared/MainWindow.xaml   |  2 +-
 .../Styles/ToggleButtonDemoCtl.xaml           | 12 ++++-----
 .../Controls/ColorPicker/ColorPicker.cs       |  2 +-
 .../HandyControl_Shared.projitems             |  4 +++
 .../Themes/Styles/Base/BaseStyle.xaml         | 21 +++++++++++++++
 .../Styles/Base/ButtonBaseBaseStyle.xaml      |  3 ---
 .../Themes/Styles/Base/CheckBoxBaseStyle.xaml | 21 ++++++++++++---
 .../Styles/Base/RadioButtonBaseStyle.xaml     | 27 ++++++++++++-------
 .../Styles/Base/RadioGroupBaseStyle.xaml      |  2 ++
 .../Themes/Styles/Base/SideMenuBaseStyle.xaml | 10 +++++--
 .../Styles/Base/ToggleButtonBaseStyle.xaml    | 20 ++++++++++----
 .../Themes/Styles/Button.xaml                 |  6 +----
 .../Themes/Styles/ColorPicker.xaml            |  2 +-
 .../Themes/Styles/GridSplitter.xaml           |  7 +++++
 .../Themes/Styles/RepeatButton.xaml           |  6 +----
 .../Themes/Styles/Style.xaml                  |  1 +
 .../Themes/Styles/ToggleButton.xaml           |  6 +----
 18 files changed, 107 insertions(+), 47 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/GridSplitter.xaml

diff --git a/README.md b/README.md
index 29fc1921..18acdfdb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![logo](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/icon.png)
 
-![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-7.0-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2017-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) [![build-status](https://ci.appveyor.com/api/projects/status/github/handyorg/handycontrol?svg=true)](https://ci.appveyor.com/project/NaBian/handycontrol) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1)
+![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-7.0-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2017-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) [![build-status](https://ci.appveyor.com/api/projects/status/github/handyorg/handycontrol?svg=true)](https://ci.appveyor.com/project/handyorg/handycontrol) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1)
 [![wiki](https://img.shields.io/badge/wiki-Complete-brightgreen.svg)](https://github.com/ghost1372/HandyControl/wiki)
 
 # Welcome to HandyControl
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index cde47eb6..ca38791a 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -15,9 +15,9 @@
                      OtherButtonHoverForeground="White"
                      OtherButtonForeground="White"
                      Style="{StaticResource WindowBlur}"
-                     WindowState="Maximized"
                      Title="MainWindow" 
                      ResizeMode="CanResizeWithGrip"
+                     WindowStartupLocation="CenterScreen"
                      Name="MyWindow"
                      DataContext="{Binding Main,Source={StaticResource Locator}}"
                      hc:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
index bc4d4ca7..aba17c7e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
@@ -77,23 +77,23 @@
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconTransparent"/>
                     </StackPanel>
                     <StackPanel>
-                        <ToggleButton IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+                        <ToggleButton IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True" Margin="5">
                             <hc:StatusSwitchElement.CheckedElement>
-                                <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
+                                <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                                     <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                                 </Border>
                             </hc:StatusSwitchElement.CheckedElement>
-                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
+                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                                 <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                             </Border>
                         </ToggleButton>
-                        <ToggleButton IsEnabled="False" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+                        <ToggleButton IsEnabled="False" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True" Margin="5">
                             <hc:StatusSwitchElement.CheckedElement>
-                                <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
+                                <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                                     <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                                 </Border>
                             </hc:StatusSwitchElement.CheckedElement>
-                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
+                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                                 <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                             </Border>
                         </ToggleButton>
diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
index 1170a3f9..8f9cf4b8 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
@@ -453,7 +453,7 @@ namespace HandyControl.Controls
 
             var button = new Button
             {
-                Margin = new Thickness(0, 0, 12, 12),
+                Margin = new Thickness(6),
                 Style = ResourceHelper.GetResource<Style>(ResourceToken.ButtonCustom),
                 Content = new Border
                 {
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 1c6a298b..15dd9917 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -331,6 +331,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\GridSplitter.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Badge.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
index 083712a6..8a950d8c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
@@ -5,9 +5,30 @@
         <ResourceDictionary Source="../../Basic/Fonts.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"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="FocusVisualRadius0">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Margin="-2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style x:Key="BaseStyle" TargetType="Control">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="FontSize" Value="{StaticResource TextFontSize}"/>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
index 455f44ce..c9fcc5bf 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
@@ -16,9 +16,6 @@
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Focusable" Value="False"/>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml
index d76c9d47..93b0c69e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml
@@ -2,11 +2,26 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
-    <Style x:Key="CheckBoxBaseStyle" TargetType="CheckBox">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="BaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="CheckBoxBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CheckBox">
+        <Setter Property="FocusVisualStyle">
+            <Setter.Value>
+                <Style>
+                    <Setter Property="Control.Template">
+                        <Setter.Value>
+                            <ControlTemplate>
+                                <Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Background" Value="White"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
index 21d815bd..a956a666 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
@@ -4,14 +4,26 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="BaseStyle.xaml"/>
         <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="RadioButtonBaseStyle" TargetType="RadioButton">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+    <Style x:Key="RadioButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+        <Setter Property="FocusVisualStyle">
+            <Setter.Value>
+                <Style>
+                    <Setter Property="Control.Template">
+                        <Setter.Value>
+                            <ControlTemplate>
+                                <Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -94,12 +106,11 @@
         </Setter>
     </Style>
 
-    <Style x:Key="RadioButtonIconBaseStyle" TargetType="RadioButton">
+    <Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
         <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}"/>
         <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -148,11 +159,9 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="RadioGroupItemBaseStyle" TargetType="RadioButton">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+    <Style x:Key="RadioGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
         <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="VerticalAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioGroupBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioGroupBaseStyle.xaml
index 865b2def..4d702304 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioGroupBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioGroupBaseStyle.xaml
@@ -11,6 +11,8 @@
     </ItemsPanelTemplate>
 
     <Style x:Key="RadioGroupBaseStyle" TargetType="controls:RadioGroup">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="ItemsPanel" Value="{StaticResource RadioGroupHorizontalItemsPanelTemplate}"/>
         <Setter Property="controls:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="controls:TitleElement.Background" Value="{DynamicResource RegionBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
index 5bdde1c6..3c76600b 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
@@ -2,7 +2,11 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
-    <Style x:Key="SideMenuItemBaseStyle" TargetType="controls:SideMenuItem">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="BaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="SideMenuItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="controls:SideMenuItem">
         <Setter Property="Role" Value="Item"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
@@ -82,7 +86,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="SideMenuItemHeaderBaseStyle" TargetType="controls:SideMenuItem">
+    <Style x:Key="SideMenuItemHeaderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="controls:SideMenuItem">
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemBaseStyle}"/>
@@ -169,6 +173,8 @@
     </Style>
 
     <Style x:Key="SideMenuBaseStyle" TargetType="controls:SideMenu">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderBaseStyle}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
index dc041caa..d997f3f3 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
@@ -51,11 +51,22 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="ToggleButtonSwitchBaseStyle" TargetType="ToggleButton">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+    <Style x:Key="ToggleButtonSwitchBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+        <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="11" RadiusY="11"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Padding" Value="6,0,0,0"/>
@@ -162,14 +173,13 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ToggleButtonIconBaseStyle" TargetType="ToggleButton">
+    <Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
         <Setter Property="Width" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Padding" Value="8"/>
         <Setter Property="controls:IconSwitchElement.Geometry" Value="{x:Null}"/>
         <Setter Property="controls:IconSwitchElement.GeometrySelected" Value="{x:Null}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
         <Setter Property="BorderBrush" Value="{DynamicResource DarkMaskBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
index 9d46b9e3..238edc28 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
@@ -51,15 +51,11 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ButtonCustom" TargetType="Button">
+    <Style x:Key="ButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{x:Null}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ColorPicker.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ColorPicker.xaml
index a6b7748b..92ec48d9 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ColorPicker.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ColorPicker.xaml
@@ -108,7 +108,7 @@
                             </Button>
                         </Grid>
                         <Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
-                            <WrapPanel Name="PART_PanelColor" Margin="12,12,0,12" HorizontalAlignment="Center"/>
+                            <WrapPanel Name="PART_PanelColor" Margin="6" HorizontalAlignment="Center"/>
                         </Border>
                         <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/GridSplitter.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/GridSplitter.xaml
new file mode 100644
index 00000000..ce1add67
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/GridSplitter.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <Style TargetType="GridSplitter">
+        <Setter Property="Focusable" Value="False"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
index 2644dc8e..11e26f97 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
@@ -51,15 +51,11 @@
         </Setter>
     </Style>
 
-    <Style x:Key="RepeatButtonCustom" TargetType="RepeatButton">
+    <Style x:Key="RepeatButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{x:Null}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
index 5a971e9d..47fe0953 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
@@ -63,6 +63,7 @@
         <ResourceDictionary Source="Badge.xaml"/>
         <ResourceDictionary Source="Dialog.xaml"/>
         <ResourceDictionary Source="SideMenu.xaml"/>
+        <ResourceDictionary Source="GridSplitter.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
index 2afe67cb..64233659 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
@@ -102,17 +102,13 @@
     <Style x:Key="ToggleButtonSwitch" BasedOn="{StaticResource ToggleButtonSwitchBaseStyle}" TargetType="ToggleButton"/>
 
     <!--自定义-->
-    <Style x:Key="ToggleButtonCustom" TargetType="ToggleButton">
+    <Style x:Key="ToggleButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>

From cf5f84869dfe62ffa04e4d46c6b2d84897c593a8 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 28 May 2019 23:47:07 +0800
Subject: [PATCH 09/17] add Recommendation

---
 .../UserControl/Main/NoUserContent.xaml       | 38 ++++++++++-----
 .../UserControl/Main/NoUserContent.xaml.cs    | 28 ++---------
 .../Themes/Styles/Window.xaml                 |  4 ++
 .../Data/MessageToken.cs                      |  4 ++
 .../Data/MessageToken.tt                      |  4 +-
 .../{ContributorModel.cs => AvatarModel.cs}   |  4 +-
 .../HandyControlDemo_Shared.projitems         | 19 +++++++-
 .../Properties/Langs/Lang.Designer.cs         | 18 +++++++
 .../Properties/Langs/Lang.en.resx             |  6 +++
 .../Properties/Langs/Lang.resx                |  6 +++
 .../Resources/Themes/Basic/Brushes.xaml       | 48 +++++++++++++++++++
 .../Resources/Themes/Basic/Geometries.xaml    |  2 +
 .../Service/DataService.cs                    | 46 ++++++++++++++++--
 .../UserControl/Basic/Avatar.xaml             |  7 +--
 .../UserControl/Basic/Avatar.xaml.cs          | 10 ++--
 .../Controls/AnimationPathDemoCtl.xaml.cs     |  3 +-
 .../UserControl/Controls/ShieldDemoCtl.xaml   |  4 +-
 .../UserControl/Main/BlogsView.xaml           | 14 ++++++
 .../UserControl/Main/BlogsView.xaml.cs        | 10 ++++
 .../UserControl/Main/ContributorsView.xaml    |  2 +-
 .../UserControl/Main/OverView.xaml            |  4 +-
 .../UserControl/Main/ProjectsView.xaml        | 14 ++++++
 .../UserControl/Main/ProjectsView.xaml.cs     | 10 ++++
 .../ViewModel/Main/ContributorsViewModel.cs   | 24 ----------
 .../ViewModel/Main/ItemsDisplayViewModel.cs   | 19 ++++++++
 .../ViewModel/Main/NoUserViewModel.cs         | 22 +++++++++
 .../ViewModel/ViewModelLocator.cs             | 13 ++++-
 .../Controls/Attach/LinkElement.cs            | 47 ------------------
 .../HandyControl_Shared.projitems             |  8 ++--
 .../{ => Commands}/ControlCommands.cs         |  2 +-
 .../Interactivity/Commands/OpenLinkCommand.cs | 21 ++++++++
 .../PushMainWindow2TopCommand.cs              |  0
 .../{ => Commands}/ShutdownAppCommand.cs      |  0
 33 files changed, 320 insertions(+), 141 deletions(-)
 rename src/Shared/HandyControlDemo_Shared/Data/Model/{ContributorModel.cs => AvatarModel.cs} (63%)
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
 delete mode 100644 src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs
 create mode 100644 src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
 create mode 100644 src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs
 delete mode 100644 src/Shared/HandyControl_Shared/Controls/Attach/LinkElement.cs
 rename src/Shared/HandyControl_Shared/Interactivity/{ => Commands}/ControlCommands.cs (97%)
 create mode 100644 src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
 rename src/Shared/HandyControl_Shared/Interactivity/{ => Commands}/PushMainWindow2TopCommand.cs (100%)
 rename src/Shared/HandyControl_Shared/Interactivity/{ => Commands}/ShutdownAppCommand.cs (100%)

diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml
index 6412815f..ba1c6ec4 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml
@@ -3,7 +3,9 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
       Height="29"
-      xmlns:hc="https://handyorg.github.io/handycontrol">
+      DataContext="{Binding NoUser,Source={StaticResource Locator}}"
+      xmlns:hc="https://handyorg.github.io/handycontrol"
+      xmlns:data="clr-namespace:HandyControlDemo.Data">
     <Grid.ColumnDefinitions>
         <ColumnDefinition/>
         <ColumnDefinition Width="Auto"/>
@@ -20,36 +22,41 @@
             </hc:Interaction.Triggers>
             <Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
         </Button>
-        <Menu MenuItem.Click="MenuItemLinks_OnClick"  Margin="10,0,0,0" Background="Transparent">
+        <Menu Margin="10,0,0,0" Background="Transparent">
             <MenuItem Foreground="White" Header="{x:Static langs:Lang.Repository}">
-                <MenuItem Tag="https://github.com/NaBian/HandyControl" Header="GitHub">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://github.com/NaBian/HandyControl" Header="GitHub">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource GithubGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://www.nuget.org/packages/HandyControl" Header="NuGet">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://www.nuget.org/packages/HandyControl" Header="NuGet">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource NugetGeometry}" Fill="#30a5dd"/>
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
             <MenuItem Foreground="White" Header="{x:Static langs:Lang.About}">
-                <MenuItem Click="MenuItemQQGroup_OnClick" Header="{x:Static langs:Lang.QQGroup}">
+                <MenuItem Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.ContributorsView}" Header="{x:Static langs:Lang.Contributors}">
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.QQGroupView}" Header="{x:Static langs:Lang.QQGroup}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource QqGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="mailto:836904362@qq.com" Header="{x:Static langs:Lang.Email}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="mailto:836904362@qq.com" Header="{x:Static langs:Lang.Email}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource WarningBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://gitter.im/HandyControl/Lobby" Header="{x:Static langs:Lang.Chatroom}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://gitter.im/HandyControl/Lobby" Header="{x:Static langs:Lang.Chatroom}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource GitterGeometry}" Fill="#e52e64"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://www.cnblogs.com/nabian" Header="{x:Static langs:Lang.Blog}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://www.cnblogs.com/nabian" Header="{x:Static langs:Lang.Blog}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
                     </MenuItem.Icon>
@@ -60,10 +67,17 @@
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
-            <MenuItem Click="MenuItemContributors_OnClick" Foreground="White" Header="{x:Static langs:Lang.Contributors}">
-                <MenuItem.Icon>
-                    <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00"/>
-                </MenuItem.Icon>
+            <MenuItem Foreground="White" Header="{x:Static langs:Lang.Recommendation}">
+                <MenuItem Header="{x:Static langs:Lang.Project}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.ProjectsView}" >
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource ProjectGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="{x:Static langs:Lang.Blog}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.BlogsView}" >
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource BlogGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
         </Menu>
     </StackPanel>
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
index 2c886173..0fdb34ad 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
@@ -5,10 +5,8 @@ using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.Data;
-using HandyControlDemo.Tools;
 using HandyControlDemo.Window;
 
-
 namespace HandyControlDemo.UserControl
 {
     public partial class NoUserContent
@@ -29,7 +27,9 @@ namespace HandyControlDemo.UserControl
                     if (!b) return true;
                     GlobalData.Config.Lang = tag;
                     GlobalData.Save();
-                    Process.Start(Process.GetCurrentProcess().MainModule.FileName);
+                    var processModule = Process.GetCurrentProcess().MainModule;
+                    if (processModule != null)
+                        Process.Start(processModule.FileName);
                     Application.Current.Shutdown();
                     return true;
                 });
@@ -50,28 +50,6 @@ namespace HandyControlDemo.UserControl
             }
         }
 
-        private void MenuItemLinks_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is MenuItem menuItem && menuItem.Tag is string tag)
-            {
-                Process.Start(tag);
-            }
-        }
-
-        private void MenuItemQQGroup_OnClick(object sender, RoutedEventArgs e)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.QQGroupView}"), MessageToken.LoadShowContent);
-        }
-
-        private void MenuItemContributors_OnClick(object sender, RoutedEventArgs e)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.ContributorsView}"), MessageToken.LoadShowContent);
-        }
-
         private void MenuAbout_OnClick(object sender, RoutedEventArgs e)
         {
             new AboutWindow
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
index c93bc3f5..042c245e 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml
@@ -46,6 +46,10 @@
         </Setter>
     </Style>
 
+    <Style TargetType="Window">
+        <Setter Property="UseLayoutRounding" Value="True"/>
+    </Style>
+
     <Style x:Key="WindowDefault" TargetType="Window">
         <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
index d5fce6b2..6c8afdee 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
@@ -174,5 +174,9 @@
 
         public static readonly string OverView = nameof(OverView);
 
+        public static readonly string ProjectsView = nameof(ProjectsView);
+
+        public static readonly string BlogsView = nameof(BlogsView);
+
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
index 5117bc00..be30c7f5 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
+++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
@@ -98,7 +98,9 @@ var messageList = new List<string>
 	"GrowlDemoPanel",
 	"DialogDemoWindow",
 	"MainWindow",
-	"OverView"
+	"OverView",
+	"ProjectsView",
+	"BlogsView"
 };
 #>
 namespace HandyControlDemo.Data
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/ContributorModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
similarity index 63%
rename from src/Shared/HandyControlDemo_Shared/Data/Model/ContributorModel.cs
rename to src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
index 8fe9934f..8669090b 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/ContributorModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
@@ -1,9 +1,9 @@
 
 namespace HandyControlDemo.Data
 {
-    public class ContributorModel
+    public class AvatarModel
     {
-        public string UserName { get; set; }
+        public string DisplayName { get; set; }
 
         public string Link { get; set; }
 
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index 089614fe..0671a61b 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -17,7 +17,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\DemoType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\GlobalData.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Model\ChatInfoModel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\ContributorModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\AvatarModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Model\CoverViewDemoModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Model\DemoDataModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Model\StepBarDemoModel.cs" />
@@ -180,6 +180,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\WindowDemoCtl.xaml.cs">
       <DependentUpon>WindowDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\BlogsView.xaml.cs">
+      <DependentUpon>BlogsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\ProjectsView.xaml.cs">
+      <DependentUpon>ProjectsView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\OverView.xaml.cs">
       <DependentUpon>OverView.xaml</DependentUpon>
     </Compile>
@@ -295,8 +301,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\TabControlDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\WindowDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\DemoViewModelBase!1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\ContributorsViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\ItemsDisplayViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\MainViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\NoUserViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\ViewModelLocator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Window\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
@@ -565,6 +572,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\BlogsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\ProjectsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\OverView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 6247b2cb..eebfd40f 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -1041,6 +1041,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 项目 的本地化字符串。
+        /// </summary>
+        public static string Project {
+            get {
+                return ResourceManager.GetString("Project", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 按住说话 的本地化字符串。
         /// </summary>
@@ -1077,6 +1086,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 推荐 的本地化字符串。
+        /// </summary>
+        public static string Recommendation {
+            get {
+                return ResourceManager.GetString("Recommendation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 注册 的本地化字符串。
         /// </summary>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index 2705cc41..e63fd4e1 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -600,4 +600,10 @@
   <data name="Border" xml:space="preserve">
     <value>Border</value>
   </data>
+  <data name="Recommendation" xml:space="preserve">
+    <value>Recommendation</value>
+  </data>
+  <data name="Project" xml:space="preserve">
+    <value>Project</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
index d10f5ec2..aa50af7a 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -600,4 +600,10 @@
   <data name="ResponsiveLayout" xml:space="preserve">
     <value>响应式布局</value>
   </data>
+  <data name="Recommendation" xml:space="preserve">
+    <value>推荐</value>
+  </data>
+  <data name="Project" xml:space="preserve">
+    <value>项目</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
index 23505a2b..8fb15afa 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
@@ -46,6 +46,54 @@
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
+    <DrawingBrush x:Key="BlogDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,120,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+        <DrawingBrush.Transform>
+            <TransformGroup>
+                <RotateTransform Angle="20"/>
+            </TransformGroup>
+        </DrawingBrush.Transform>
+        <DrawingBrush.Drawing>
+            <GeometryDrawing>
+                <GeometryDrawing.Geometry>
+                    <RectangleGeometry Rect="0,0,120,100"></RectangleGeometry>
+                </GeometryDrawing.Geometry>
+                <GeometryDrawing.Brush>
+                    <VisualBrush>
+                        <VisualBrush.Visual>
+                            <StackPanel>
+                                <TextBlock Text="Blog" Foreground="{DynamicResource DarkMaskBrush}"/>
+                            </StackPanel>
+                        </VisualBrush.Visual>
+                    </VisualBrush>
+                </GeometryDrawing.Brush>
+            </GeometryDrawing>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+
+    <DrawingBrush x:Key="ProjectDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,200,100" ViewportUnits="Absolute" Stretch="Uniform" TileMode="Tile">
+        <DrawingBrush.Transform>
+            <TransformGroup>
+                <RotateTransform Angle="20"/>
+            </TransformGroup>
+        </DrawingBrush.Transform>
+        <DrawingBrush.Drawing>
+            <GeometryDrawing>
+                <GeometryDrawing.Geometry>
+                    <RectangleGeometry Rect="0,0,200,100"></RectangleGeometry>
+                </GeometryDrawing.Geometry>
+                <GeometryDrawing.Brush>
+                    <VisualBrush>
+                        <VisualBrush.Visual>
+                            <StackPanel>
+                                <TextBlock Text="Project" Foreground="{DynamicResource DarkMaskBrush}"/>
+                            </StackPanel>
+                        </VisualBrush.Visual>
+                    </VisualBrush>
+                </GeometryDrawing.Brush>
+            </GeometryDrawing>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+
     <LinearGradientBrush x:Key="MenuButtonBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
         <GradientStop Color="White" Offset="0"/>
         <GradientStop Color="#F2F2F2" Offset="1"/>
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Geometries.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Geometries.xaml
index a746ad39..4158b09e 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Geometries.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Geometries.xaml
@@ -17,5 +17,7 @@
     <Geometry x:Key="ContributorsGeometry">M657.486769 287.744c5.671385 0 11.264-5.671385 16.935385-5.671385l186.289231-124.140307c5.592615-5.592615 16.935385-16.935385 16.935384-28.199385V73.334154A74.673231 74.673231 0 0 0 804.233846 0H606.680615v220.002462c0 22.606769-16.935385 33.870769-39.463384 33.870769H454.262154c-22.528 0-39.463385-16.935385-39.463385-33.870769V5.671385H222.838154c-45.134769 0-79.005538 33.870769-79.005539 73.255384v56.477539c0 11.264 5.671385 22.528 16.935385 28.199384l186.289231 124.140308h16.935384C200.310154 349.735385 98.697846 507.746462 121.304615 693.878154c22.528 169.275077 169.353846 310.350769 344.221539 327.207384 237.095385 28.199385 440.32-152.339692 440.32-377.934769 0-158.011077-101.612308-299.008-248.359385-355.406769z m-146.747077 671.271385C335.793231 959.015385 189.046154 818.018462 189.046154 643.150769c0-174.867692 146.747077-310.350769 321.693538-310.350769 174.946462 0 321.693538 141.075692 321.693539 315.943385s-146.747077 310.350769-321.693539 310.350769zM670.798769 572.967385l-68.371692-11.185231a31.507692 31.507692 0 0 1-28.514462-16.777846l-28.514461-55.926154c-17.092923-27.963077-51.278769-27.963077-68.371692 0l-28.514462 55.926154a31.507692 31.507692 0 0 1-28.514462 16.777846l-68.371692 11.185231c-28.514462 5.592615-39.936 39.148308-17.092923 61.44l45.528615 39.227077c5.750154 11.185231 17.171692 22.370462 11.421539 33.555692l-11.421539 67.111384c-5.671385 27.963077 28.514462 50.333538 51.357539 33.555693l62.700308-27.963077a37.021538 37.021538 0 0 1 34.185846 0l62.700307 33.555692c28.514462 16.777846 57.028923-5.592615 51.27877-33.555692l-11.421539-67.111385c0-16.777846 5.750154-27.963077 11.421539-33.555692l51.278769-44.740923a38.596923 38.596923 0 0 0-22.843077-61.518769z</Geometry>
     <Geometry x:Key="GitHubStrGeometry">M1185.92 769.92h-1.28c0.576 0 0.96 0.64 1.536 0.704h0.384l-0.64-0.64z m0.256 0.704c-5.952 0.064-20.928 3.2-36.736 3.2-49.92 0-67.2-23.04-67.2-53.12V520.32h101.76c5.76 0 10.24-5.12 10.24-12.16v-108.8c0-5.76-5.12-10.88-10.24-10.88h-101.76V253.44c0-5.12-3.2-8.32-8.96-8.32h-138.24c-5.76 0-8.96 3.2-8.96 8.32v138.88s-69.76 17.28-74.24 17.92c-5.12 1.28-8.32 5.76-8.32 10.88v87.04c0 7.04 5.12 12.16 10.88 12.16h71.04v209.92c0 156.16 108.8 172.16 183.04 172.16 33.92 0 74.88-10.88 81.28-14.08 3.84-1.28 5.76-5.76 5.76-10.24v-96a11.328 11.328 0 0 0-9.344-11.52z m1516.544-140.8c0-115.84-46.72-131.2-96-126.08-38.4 2.56-69.12 21.76-69.12 21.76v225.28s31.36 21.76 78.08 23.04c65.92 1.92 87.04-21.76 87.04-144z m155.52-10.24c0 219.52-71.04 282.24-195.2 282.24-104.96 0-161.28-53.12-161.28-53.12s-2.56 29.44-5.76 33.28c-1.92 3.84-5.12 5.12-8.96 5.12h-94.72c-6.4 0-12.16-5.12-12.16-10.88l1.28-711.04c0-5.76 5.12-10.88 10.88-10.88h136.32c5.76 0 10.88 5.12 10.88 10.88v241.28s52.48-33.92 129.28-33.92l-0.64-1.28c76.8 0 190.08 28.8 190.08 248.32z m-558.08-231.04H2165.76c-7.04 0-10.88 5.12-10.88 12.16v348.16s-35.2 24.96-83.2 24.96-62.08-21.76-62.08-69.76V400c0-5.76-5.12-10.88-10.88-10.88h-136.96c-5.76 0-10.88 5.12-10.88 10.88v327.04c0 140.8 78.72 176 186.88 176 88.96 0 161.28-49.28 161.28-49.28s3.2 24.96 5.12 28.8c1.28 3.2 5.76 5.76 10.24 5.76h85.76c7.04 0 10.88-5.12 10.88-10.88l1.28-478.08c0-5.76-5.12-10.88-12.16-10.88z m-1516.8-0.64h-136.32c-5.76 0-10.88 5.76-10.88 12.8v469.76c0 12.8 8.32 17.28 19.2 17.28h122.88c12.8 0 16-5.76 16-17.28V398.72c0-5.76-5.12-10.88-10.88-10.88z m-67.2-216.32c-49.28 0-88.32 39.04-88.32 88.32 0 49.28 39.04 88.32 88.32 88.32 48 0 87.04-39.04 87.04-88.32 0-49.28-39.04-88.32-87.04-88.32z m1055.36-16h-135.04c-5.76 0-10.88 5.12-10.88 10.88v261.76h-211.84V166.4c0-5.76-5.12-10.88-10.88-10.88h-136.32c-5.76 0-10.88 5.12-10.88 10.88v711.04c0 5.76 5.76 10.88 10.88 10.88h136.32c5.76 0 10.88-5.12 10.88-10.88V573.44h211.84l-1.28 304c0 5.76 5.12 10.88 10.88 10.88h136.32c5.76 0 10.88-5.12 10.88-10.88V166.4c0-5.76-5.12-10.88-10.88-10.88zM563.84 470.4v367.36c0 2.56-0.64 7.04-3.84 8.32 0 0-80 56.96-211.84 56.96-159.36 0-348.16-49.92-348.16-378.88S165.12 127.36 326.4 128c139.52 0 195.84 31.36 204.8 37.12 2.56 3.2 3.84 5.76 3.84 8.96L508.16 288c0 5.76-5.76 12.8-12.8 10.88-23.04-7.04-57.6-21.12-138.88-21.12-94.08 0-195.2 26.88-195.2 238.72s96 236.8 165.12 236.8c58.88 0 80-7.04 80-7.04v-147.2H312.32c-7.04 0-12.16-5.12-12.16-10.88V470.4c0-5.76 5.12-10.88 12.16-10.88h239.36c7.04 0 12.16 5.12 12.16 10.88z</Geometry>
     <Geometry x:Key="QqGeometry">M936.194300839506 691.6934192494618c-5.891587367822223-94.26540047423211-70.69904970840491-170.8560375504593-106.04857520987652-212.09715041975304 5.891587367822223-11.783174735644446 17.674762103466666-79.53643140740742-29.457938133649378-126.66913164452346V349.981342854005c0-182.63921228610366-129.61492468116543-315.1999312984493-294.57937486380246-315.1999312984493s-294.57937615834066 132.5607190123457-294.57937615834066 315.1999312984493v2.9457943311802466c-47.132700237116055 47.132700237116055-35.349525501471604 114.885956908879-29.45793683911111 126.66913164452346-35.349525501471604 41.24111286929382-100.15698784205432 117.83174994552098-106.04857520987652 212.09715041975304 0 23.56634947128889 2.9457943311802466 58.91587497276049 14.728969066824689 76.59063707622718 14.728969066824689 20.62055643464691 55.97008193611851-2.9457943311802466 82.48222444404936-64.80746234058272 8.837381699002469 29.457938133649378 26.51214380246913 73.64484403958517 67.75325667176295 126.66913164452346-70.69904970840491 14.728969066824689-88.37381310640988 85.42801877522965-64.80746234058272 123.72333731334321 17.674762103466666 26.51214380246913 53.02428760493826 47.132700237116055 120.77754298216297 47.132700237116055 114.885956908879 0 167.9102445138173-32.40373117029136 191.4765952796444-53.02428760493826 5.891587367822223-5.891587367822223 11.783174735644446-5.891587367822223 20.620555140108642-5.891587367822223 8.837381699002469 0 14.728969066824689 2.9457943311802466 20.62055643464691 5.891587367822223 23.56634947128889 20.62055643464691 73.64484403958517 53.02428760493826 191.4765939851062 53.02428760493826 64.80746234058272 0 103.10278087869627-20.62055643464691 120.77754427670124-47.132700237116055 23.56634947128889-38.29531853811359 2.9457943311802466-106.04857520987652-64.80746234058272-123.72333731334321 41.24111286929382-55.97008193611851 58.91587497276049-100.15698784205432 67.75325667176295-126.66913164452346 29.457938133649378 61.86166930394074 67.75325667176295 85.42801877522965 82.48222444404936 64.80746234058272 5.891587367822223-17.674762103466666 11.783174735644446-53.02428760493826 8.837381699002469-76.59063707622718z m0 0</Geometry>
+    <Geometry x:Key="ProjectGeometry">M838.4 325.12 554.24 479.36C528 493.44 512 521.6 512 552.96l0 298.24c0 32 31.36 53.12 57.6 38.4l284.16-154.24c25.6-14.08 42.24-42.24 42.24-73.6L896 364.16C896 331.52 864.64 311.04 838.4 325.12zM405.76 478.72 121.6 325.12C95.36 311.04 64 331.52 64 363.52l0 299.52c0 31.36 16 59.52 42.24 73.6l284.16 153.6C416.64 904.32 448 883.2 448 851.2L448 552.32C448 520.96 432 492.8 405.76 478.72zM812.16 255.36c13.44-7.04 19.84-19.2 18.56-30.72 1.28-12.16-5.12-23.68-18.56-30.72L522.88 42.88c-12.8-7.04-28.16-10.24-43.52-10.24-15.36 0-30.72 3.2-43.52 10.24L146.56 193.28C133.12 200.32 127.36 212.48 128 224 127.36 236.16 133.12 248.32 146.56 255.36l289.28 150.4c12.8 7.04 28.16 10.24 43.52 10.24 15.36 0 30.72-3.2 43.52-10.24L812.16 255.36z</Geometry>
+    <Geometry x:Key="BlogGeometry">M1137.575865 0l0 795.939663-267.130435 228.060337-870.44543 0 0-1024 1137.575865 0zM795.939663 682.363798l-626.030169 0 0 113.575865 626.030169 0 0-113.575865zM966.757764 455.212067l-796.84827 0 0 113.575865 796.84827 0 0-113.575865zM966.757764 227.15173l-796.84827 0 0 114.484472 796.84827 0 0-114.484472z</Geometry>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Service/DataService.cs b/src/Shared/HandyControlDemo_Shared/Service/DataService.cs
index 728a108e..8587cd62 100644
--- a/src/Shared/HandyControlDemo_Shared/Service/DataService.cs
+++ b/src/Shared/HandyControlDemo_Shared/Service/DataService.cs
@@ -78,18 +78,18 @@ namespace HandyControlDemo.Service
             return list;
         }
 
-        internal List<ContributorModel> GetContributorDataList()
+        internal List<AvatarModel> GetContributorDataList()
         {
             var client = new WebClient();
             client.Headers.Add("User-Agent", "request");
-            var list = new List<ContributorModel>();
+            var list = new List<AvatarModel>();
             try
             {
                 var json = client.DownloadString(new Uri("https://api.github.com/repos/nabian/handycontrol/contributors"));
                 var objList = JsonConvert.DeserializeObject<List<dynamic>>(json);
-                list.AddRange(objList.Select(item => new ContributorModel
+                list.AddRange(objList.Select(item => new AvatarModel
                 {
-                    UserName = item.login,
+                    DisplayName = item.login,
                     AvatarUri = item.avatar_url,
                     Link = item.html_url
                 }));
@@ -101,6 +101,44 @@ namespace HandyControlDemo.Service
             return list;
         }
 
+        internal List<AvatarModel> GetBlogDataList()
+        {
+            return new List<AvatarModel>
+            {
+                new AvatarModel
+                {
+                    DisplayName = "林德熙",
+                    AvatarUri = "https://avatars3.githubusercontent.com/u/16054566?s=400&v=4",
+                    Link = "https://blog.lindexi.com/"
+                },
+                new AvatarModel
+                {
+                    DisplayName = "吕毅",
+                    AvatarUri = "https://avatars2.githubusercontent.com/u/9959623?s=400&v=4",
+                    Link = "https://blog.walterlv.com/"
+                }
+            };
+        }
+
+        internal List<AvatarModel> GetProjectDataList()
+        {
+            return new List<AvatarModel>
+            {
+                new AvatarModel
+                {
+                    DisplayName = "phpEnv",
+                    AvatarUri = "https://cdn.phpenv.cn:444/logo.png",
+                    Link = "https://www.phpenv.cn/"
+                },
+                new AvatarModel
+                {
+                    DisplayName = "AutumnBox",
+                    AvatarUri = "https://www.atmb.top/images/leaves.png",
+                    Link = "https://github.com/zsh2401/AutumnBox"
+                }
+            };
+        }
+
         internal List<StepBarDemoModel> GetStepBarDemoDataList()
         {
             return new List<StepBarDemoModel>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml
index 915ee832..f0199ed4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml
@@ -2,12 +2,13 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
              Margin="16"
              Effect="{StaticResource EffectShadow5}" 
              Cursor="Hand"
              mc:Ignorable="d">
-    <Button Style="{StaticResource ButtonCustom}" Click="ButtonAvatar_OnClick">
+    <Button Style="{StaticResource ButtonCustom}" Command="hc:ControlCommands.OpenLink" CommandParameter="{Binding Link,RelativeSource={RelativeSource AncestorType=UserControl}}" >
         <Border Background="{DynamicResource SecondaryRegionBrush}" CornerRadius="10">
             <Grid>
                 <Grid.RowDefinitions>
@@ -15,7 +16,7 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <Image Source="{Binding Source,RelativeSource={RelativeSource AncestorType=UserControl}}" Height="120" Width="120" Stretch="Uniform" Margin="10"/>
-                <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" Margin="0,0,0,10" Grid.Row="1" Style="{StaticResource TextBlockDefault}" Text="{Binding UserName,RelativeSource={RelativeSource AncestorType=UserControl}}"></TextBlock>
+                <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" Margin="0,0,0,10" Grid.Row="1" Style="{StaticResource TextBlockDefault}" Text="{Binding DisplayName,RelativeSource={RelativeSource AncestorType=UserControl}}"></TextBlock>
             </Grid>
         </Border>
     </Button>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
index 88727b94..ac57f0ab 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
@@ -1,8 +1,6 @@
-using System.Diagnostics;
-using System.Windows;
+using System.Windows;
 using System.Windows.Media.Imaging;
 
-
 namespace HandyControlDemo.UserControl
 {
     public partial class Avatar
@@ -22,9 +20,9 @@ namespace HandyControlDemo.UserControl
         }
 
         public static readonly DependencyProperty UserNameProperty = DependencyProperty.Register(
-            "UserName", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
+            "DisplayName", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
 
-        public string UserName
+        public string DisplayName
         {
             get => (string) GetValue(UserNameProperty);
             set => SetValue(UserNameProperty, value);
@@ -38,7 +36,5 @@ namespace HandyControlDemo.UserControl
             get => (string) GetValue(LinkProperty);
             set => SetValue(LinkProperty, value);
         }
-
-        private void ButtonAvatar_OnClick(object sender, RoutedEventArgs e) => Process.Start(Link);
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
index 0b63c95e..e24baa6e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
@@ -1,5 +1,4 @@
-
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl
 {
     public partial class AnimationPathDemoCtl
     {
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml
index 1eb74b5a..3ac4ce10 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml
@@ -8,8 +8,8 @@
             <hc:Shield Subject=".net" Status=">=4.0" Color="#1182c3"/>
             <hc:Shield Subject="c#" Status="7.0" Margin="4,0,0,0" Color="#1182c3"/>
             <hc:Shield Subject="IDE" Status="2017" Margin="4,0,0,0" Color="#1182c3"/>
-            <hc:Shield Subject="chat" Status="on gitter" Margin="4,0,0,0" Color="#4eb899" Command="hc:ControlCommands.OpenLink" hc:LinkElement.Link="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
-            <hc:Shield Subject="qq" Status="714704041" Margin="4,0,0,0" Color="#d8624c" Command="hc:ControlCommands.OpenLink" hc:LinkElement.Link="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
+            <hc:Shield Subject="chat" Status="on gitter" Margin="4,0,0,0" Color="#4eb899" Command="hc:ControlCommands.OpenLink" CommandParameter="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
+            <hc:Shield Subject="qq" Status="714704041" Margin="4,0,0,0" Color="#d8624c" Command="hc:ControlCommands.OpenLink" CommandParameter="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
         </StackPanel>
     </hc:TransitioningContentControl>
 </UserControl>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml
new file mode 100644
index 00000000..eb809c0a
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="HandyControlDemo.UserControl.BlogsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
+             DataContext="{Binding BlogsView,Source={StaticResource Locator}}"
+             Background="{DynamicResource SecondaryRegionBrush}">
+    <ListBox Background="{DynamicResource BlogDrawingBrush}" ItemContainerStyle="{StaticResource ListBoxItemCustom}" BorderThickness="0" ItemsSource="{Binding DataList}" ItemsPanel="{StaticResource FluidMoveBehaviorWrapPanelItemsPanelTemplate}">
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <userControl:Avatar DisplayName="{Binding DisplayName}" Link="{Binding Link}" Source="{Binding AvatarUri}"/>
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
+</UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
new file mode 100644
index 00000000..8c69a7c4
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class BlogsView
+    {
+        public BlogsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml
index 59020930..a54aa694 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml
@@ -7,7 +7,7 @@
     <ListBox Background="{DynamicResource GitHubDrawingBrush}" ItemContainerStyle="{StaticResource ListBoxItemCustom}" BorderThickness="0" ItemsSource="{Binding DataList}" ItemsPanel="{StaticResource FluidMoveBehaviorWrapPanelItemsPanelTemplate}">
         <ListBox.ItemTemplate>
             <DataTemplate>
-                <userControl:Avatar UserName="{Binding UserName}" Link="{Binding Link}" Source="{Binding AvatarUri}"/>
+                <userControl:Avatar DisplayName="{Binding DisplayName}" Link="{Binding Link}" Source="{Binding AvatarUri}"/>
             </DataTemplate>
         </ListBox.ItemTemplate>
     </ListBox>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
index 20b57781..e903a4e7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
@@ -316,8 +316,8 @@
             </Border>
             <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128" Canvas.Top="310" Width="162" Height="84">
                 <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <hc:Shield Subject="chat" Status="on gitter" Margin="0,0,0,0" Color="#4eb899" Command="hc:ControlCommands.OpenLink" hc:LinkElement.Link="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
-                    <hc:Shield Subject="qq" Status="714704041" Margin="0,4,0,0" Color="#d8624c" Command="hc:ControlCommands.OpenLink" hc:LinkElement.Link="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
+                    <hc:Shield Subject="chat" Status="on gitter" Margin="0,0,0,0" Color="#4eb899" Command="hc:ControlCommands.OpenLink" CommandParameter="https://gitter.im/HandyControl/Lobby?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"/>
+                    <hc:Shield Subject="qq" Status="714704041" Margin="0,4,0,0" Color="#d8624c" Command="hc:ControlCommands.OpenLink" CommandParameter="http://shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1"/>
                 </WrapPanel>
             </Border>
             <Border Visibility="Visible" BorderThickness="0" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="128" Canvas.Top="408">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml
new file mode 100644
index 00000000..5ef7ed0e
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="HandyControlDemo.UserControl.ProjectsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
+             DataContext="{Binding ProjectsView,Source={StaticResource Locator}}"
+             Background="{DynamicResource SecondaryRegionBrush}">
+    <ListBox Background="{DynamicResource ProjectDrawingBrush}" ItemContainerStyle="{StaticResource ListBoxItemCustom}" BorderThickness="0" ItemsSource="{Binding DataList}" ItemsPanel="{StaticResource FluidMoveBehaviorWrapPanelItemsPanelTemplate}">
+        <ListBox.ItemTemplate>
+            <DataTemplate>
+                <userControl:Avatar DisplayName="{Binding DisplayName}" Link="{Binding Link}" Source="{Binding AvatarUri}"/>
+            </DataTemplate>
+        </ListBox.ItemTemplate>
+    </ListBox>
+</UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
new file mode 100644
index 00000000..674aa8f2
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class ProjectsView
+    {
+        public ProjectsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs
deleted file mode 100644
index cd798729..00000000
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using HandyControlDemo.Data;
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ContributorsViewModel : DemoViewModelBase<ContributorModel>
-    {
-        public ContributorsViewModel(DataService dataService)
-        {
-#if netle40
-            Task.Factory.StartNew(() =>
-            {
-                DataList = dataService.GetContributorDataList();
-            });
-#else
-            Task.Run(() =>
-            {
-                DataList = dataService.GetContributorDataList();
-            });
-#endif
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
new file mode 100644
index 00000000..6ede3a6e
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using HandyControlDemo.Data;
+
+namespace HandyControlDemo.ViewModel
+{
+    public class ItemsDisplayViewModel : DemoViewModelBase<AvatarModel>
+    {
+        public ItemsDisplayViewModel(Func<List<AvatarModel>> getDatAction)
+        {
+#if netle40
+            Task.Factory.StartNew(() => DataList = getDatAction?.Invoke());
+#else
+            Task.Run(() => DataList = getDatAction?.Invoke());
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs
new file mode 100644
index 00000000..f464c30d
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs
@@ -0,0 +1,22 @@
+using System;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.CommandWpf;
+using GalaSoft.MvvmLight.Messaging;
+using HandyControlDemo.Data;
+using HandyControlDemo.Tools;
+
+namespace HandyControlDemo.ViewModel
+{
+    public class NoUserViewModel : ViewModelBase
+    {
+        public RelayCommand<string> OpenViewCmd => new Lazy<RelayCommand<string>>(() =>
+            new RelayCommand<string>(OpenView)).Value;
+
+        private void OpenView(string viewName)
+        {
+            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
+            Messenger.Default.Send(true, MessageToken.FullSwitch);
+            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{viewName}"), MessageToken.LoadShowContent);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
index 44d62f42..83ed5dac 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
@@ -23,7 +23,9 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
             SimpleIoc.Default.Register<ComboBoxDemoViewModel>();
             SimpleIoc.Default.Register<WindowDemoViewModel>();
-            SimpleIoc.Default.Register<ContributorsViewModel>();
+            SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(ServiceLocator.Current.GetInstance<DataService>().GetContributorDataList), "Contributors");
+            SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(ServiceLocator.Current.GetInstance<DataService>().GetBlogDataList), "Blogs");
+            SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(ServiceLocator.Current.GetInstance<DataService>().GetProjectDataList), "Projects");
             SimpleIoc.Default.Register<StepBarDemoViewModel>();
             SimpleIoc.Default.Register<PaginationDemoViewModel>();
             SimpleIoc.Default.Register<ChatBoxViewModel>();
@@ -35,6 +37,7 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<BadgeDemoViewModel>();
             SimpleIoc.Default.Register<SideMenuDemoViewModel>();
             SimpleIoc.Default.Register<TabControlDemoViewModel>();
+            SimpleIoc.Default.Register<NoUserViewModel>();
         }
 
         public static ViewModelLocator Instance => new Lazy<ViewModelLocator>(() =>
@@ -54,7 +57,11 @@ namespace HandyControlDemo.ViewModel
 
         public WindowDemoViewModel WindowDemo => ServiceLocator.Current.GetInstance<WindowDemoViewModel>();
 
-        public ContributorsViewModel ContributorsView => ServiceLocator.Current.GetInstance<ContributorsViewModel>();
+        public ItemsDisplayViewModel ContributorsView => ServiceLocator.Current.GetInstance<ItemsDisplayViewModel>("Contributors");
+
+        public ItemsDisplayViewModel BlogsView => ServiceLocator.Current.GetInstance<ItemsDisplayViewModel>("Blogs");
+
+        public ItemsDisplayViewModel ProjectsView => ServiceLocator.Current.GetInstance<ItemsDisplayViewModel>("Projects");
 
         public StepBarDemoViewModel StepBarDemo => ServiceLocator.Current.GetInstance<StepBarDemoViewModel>();
 
@@ -78,6 +85,8 @@ namespace HandyControlDemo.ViewModel
 
         public TabControlDemoViewModel TabControlDemo => ServiceLocator.Current.GetInstance<TabControlDemoViewModel>();
 
+        public NoUserViewModel NoUser => ServiceLocator.Current.GetInstance<NoUserViewModel>();
+
         #endregion
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/LinkElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/LinkElement.cs
deleted file mode 100644
index d962952c..00000000
--- a/src/Shared/HandyControl_Shared/Controls/Attach/LinkElement.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Input;
-using HandyControl.Interactivity;
-
-namespace HandyControl.Controls
-{
-    public class LinkElement
-    {
-        public static readonly DependencyProperty LinkProperty = DependencyProperty.RegisterAttached(
-            "Link", typeof(string), typeof(LinkElement), new PropertyMetadata(default(string), OnLinkChanged));
-
-        private static void OnLinkChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is UIElement element)
-            {
-                CreateTrigger(element, (string) e.NewValue);
-            }
-        }
-
-        private static readonly DependencyProperty CommandBindingProperty = DependencyProperty.RegisterAttached(
-            "CommandBinding", typeof(CommandBinding), typeof(LinkElement), new PropertyMetadata(default(CommandBinding)));
-
-        private static void SetCommandBinding(DependencyObject element, CommandBinding value)
-            => element.SetValue(CommandBindingProperty, value);
-
-        private static CommandBinding GetCommandBinding(DependencyObject element)
-            => (CommandBinding) element.GetValue(CommandBindingProperty);
-
-        private static void CreateTrigger(UIElement element, string link)
-        {
-            element.CommandBindings.Remove(GetCommandBinding(element));
-            element.SetCurrentValue(CommandBindingProperty, DependencyProperty.UnsetValue);
-
-            if (string.IsNullOrEmpty(link)) return;
-            var commandBinding = new CommandBinding(ControlCommands.OpenLink, (sender, args) => Process.Start(link));
-            SetCommandBinding(element, commandBinding);
-            element.CommandBindings.Add(commandBinding);
-        }
-
-        public static void SetLink(DependencyObject element, string value)
-            => element.SetValue(LinkProperty, value);
-
-        public static string GetLink(DependencyObject element)
-            => (string) element.GetValue(LinkProperty);
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 15dd9917..c9c7edd2 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -16,9 +16,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\IconElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\IconSwitchElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\InfoElement.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\LinkElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\PanelElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\PasswordBoxMonitor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\OpenLinkCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\GlobalShortcut.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\StatusSwitchElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\TipElement.cs" />
@@ -182,7 +182,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior!1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\BehaviorCollection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\ControlCommands.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\ControlCommands.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\DefaultTriggerAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventTrigger.cs" />
@@ -201,9 +201,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\NameResolvedEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\NameResolver.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\PreviewInvokeEventArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\PushMainWindow2TopCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\PushMainWindow2TopCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\RoutedEventTrigger.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\ShutdownAppCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\ShutdownAppCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TagType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TransitionEffect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerAction!1.cs" />
diff --git a/src/Shared/HandyControl_Shared/Interactivity/ControlCommands.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
similarity index 97%
rename from src/Shared/HandyControl_Shared/Interactivity/ControlCommands.cs
rename to src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
index efee5e51..ab66b196 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/ControlCommands.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
@@ -145,7 +145,7 @@ namespace HandyControl.Interactivity
         /// <summary>
         ///     打开链接
         /// </summary>
-        public static RoutedCommand OpenLink { get; } = new RoutedCommand(nameof(OpenLink), typeof(ControlCommands));
+        public static OpenLinkCommand OpenLink { get; } = new OpenLinkCommand();
 
         /// <summary>
         ///     关闭程序
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
new file mode 100644
index 00000000..cf3067ce
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Diagnostics;
+using System.Windows.Input;
+
+namespace HandyControl.Interactivity
+{
+    public class OpenLinkCommand : ICommand
+    {
+        public bool CanExecute(object parameter) => true;
+
+        public void Execute(object parameter)
+        {
+            if (parameter is string link)
+            {
+                Process.Start(link);
+            }
+        }
+
+        public event EventHandler CanExecuteChanged;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/PushMainWindow2TopCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/PushMainWindow2TopCommand.cs
rename to src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/ShutdownAppCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/ShutdownAppCommand.cs
rename to src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs

From 1e7c0253914be57da7c2be8892a3ff68fceda576 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 29 May 2019 00:02:32 +0800
Subject: [PATCH 10/17] Synchronize versions

---
 .../UserControl/Main/NoUserContent.xaml       | 38 +++++++++++++------
 .../UserControl/Main/NoUserContent.xaml.cs    | 29 ++------------
 .../Themes/Styles/Window.xaml                 |  4 ++
 .../UserControl/Main/NoUserContent.xaml       | 36 ++++++++++++------
 .../UserControl/Main/NoUserContent.xaml.cs    | 28 ++------------
 .../Themes/Styles/Window.xaml                 |  4 ++
 .../UserControl/Main/NoUserContent.xaml.cs    |  1 -
 .../HandyControlDemo_Shared/App.xaml.cs       |  3 ++
 .../ViewModel/Main/NoUserViewModel.cs         |  4 ++
 9 files changed, 72 insertions(+), 75 deletions(-)

diff --git a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml
index 6412815f..ba1c6ec4 100644
--- a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml
+++ b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml
@@ -3,7 +3,9 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
       Height="29"
-      xmlns:hc="https://handyorg.github.io/handycontrol">
+      DataContext="{Binding NoUser,Source={StaticResource Locator}}"
+      xmlns:hc="https://handyorg.github.io/handycontrol"
+      xmlns:data="clr-namespace:HandyControlDemo.Data">
     <Grid.ColumnDefinitions>
         <ColumnDefinition/>
         <ColumnDefinition Width="Auto"/>
@@ -20,36 +22,41 @@
             </hc:Interaction.Triggers>
             <Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
         </Button>
-        <Menu MenuItem.Click="MenuItemLinks_OnClick"  Margin="10,0,0,0" Background="Transparent">
+        <Menu Margin="10,0,0,0" Background="Transparent">
             <MenuItem Foreground="White" Header="{x:Static langs:Lang.Repository}">
-                <MenuItem Tag="https://github.com/NaBian/HandyControl" Header="GitHub">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://github.com/NaBian/HandyControl" Header="GitHub">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource GithubGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://www.nuget.org/packages/HandyControl" Header="NuGet">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://www.nuget.org/packages/HandyControl" Header="NuGet">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource NugetGeometry}" Fill="#30a5dd"/>
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
             <MenuItem Foreground="White" Header="{x:Static langs:Lang.About}">
-                <MenuItem Click="MenuItemQQGroup_OnClick" Header="{x:Static langs:Lang.QQGroup}">
+                <MenuItem Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.ContributorsView}" Header="{x:Static langs:Lang.Contributors}">
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.QQGroupView}" Header="{x:Static langs:Lang.QQGroup}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource QqGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="mailto:836904362@qq.com" Header="{x:Static langs:Lang.Email}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="mailto:836904362@qq.com" Header="{x:Static langs:Lang.Email}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource WarningBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://gitter.im/HandyControl/Lobby" Header="{x:Static langs:Lang.Chatroom}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://gitter.im/HandyControl/Lobby" Header="{x:Static langs:Lang.Chatroom}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource GitterGeometry}" Fill="#e52e64"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://www.cnblogs.com/nabian" Header="{x:Static langs:Lang.Blog}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://www.cnblogs.com/nabian" Header="{x:Static langs:Lang.Blog}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
                     </MenuItem.Icon>
@@ -60,10 +67,17 @@
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
-            <MenuItem Click="MenuItemContributors_OnClick" Foreground="White" Header="{x:Static langs:Lang.Contributors}">
-                <MenuItem.Icon>
-                    <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00"/>
-                </MenuItem.Icon>
+            <MenuItem Foreground="White" Header="{x:Static langs:Lang.Recommendation}">
+                <MenuItem Header="{x:Static langs:Lang.Project}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.ProjectsView}" >
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource ProjectGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="{x:Static langs:Lang.Blog}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.BlogsView}" >
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource BlogGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
         </Menu>
     </StackPanel>
diff --git a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs
index 2c886173..00d824ce 100644
--- a/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs
+++ b/src/Core_30/HandyControlDemo_Core_30/UserControl/Main/NoUserContent.xaml.cs
@@ -1,14 +1,11 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
-using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.Data;
-using HandyControlDemo.Tools;
 using HandyControlDemo.Window;
 
-
 namespace HandyControlDemo.UserControl
 {
     public partial class NoUserContent
@@ -29,7 +26,9 @@ namespace HandyControlDemo.UserControl
                     if (!b) return true;
                     GlobalData.Config.Lang = tag;
                     GlobalData.Save();
-                    Process.Start(Process.GetCurrentProcess().MainModule.FileName);
+                    var processModule = Process.GetCurrentProcess().MainModule;
+                    if (processModule != null)
+                        Process.Start(processModule.FileName);
                     Application.Current.Shutdown();
                     return true;
                 });
@@ -50,28 +49,6 @@ namespace HandyControlDemo.UserControl
             }
         }
 
-        private void MenuItemLinks_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is MenuItem menuItem && menuItem.Tag is string tag)
-            {
-                Process.Start(tag);
-            }
-        }
-
-        private void MenuItemQQGroup_OnClick(object sender, RoutedEventArgs e)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.QQGroupView}"), MessageToken.LoadShowContent);
-        }
-
-        private void MenuItemContributors_OnClick(object sender, RoutedEventArgs e)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.ContributorsView}"), MessageToken.LoadShowContent);
-        }
-
         private void MenuAbout_OnClick(object sender, RoutedEventArgs e)
         {
             new AboutWindow
diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
index c93bc3f5..042c245e 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml
@@ -46,6 +46,10 @@
         </Setter>
     </Style>
 
+    <Style TargetType="Window">
+        <Setter Property="UseLayoutRounding" Value="True"/>
+    </Style>
+
     <Style x:Key="WindowDefault" TargetType="Window">
         <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
diff --git a/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml b/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml
index 1067134a..d41a04a6 100644
--- a/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml
+++ b/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml
@@ -3,7 +3,9 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
       Height="29"
+      DataContext="{Binding NoUser,Source={StaticResource Locator}}"
       xmlns:hc="https://handyorg.github.io/handycontrol"
+      xmlns:data="clr-namespace:HandyControlDemo.Data"
       xmlns:shell="http://schemas.microsoft.com/winfx/2006/xaml/presentation/shell">
     <Grid.ColumnDefinitions>
         <ColumnDefinition/>
@@ -21,36 +23,41 @@
             </hc:Interaction.Triggers>
             <Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
         </Button>
-        <Menu MenuItem.Click="MenuItemLinks_OnClick"  Margin="10,0,0,0" Background="Transparent">
+        <Menu Margin="10,0,0,0" Background="Transparent">
             <MenuItem Foreground="White" Header="{x:Static langs:Lang.Repository}">
-                <MenuItem Tag="https://github.com/NaBian/HandyControl" Header="GitHub">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://github.com/NaBian/HandyControl" Header="GitHub">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource GithubGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://www.nuget.org/packages/HandyControl" Header="NuGet">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://www.nuget.org/packages/HandyControl" Header="NuGet">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource NugetGeometry}" Fill="#30a5dd"/>
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
             <MenuItem Foreground="White" Header="{x:Static langs:Lang.About}">
-                <MenuItem Click="MenuItemQQGroup_OnClick" Header="{x:Static langs:Lang.QQGroup}">
+                <MenuItem Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.ContributorsView}" Header="{x:Static langs:Lang.Contributors}">
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.QQGroupView}" Header="{x:Static langs:Lang.QQGroup}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource QqGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="mailto:836904362@qq.com" Header="{x:Static langs:Lang.Email}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="mailto:836904362@qq.com" Header="{x:Static langs:Lang.Email}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource WarningBrush}"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://gitter.im/HandyControl/Lobby" Header="{x:Static langs:Lang.Chatroom}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://gitter.im/HandyControl/Lobby" Header="{x:Static langs:Lang.Chatroom}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource GitterGeometry}" Fill="#e52e64"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Tag="https://www.cnblogs.com/nabian" Header="{x:Static langs:Lang.Blog}">
+                <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://www.cnblogs.com/nabian" Header="{x:Static langs:Lang.Blog}">
                     <MenuItem.Icon>
                         <Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
                     </MenuItem.Icon>
@@ -61,10 +68,17 @@
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
-            <MenuItem Click="MenuItemContributors_OnClick" Foreground="White" Header="{x:Static langs:Lang.Contributors}">
-                <MenuItem.Icon>
-                    <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00"/>
-                </MenuItem.Icon>
+            <MenuItem Foreground="White" Header="{x:Static langs:Lang.Recommendation}">
+                <MenuItem Header="{x:Static langs:Lang.Project}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.ProjectsView}" >
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource ProjectGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="{x:Static langs:Lang.Blog}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.BlogsView}" >
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource BlogGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
         </Menu>
     </StackPanel>
diff --git a/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml.cs b/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml.cs
index 2c886173..11fb2688 100644
--- a/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml.cs
+++ b/src/Net_40/HandyControlDemo_Net_40/UserControl/Main/NoUserContent.xaml.cs
@@ -1,11 +1,9 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
-using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.Data;
-using HandyControlDemo.Tools;
 using HandyControlDemo.Window;
 
 
@@ -29,7 +27,9 @@ namespace HandyControlDemo.UserControl
                     if (!b) return true;
                     GlobalData.Config.Lang = tag;
                     GlobalData.Save();
-                    Process.Start(Process.GetCurrentProcess().MainModule.FileName);
+                    var processModule = Process.GetCurrentProcess().MainModule;
+                    if (processModule != null)
+                        Process.Start(processModule.FileName);
                     Application.Current.Shutdown();
                     return true;
                 });
@@ -50,28 +50,6 @@ namespace HandyControlDemo.UserControl
             }
         }
 
-        private void MenuItemLinks_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is MenuItem menuItem && menuItem.Tag is string tag)
-            {
-                Process.Start(tag);
-            }
-        }
-
-        private void MenuItemQQGroup_OnClick(object sender, RoutedEventArgs e)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.QQGroupView}"), MessageToken.LoadShowContent);
-        }
-
-        private void MenuItemContributors_OnClick(object sender, RoutedEventArgs e)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.ContributorsView}"), MessageToken.LoadShowContent);
-        }
-
         private void MenuAbout_OnClick(object sender, RoutedEventArgs e)
         {
             new AboutWindow
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
index ade4ac57..14fcb0ae 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml
@@ -47,6 +47,10 @@
         </Setter>
     </Style>
 
+    <Style TargetType="Window">
+        <Setter Property="UseLayoutRounding" Value="True"/>
+    </Style>
+
     <Style x:Key="WindowDefault" BasedOn="{x:Null}" TargetType="Window">
         <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
index 0fdb34ad..00d824ce 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/UserControl/Main/NoUserContent.xaml.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
-using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.Data;
diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index 3f67d7c5..08ba9c5b 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Net;
+using System.Security.Authentication;
 using System.Windows;
 using HandyControl.Data;
 using HandyControl.Tools;
@@ -27,6 +29,7 @@ namespace HandyControlDemo
 #if !Core
             ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
 #endif
+            ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00;
         }
 
         protected override void OnExit(ExitEventArgs e)
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs
index f464c30d..7504b0d8 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs
@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using GalaSoft.MvvmLight.Messaging;
 using HandyControlDemo.Data;
 using HandyControlDemo.Tools;

From 058396b0175c360ac6693fb7591c866dea412d85 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 29 May 2019 22:33:25 +0800
Subject: [PATCH 11/17] add sound for MessageBox

---
 doc/.gitignore                                           | 3 ++-
 doc/source/handycontrol/tnx/index.md                     | 5 +++--
 .../HandyControl_Shared/Controls/Window/MessageBox.cs    | 9 +++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/.gitignore b/doc/.gitignore
index 063b0e4c..7cb111d8 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -4,4 +4,5 @@ db.json
 *.log
 node_modules/
 public/
-.deploy*/
\ No newline at end of file
+.deploy*/
+.vs
\ No newline at end of file
diff --git a/doc/source/handycontrol/tnx/index.md b/doc/source/handycontrol/tnx/index.md
index 4a7f298c..56d2b7a1 100644
--- a/doc/source/handycontrol/tnx/index.md
+++ b/doc/source/handycontrol/tnx/index.md
@@ -4,7 +4,7 @@ title: 鸣谢
 
 # 感谢以下Coder提供代码贡献
 
-<p><a style="border:0" href="https://github.com/ghost1372" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/9213496?s=400&amp;v=4" alt="ghost1372"></a><a style="border:0" href="https://github.com/DingpingZhang" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/8541016?s=400&v=4" alt="Dingping Zhang"></a><a style="border:0" href="https://github.com/M0n7y5" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/17201053?s=400&v=4" alt="M0n7y5"></a><a style="border:0" href="https://github.com/guanguanchuangyu" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/25916858?s=400&v=4" alt="guanguanchuangyu"></a></p>
+<p><a style="border:0" href="https://github.com/ghost1372" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/9213496?s=400&amp;v=4" alt="ghost1372"></a><a style="border:0" href="https://github.com/DingpingZhang" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/8541016?s=400&v=4" alt="Dingping Zhang"></a><a style="border:0" href="https://github.com/M0n7y5" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/17201053?s=400&v=4" alt="M0n7y5"></a><a style="border:0" href="https://github.com/guanguanchuangyu" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/25916858?s=400&v=4" alt="guanguanchuangyu"></a><a style="border:0" href="https://github.com/yanchao891012" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars0.githubusercontent.com/u/16846702?s=400&v=4" alt="guanguanchuangyu"></a></p>
 
 # 感谢以下User提供使用建议
 
@@ -16,4 +16,5 @@ title: 鸣谢
 
 # 感谢以下捐赠者
 
-<p><a style="border:0" href="https://github.com/bigorange1900" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/49062011?s=400&v=4" alt="bigorange1900"></a></p>
\ No newline at end of file
+<p><a style="border:0" href="https://github.com/bigorange1900" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars1.githubusercontent.com/u/49062011?s=400&v=4" alt="bigorange1900"></a><a style="border:0" href="https://github.com/14632791" target="_blank" rel="noopener"><img width="120" height="120" src="https://avatars3.githubusercontent.com/u/27358331?s=400&v=4" alt="bigorange1900"></a></p>  
+QQ：1942142462
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
index 80aa3224..06623095 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Media;
 using System.Text;
 using System.Windows;
 using System.Windows.Input;
@@ -156,6 +157,7 @@ namespace HandyControl.Controls
                 messageBox.ShowImage = true;
                 messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
                 messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
+                SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             });
 #endif
@@ -185,6 +187,7 @@ namespace HandyControl.Controls
                 messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
                 SetButtonStatus(messageBox, MessageBoxButton.OK);
                 SetImage(messageBox, MessageBoxImage.Information);
+                SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             });
 #endif
@@ -214,6 +217,7 @@ namespace HandyControl.Controls
                 messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
                 SetButtonStatus(messageBox, MessageBoxButton.OK);
                 SetImage(messageBox, MessageBoxImage.Warning);
+                SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             });
 #endif
@@ -243,6 +247,7 @@ namespace HandyControl.Controls
                 messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
                 SetButtonStatus(messageBox, MessageBoxButton.OK);
                 SetImage(messageBox, MessageBoxImage.Error);
+                SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             });
 #endif
@@ -276,6 +281,7 @@ namespace HandyControl.Controls
                 messageBox.ShowImage = true;
                 messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
                 messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
+                SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             });
 #endif
@@ -305,6 +311,7 @@ namespace HandyControl.Controls
                 messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
                 SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
                 SetImage(messageBox, MessageBoxImage.Question);
+                SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             });
 #endif
@@ -350,6 +357,7 @@ namespace HandyControl.Controls
                 }
 
                 messageBox.Style = info.Style;
+                SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             });
 #endif
@@ -398,6 +406,7 @@ namespace HandyControl.Controls
                 messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
                 SetButtonStatus(messageBox, button);
                 SetImage(messageBox, icon);
+                SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             });
 #endif

From 436cc65d6df5a16b654d2ba639ec8160766028b1 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 30 May 2019 00:03:00 +0800
Subject: [PATCH 12/17] add FocusVisualStyle for some controls

---
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml |  6 +++---
 .../Themes/Styles/DataGrid.xaml               | 16 +++++++++++++--
 .../Themes/Styles/Base/BadgeBaseStyle.xaml    |  1 +
 .../Themes/Styles/Base/BaseStyle.xaml         | 20 +++++++++++++++++++
 .../Styles/Base/ChatBubbleBaseStyle.xaml      |  1 +
 .../Styles/Base/CoverFlowBaseStyle.xaml       |  1 +
 .../Themes/Styles/Base/GravatarBaseStyle.xaml |  1 +
 .../Themes/Styles/Base/ListBoxBaseStyle.xaml  |  9 ++++++---
 .../Themes/Styles/Base/LoadingBaseStyle.xaml  |  1 +
 .../Themes/Styles/Base/ShieldBaseStyle.xaml   |  6 +++++-
 .../Themes/Styles/Base/SideMenuBaseStyle.xaml |  2 ++
 .../Themes/Styles/Base/TagBaseStyle.xaml      | 18 ++++++++++++++---
 .../Styles/Base/ToggleButtonBaseStyle.xaml    |  2 ++
 .../Themes/Styles/Base/TransferBaseStyle.xaml |  6 +++++-
 .../Themes/Styles/Calendar.xaml               | 17 +++++++++++++---
 .../Themes/Styles/Clock.xaml                  |  2 +-
 .../Themes/Styles/ColorPicker.xaml            |  1 +
 .../Themes/Styles/Expander.xaml               |  2 +-
 .../Themes/Styles/Slider.xaml                 |  5 +++--
 19 files changed, 97 insertions(+), 20 deletions(-)

diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 8984ae6f..56fe5a0e 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -37,12 +37,11 @@
         </Setter>
     </Style>
 
-    <Style x:Key="TreeViewItemBaseStyle" TargetType="TreeViewItem">
+    <Style x:Key="TreeViewItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="TreeViewItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Padding" Value="10,0"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -96,6 +95,7 @@
     </Style>
 
     <Style x:Key="TreeViewBaseStyle" TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/DataGrid.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/DataGrid.xaml
index 6ab8cc46..d992330d 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/DataGrid.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/DataGrid.xaml
@@ -25,7 +25,19 @@
     </Style>
 
     <Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <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="4" RadiusY="4"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
@@ -211,7 +223,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBox">
-                    <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" Focusable="True" TextTrimming="CharacterEllipsis"/>
+                    <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" TextTrimming="CharacterEllipsis"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/BadgeBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BadgeBaseStyle.xaml
index 31fab70f..79d720e5 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/BadgeBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BadgeBaseStyle.xaml
@@ -65,6 +65,7 @@
     </ControlTemplate>
 
     <Style x:Key="BadgeBaseStyle" TargetType="controls:Badge">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
index 8a950d8c..9709fd55 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
@@ -25,6 +25,26 @@
         </Setter>
     </Style>
 
+    <Style x:Key="FocusVisualMargin0">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="FocusVisualRadius0Margin0">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style x:Key="BaseStyle" TargetType="Control">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="FontSize" Value="{StaticResource TextFontSize}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
index d13f74d9..6426a285 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml
@@ -134,6 +134,7 @@
     </ControlTemplate>
 
     <Style x:Key="ChatBubbleBaseStyle" TargetType="controls:ChatBubble">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="HorizontalAlignment" Value="Right"/>
         <Setter Property="Background" Value="{DynamicResource DarkPrimaryBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverFlowBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverFlowBaseStyle.xaml
index db718fdb..d2bec2dc 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverFlowBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverFlowBaseStyle.xaml
@@ -3,6 +3,7 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="CoverFlowBaseStyle" TargetType="controls:CoverFlow">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:CoverFlow">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml
index 861062d2..a32f2f07 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/GravatarBaseStyle.xaml
@@ -3,6 +3,7 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <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}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
index eb448cfb..1f6b1131 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
@@ -2,12 +2,15 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="BaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
     <!--默认ListBoxItem样式-->
-    <Style x:Key="ListBoxItemBaseStyle" TargetType="ListBoxItem">
+    <Style x:Key="ListBoxItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ListBoxItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}"/>
         <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Padding" Value="10,0"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="MinHeight" Value="32"/>
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/LoadingBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/LoadingBaseStyle.xaml
index d59fd341..b8e60a42 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/LoadingBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/LoadingBaseStyle.xaml
@@ -3,6 +3,7 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="LoadingBaseStyle" TargetType="controls:LoadingBase">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="DotDiameter" Value="10"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
     </Style>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
index dd4ffb4c..ff11c428 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
@@ -2,7 +2,11 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
-    <Style x:Key="ShieldBaseStyle" TargetType="controls:Shield">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../Base/BaseStyle.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="ShieldBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="controls:Shield">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
         <Setter Property="controls:BorderElement.CornerRadius" Value="3"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
index 3c76600b..9e2af3dc 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
@@ -7,6 +7,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="SideMenuItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="controls:SideMenuItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}"/>
         <Setter Property="Role" Value="Item"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
@@ -87,6 +88,7 @@
     </Style>
 
     <Style x:Key="SideMenuItemHeaderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="controls:SideMenuItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemBaseStyle}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml
index 01c06c56..59182e76 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml
@@ -9,8 +9,7 @@
         <ResourceDictionary Source="../Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="TagBaseStyle" TargetType="controls:Tag">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+    <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"/>
@@ -20,6 +19,19 @@
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Height" Value="30"/>
+        <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"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Tag">
@@ -30,7 +42,7 @@
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
                             <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                            <Button Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="10,0,0,0" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,11" controls:IconElement.Geometry="{StaticResource DeleteGeometry}" Foreground="{TemplateBinding Foreground}"/>
+                            <Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="10,0,0,0" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,11" controls:IconElement.Geometry="{StaticResource DeleteGeometry}" Foreground="{TemplateBinding Foreground}"/>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
index d997f3f3..17f6bb58 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
@@ -70,6 +70,8 @@
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Padding" Value="6,0,0,0"/>
+        <Setter Property="Width" Value="36"/>
+        <Setter Property="Height" Value="22"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml
index 4776788b..daa736d6 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml
@@ -7,9 +7,11 @@
         <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
         <ResourceDictionary Source="../../Basic/Behaviors.xaml"/>
         <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
+        <ResourceDictionary Source="../Base/BaseStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="TransferItemBaseStyle" TargetType="controls:TransferItem">
+    <Style x:Key="TransferItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="controls:TransferItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="CanDeselect" Value="True"/>
         <Setter Property="SelfManage" Value="True"/>
@@ -64,6 +66,7 @@
     </Style>
 
     <Style x:Key="TransferGroupBaseStyle" TargetType="controls:TransferGroup">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
@@ -81,6 +84,7 @@
     </Style>
 
     <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="BorderBrush" Value="{DynamicResource BorderBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml
index d4b717bb..00d70dda 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml
@@ -65,15 +65,26 @@
         </Setter>
     </Style>
     
-    <Style x:Key="CalendarDayButtonStyle" TargetType="CalendarDayButton">
+    <Style x:Key="CalendarDayButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CalendarDayButton">
         <Setter Property="MinWidth" Value="10"/>
         <Setter Property="MinHeight" Value="10"/>
-        <Setter Property="FontSize" Value="12"/>
         <Setter Property="Width" Value="32"/>
         <Setter Property="Height" Value="32"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <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="16" RadiusY="16"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarDayButton">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
index 0d4012d0..ac9b200a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
@@ -59,7 +59,7 @@
    
     <Style TargetType="controls:Clock">
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Width" Value="210"/>
         <Setter Property="Height" Value="310"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ColorPicker.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ColorPicker.xaml
index 92ec48d9..2adc223b 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ColorPicker.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ColorPicker.xaml
@@ -13,6 +13,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="controls:ColorPicker">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Width" Value="230"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Expander.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Expander.xaml
index 263678e3..9b0aef90 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Expander.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Expander.xaml
@@ -23,7 +23,7 @@
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition/>
                             </Grid.RowDefinitions>
-                            <ToggleButton 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 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>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Slider.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Slider.xaml
index 9deb9000..315f572d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Slider.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Slider.xaml
@@ -3,6 +3,7 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/BaseStyle.xaml"/>
         <ResourceDictionary Source="../Basic/Geometries.xaml"/>
         <ResourceDictionary Source="../Basic/Effects.xaml"/>
         <ResourceDictionary Source="Label.xaml"/>
@@ -85,7 +86,7 @@
         </controls:SimplePanel>
     </ControlTemplate>
 
-    <Style x:Key="ColorPickerSlider" TargetType="Slider">
+    <Style x:Key="ColorPickerSlider" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
@@ -740,7 +741,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="SliderBaseStyle" TargetType="Slider">
+    <Style x:Key="SliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>

From dfc10e646ddc846de066fee0f77560bb06a82524 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 30 May 2019 22:59:45 +0800
Subject: [PATCH 13/17] add FocusVisualStyle for some controls

---
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml    |  6 +++---
 .../Themes/Styles/DataGrid.xaml                  | 16 ++++++++++++++--
 .../Themes/Styles/Growl.xaml                     |  1 +
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml    |  6 +++---
 .../Themes/Styles/DataGrid.xaml                  | 16 ++++++++++++++--
 .../HandyControl_Net_40/Themes/Styles/Growl.xaml |  1 +
 .../HandyControl_Shared.projitems                |  4 ++++
 .../Themes/Styles/Base/CoverViewBaseStyle.xaml   |  3 +++
 .../Themes/Styles/Base/DialogBaseStyle.xaml      |  1 +
 .../Themes/Styles/Base/TagBaseStyle.xaml         | 13 +++++++++++++
 .../Themes/Styles/Calendar.xaml                  |  2 +-
 .../Themes/Styles/CalendarWithClock.xaml         |  2 +-
 .../HandyControl_Shared/Themes/Styles/Col.xaml   |  8 ++++++++
 .../Themes/Styles/ContentControl.xaml            |  3 +--
 .../Themes/Styles/ImageViewer.xaml               |  1 +
 .../Themes/Styles/Pagination.xaml                |  5 ++---
 .../HandyControl_Shared/Themes/Styles/Style.xaml |  1 +
 .../Themes/Styles/TimeBar.xaml                   |  1 +
 18 files changed, 73 insertions(+), 17 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Col.xaml

diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 8984ae6f..56fe5a0e 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -37,12 +37,11 @@
         </Setter>
     </Style>
 
-    <Style x:Key="TreeViewItemBaseStyle" TargetType="TreeViewItem">
+    <Style x:Key="TreeViewItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="TreeViewItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Padding" Value="10,0"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -96,6 +95,7 @@
     </Style>
 
     <Style x:Key="TreeViewBaseStyle" TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml
index 22e44e0c..e34f59c3 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml
@@ -25,7 +25,19 @@
     </Style>
 
     <Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <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="4" RadiusY="4"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
@@ -211,7 +223,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBox">
-                    <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" Focusable="True" TextTrimming="CharacterEllipsis"/>
+                    <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" TextTrimming="CharacterEllipsis"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml
index 88da46d1..d28b4fa2 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml
@@ -11,6 +11,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="controls:Growl">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="MinHeight" Value="60"/>
         <Setter Property="Width" Value="320"/>
         <Setter Property="Margin" Value="10,0,0,10"/>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 0c8880ef..bf19b881 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -37,12 +37,11 @@
         </Setter>
     </Style>
 
-    <Style x:Key="TreeViewItemBaseStyle" TargetType="TreeViewItem">
+    <Style x:Key="TreeViewItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="TreeViewItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Padding" Value="10,0"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -96,6 +95,7 @@
     </Style>
 
     <Style x:Key="TreeViewBaseStyle" TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
index 02884d68..b2775b3b 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
@@ -25,7 +25,19 @@
     </Style>
 
     <Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <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="4" RadiusY="4"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
@@ -212,7 +224,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBox">
-                    <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" Focusable="True" TextTrimming="CharacterEllipsis"/>
+                    <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" TextTrimming="CharacterEllipsis"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
index 88da46d1..d28b4fa2 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
@@ -11,6 +11,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="controls:Growl">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="MinHeight" Value="60"/>
         <Setter Property="Width" Value="320"/>
         <Setter Property="Margin" Value="10,0,0,10"/>
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index c9c7edd2..fd5312df 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -331,6 +331,10 @@
       <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\GridSplitter.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml
index cbb3071a..ded65b65 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml
@@ -3,6 +3,7 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="CoverViewItemBaseStyle" TargetType="controls:CoverViewItem">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:CoverViewItem">
@@ -15,6 +16,7 @@
     </Style>
 
     <Style x:Key="CoverViewContentBaseStyle" TargetType="controls:CoverViewContent">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
@@ -52,6 +54,7 @@
     </Style>
 
     <Style x:Key="CoverViewBaseStyle" TargetType="controls:CoverView">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource CoverViewItemBaseStyle}"/>
         <Setter Property="CoverViewContentStyle" Value="{StaticResource CoverViewContentBaseStyle}"/>
         <Setter Property="ItemMargin" Value="8"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DialogBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DialogBaseStyle.xaml
index dc3c8493..6ba867ce 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DialogBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DialogBaseStyle.xaml
@@ -3,6 +3,7 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="DialogBaseStyle" TargetType="controls:Dialog">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Template">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml
index 59182e76..a03b37e6 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TagBaseStyle.xaml
@@ -74,6 +74,19 @@
         <Setter Property="controls:BorderElement.CornerRadius" Value="15"/>
         <Setter Property="Padding" Value="10"/>
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
+        <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"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml
index 00d70dda..fd32fb54 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Calendar.xaml
@@ -186,7 +186,7 @@
                                     </Grid.RowDefinitions>
                                     <Border Background="{Binding Path=(controls:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3"/>
                                     <Button x:Name="PART_PreviousButton" Width="50" HorizontalAlignment="Left" Grid.Column="0" Height="50" Padding="16" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                                    <Button x:Name="PART_HeaderButton" Foreground="White" Grid.Column="1" FontSize="20" HorizontalAlignment="Center" Grid.Row="0" Style="{StaticResource ButtonCustom}"/>
+                                    <Button x:Name="PART_HeaderButton" Focusable="False" Foreground="White" Grid.Column="1" FontSize="20" HorizontalAlignment="Center" Grid.Row="0" Style="{StaticResource ButtonCustom}"/>
                                     <Button x:Name="PART_NextButton" Width="50" HorizontalAlignment="Right" Height="50" Padding="16" Grid.Column="2" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource RightGeometry}"/>
                                     <Grid Width="240" Height="240" x:Name="PART_MonthView" Margin="10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Visible">
                                         <Grid.ColumnDefinitions>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/CalendarWithClock.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/CalendarWithClock.xaml
index 74591f4b..cbb74c23 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/CalendarWithClock.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/CalendarWithClock.xaml
@@ -9,7 +9,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="controls:CalendarWithClock">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Col.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Col.xaml
new file mode 100644
index 00000000..9f873aca
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Col.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <Style TargetType="controls:Col">
+        <Setter Property="Focusable" Value="False"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ContentControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ContentControl.xaml
index 535b9f48..42f17b22 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ContentControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ContentControl.xaml
@@ -1,5 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <Style TargetType="ContentControl">
         <Setter Property="Focusable" Value="False"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ImageViewer.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ImageViewer.xaml
index 4d3798f1..75b651c9 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ImageViewer.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ImageViewer.xaml
@@ -13,6 +13,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="controls:ImageViewer">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="MinWidth" Value="400"/>
         <Setter Property="MinHeight" Value="250"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Pagination.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Pagination.xaml
index 5f4b74b2..0a9f19ed 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Pagination.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Pagination.xaml
@@ -8,17 +8,15 @@
         <ResourceDictionary Source="Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="PaginationButtonStyle" TargetType="RadioButton">
+    <Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Padding" Value="0"/>
         <Setter Property="GroupName" Value="1"/>
         <Setter Property="Margin" Value="5,0"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="RenderTransformOrigin" Value=".5,.5"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Tag" Value="0"/>
@@ -56,6 +54,7 @@
     </Style>
 
     <Style TargetType="controls:Pagination">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Height" Value="40"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="Background" Value="Transparent"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
index 47fe0953..41c62ccd 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
@@ -64,6 +64,7 @@
         <ResourceDictionary Source="Dialog.xaml"/>
         <ResourceDictionary Source="SideMenu.xaml"/>
         <ResourceDictionary Source="GridSplitter.xaml"/>
+        <ResourceDictionary Source="Col.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TimeBar.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TimeBar.xaml
index c63a94c1..966a6912 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TimeBar.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TimeBar.xaml
@@ -8,6 +8,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="controls:TimeBar">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="BorderThickness" Value="0,1,0,0"/>
         <Setter Property="Foreground" Value="White"/>

From d2dad5b401967232665e43bb68d4186711683bf9 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 30 May 2019 23:01:25 +0800
Subject: [PATCH 14/17] add FocusVisualStyle for some controls

---
 .../HandyControl_Net_GE45/Themes/Styles/Growl.xaml  |  1 +
 .../Themes/Styles/Base/GotoTopBaseStyle.xaml        | 13 +++++++++++++
 .../Themes/Styles/Base/RateBaseStyle.xaml           |  3 +++
 .../Themes/Styles/Base/StepBarBaseStyle.xaml        |  2 ++
 .../HandyControl_Shared/Themes/Styles/Clock.xaml    |  2 +-
 .../Themes/Styles/FlipClock.xaml                    |  1 +
 .../HandyControl_Shared/Themes/Styles/Slider.xaml   |  1 +
 .../Themes/Styles/TabControl.xaml                   |  6 +++---
 8 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
index 88da46d1..d28b4fa2 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
@@ -11,6 +11,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="controls:Growl">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="MinHeight" Value="60"/>
         <Setter Property="Width" Value="320"/>
         <Setter Property="Margin" Value="10,0,0,10"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/GotoTopBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/GotoTopBaseStyle.xaml
index 5c90ba29..a4ab4e5b 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/GotoTopBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/GotoTopBaseStyle.xaml
@@ -15,6 +15,19 @@
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="Padding" Value="16"/>
         <Setter Property="BorderThickness" Value="1"/>
+        <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="25" RadiusY="25"/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RateBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RateBaseStyle.xaml
index 2d2c7854..433af7ef 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RateBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RateBaseStyle.xaml
@@ -5,9 +5,11 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
         <ResourceDictionary Source="../../Basic/Converters.xaml"/>
+        <ResourceDictionary Source="BaseStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="RateRateItemBaseStyle" TargetType="controls:RateItem">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Margin" Value="{Binding ItemMargin,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
         <Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
         <Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource  AncestorType=controls:Rate}}"/>
@@ -62,6 +64,7 @@
     </Style>
 
     <Style x:Key="RateBaseStyle" TargetType="controls:Rate">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="ItemMargin" Value="5,0"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml
index b1469330..7a07e6e3 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml
@@ -8,6 +8,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="StepBarItemBaseStyle" TargetType="controls:StepBarItem">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}"/>
         <Style.Triggers>
             <Trigger Property="Status" Value="Complete">
@@ -106,6 +107,7 @@
     </ControlTemplate>
 
     <Style x:Key="StepBarBaseStyle" TargetType="controls:StepBar">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalTop}"/>
         <Setter Property="Template" Value="{StaticResource StepBarHorizontalTopControlTemplate}"/>
         <Setter Property="ItemsPanel" Value="{StaticResource StepBarHorizontalItemsPanelTemplate}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
index ac9b200a..4af75407 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Clock.xaml
@@ -143,7 +143,7 @@
 
     <Style TargetType="controls:ListClock">
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Width" Value="210"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/FlipClock.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/FlipClock.xaml
index 0acfa6d0..0ced3fae 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/FlipClock.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/FlipClock.xaml
@@ -15,6 +15,7 @@
     </Style>
 
     <Style TargetType="controls:FlipClock">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:FlipClock">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Slider.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Slider.xaml
index 315f572d..24d10e04 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Slider.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Slider.xaml
@@ -350,6 +350,7 @@
     </ControlTemplate>
 
     <Style TargetType="controls:CompareSlider">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="1"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index cf30ac28..5da521e4 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -56,7 +56,7 @@
                                 </LinearGradientBrush>
                             </ContentPresenter.OpacityMask>
                         </ContentPresenter>
-                        <Button Grid.Column="1" Command="interactivity:ControlCommands.Close" Visibility="{Binding ShowCloseButton,RelativeSource={RelativeSource AncestorType=controls:TabControl},Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
+                        <Button Grid.Column="1" Focusable="False" Command="interactivity:ControlCommands.Close" Visibility="{Binding ShowCloseButton,RelativeSource={RelativeSource AncestorType=controls:TabControl},Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
                             <Path Fill="{DynamicResource PrimaryTextBrush}" Width="8" Height="8" Style="{StaticResource ClosePathStyle}"/>
                         </Button>
                     </Grid>
@@ -119,7 +119,7 @@
                     <Border.CacheMode>
                         <BitmapCache SnapsToDevicePixels="True"/>
                     </Border.CacheMode>
-                    <Button Style="{StaticResource ButtonIcon}" Padding="8" controls:IconElement.Geometry="{StaticResource LeftGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonLeft"/>
+                    <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}" >
@@ -139,7 +139,7 @@
                         <BitmapCache SnapsToDevicePixels="True"/>
                     </Border.CacheMode>
                     <StackPanel Orientation="Horizontal">
-                        <Button Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource ButtonIcon}" BorderBrush="{DynamicResource BorderBrush}" Padding="8" controls:IconElement.Geometry="{StaticResource RightGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonRight"/>
+                        <Button Focusable="False" Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource ButtonIcon}" BorderBrush="{DynamicResource BorderBrush}" Padding="8" controls:IconElement.Geometry="{StaticResource RightGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonRight"/>
                         <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Width="1" Background="{DynamicResource BorderBrush}"/>
                         <controls:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DownGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}"/>
                     </StackPanel>

From bd0e46f4b5017bfbeb6611eafd3fe015eefa2d2e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 31 May 2019 22:02:03 +0800
Subject: [PATCH 15/17] add RecognizesAccessKey for Button

---
 .../UserControl/Styles/ButtonDemoCtl.xaml.cs                | 6 +-----
 .../Themes/Styles/Base/ButtonBaseStyle.xaml                 | 2 +-
 .../Themes/Styles/Base/RadioButtonBaseStyle.xaml            | 4 ++--
 .../Themes/Styles/Base/ToggleButtonBaseStyle.xaml           | 2 +-
 .../HandyControl_Shared/Themes/Styles/ToggleButton.xaml     | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
index b0fe1afe..fee4a10e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
@@ -1,9 +1,5 @@
-
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl
 {
-    /// <summary>
-    /// ButtonDemoCtl.xaml 的交互逻辑
-    /// </summary>
     public partial class ButtonDemoCtl
     {
         public ButtonDemoCtl()
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml
index e8a2237e..1e992ef9 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml
@@ -17,7 +17,7 @@
                         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
                                 <Path x:Name="PathMain" Width="{TemplateBinding controls:IconElement.Width}" Height="{TemplateBinding controls:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding controls:IconElement.Geometry}"/>
-                                <ContentPresenter x:Name="ContentPresenterMain" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             </StackPanel>
                         </Border>
                     </controls:SimplePanel>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
index a956a666..39ffaf97 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
@@ -127,7 +127,7 @@
                         <Border Name="BorderHighlight" BorderThickness="3,0,0,0" BorderBrush="Transparent">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
                                 <Path x:Name="PathMain" Height="{Binding Path=(controls:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(controls:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding controls:IconElement.Geometry}"/>
-                                <ContentPresenter x:Name="ContentPresenterMain" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             </StackPanel>
                         </Border>
                     </Border>
@@ -174,7 +174,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="RadioButton">
                     <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}"/>
+                        <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">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
index 17f6bb58..7aa084cf 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
@@ -18,7 +18,7 @@
                         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
                                 <Path x:Name="PathMain" Width="{TemplateBinding controls:IconElement.Width}" Height="{TemplateBinding controls:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding controls:IconElement.Geometry}"/>
-                                <ContentPresenter x:Name="ContentPresenterMain" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             </StackPanel>
                         </Border>
                         <Border Visibility="Collapsed" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
index 64233659..97645eed 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
@@ -115,7 +115,7 @@
                 <ControlTemplate TargetType="ToggleButton">
                     <Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
                         <controls:SimplePanel>
-                            <ContentPresenter Name="UnCheckedElement"  Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            <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>
                     </Border>

From 5fd37e97fb126bc0ee8eeaa0ddb3051b33761cad Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 31 May 2019 22:49:37 +0800
Subject: [PATCH 16/17] Update NotifyIcon.cs

---
 .../Controls/Other/NotifyIcon.cs              | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index fc87cbb4..25098b63 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -85,21 +85,7 @@ namespace HandyControl.Controls
             _id = ++NextId;
             _callback = Callback;
 
-            Loaded += (s, e) =>
-            {
-                RegisterClass();
-                if (Visibility == Visibility.Visible)
-                {
-                    OnIconChanged();
-                    UpdateIcon(true);
-                }
-
-                _dispatcherTimerPos = new DispatcherTimer
-                {
-                    Interval = TimeSpan.FromMilliseconds(200)
-                };
-                _dispatcherTimerPos.Tick += DispatcherTimerPos_Tick;
-            };
+            Loaded += (s, e) => Init();
 
             if (Application.Current != null) Application.Current.Exit += (s, e) => Dispose();
         }
@@ -109,6 +95,22 @@ namespace HandyControl.Controls
             Dispose(false);
         }
 
+        public void Init()
+        {
+            RegisterClass();
+            if (Visibility == Visibility.Visible)
+            {
+                OnIconChanged();
+                UpdateIcon(true);
+            }
+
+            _dispatcherTimerPos = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromMilliseconds(200)
+            };
+            _dispatcherTimerPos.Tick += DispatcherTimerPos_Tick;
+        }
+
         public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
             "Text", typeof(string), typeof(NotifyIcon), new PropertyMetadata(default(string)));
 

From 8287c0a902f7fa85e2e419d58ab16429cd74e1de Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 1 Jun 2019 15:19:54 +0800
Subject: [PATCH 17/17] update to vs2019

---
 ...ol_Core30.sln => HandyControl_Core_30.sln} |  0
 src/HandyControl_Net_40.sln                   |  4 +-
 src/HandyControl_Net_GE45.sln                 | 38 ++++++++++++-------
 src/HandyControl_Net_GE45.sln.DotSettings     |  2 -
 .../HandyControlDemo_Net_GE45.csproj          | 21 ++++++++++
 .../HandyControl_Net_GE45.csproj              | 32 +++++++++++++---
 .../HandyControl_Shared.projitems             |  1 +
 .../Tools/Extension/StringExtension.cs        | 32 ++++++++++++++++
 8 files changed, 107 insertions(+), 23 deletions(-)
 rename src/{HandyControl_Core30.sln => HandyControl_Core_30.sln} (100%)
 delete mode 100644 src/HandyControl_Net_GE45.sln.DotSettings
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs

diff --git a/src/HandyControl_Core30.sln b/src/HandyControl_Core_30.sln
similarity index 100%
rename from src/HandyControl_Core30.sln
rename to src/HandyControl_Core_30.sln
diff --git a/src/HandyControl_Net_40.sln b/src/HandyControl_Net_40.sln
index adb9a4cc..60bcd427 100644
--- a/src/HandyControl_Net_40.sln
+++ b/src/HandyControl_Net_40.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{763DABFC-950A-4965-97CB-15C59A928401}"
 EndProject
diff --git a/src/HandyControl_Net_GE45.sln b/src/HandyControl_Net_GE45.sln
index 4093e7bd..b321309b 100644
--- a/src/HandyControl_Net_GE45.sln
+++ b/src/HandyControl_Net_GE45.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}"
 EndProject
@@ -26,9 +26,11 @@ Global
 		Debug-Net45|Any CPU = Debug-Net45|Any CPU
 		Debug-Net462|Any CPU = Debug-Net462|Any CPU
 		Debug-Net47|Any CPU = Debug-Net47|Any CPU
+		Debug-Net48|Any CPU = Debug-Net48|Any CPU
 		Release-Net45|Any CPU = Release-Net45|Any CPU
 		Release-Net462|Any CPU = Release-Net462|Any CPU
 		Release-Net47|Any CPU = Release-Net47|Any CPU
+		Release-Net48|Any CPU = Release-Net48|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
@@ -37,24 +39,32 @@ Global
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU
+		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU
 		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Release-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Release-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU
-		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU
+		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU
+		{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/HandyControl_Net_GE45.sln.DotSettings b/src/HandyControl_Net_GE45.sln.DotSettings
deleted file mode 100644
index df567fc2..00000000
--- a/src/HandyControl_Net_GE45.sln.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=HandyControl_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index 37f8abfd..b390a478 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -38,6 +38,17 @@
     <WarningLevel>4</WarningLevel>
     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Net48|AnyCPU'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
@@ -58,6 +69,16 @@
     <WarningLevel>4</WarningLevel>
     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Net48|AnyCPU'">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
   </PropertyGroup>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index fa66936d..c1f090f3 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -14,6 +14,17 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-Net45|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;netle45</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <netVersion>netgt40</netVersion>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-Net462|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -36,14 +47,25 @@
     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <netVersion>netgt40</netVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-Net45|AnyCPU' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Net48|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;netle45</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <netVersion>netgt40</netVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net45|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;netle45</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\HandyControl.xml</DocumentationFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <netVersion>netgt40</netVersion>
   </PropertyGroup>
@@ -69,15 +91,15 @@
     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <netVersion>netgt40</netVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net45|AnyCPU' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Net48|AnyCPU'">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;netle45</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\HandyControl.xml</DocumentationFile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <netVersion>netgt40</netVersion>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index fd5312df..6da52fc3 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -19,6 +19,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\PanelElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\PasswordBoxMonitor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\OpenLinkCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\StringExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\GlobalShortcut.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\StatusSwitchElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\TipElement.cs" />
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
new file mode 100644
index 00000000..854f767e
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel;
+
+namespace HandyControl.Tools.Extension
+{
+    public static class StringExtension
+    {
+        public static T Value<T>(this string input)
+        {
+            try
+            {
+                return (T)TypeDescriptor.GetConverter(typeof(T)).ConvertFromString(input);
+            }
+            catch
+            {
+                return default(T);
+            }
+        }
+
+        public static object Value(this string input, Type type)
+        {
+            try
+            {
+                return TypeDescriptor.GetConverter(type).ConvertFromString(input);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}
\ No newline at end of file