diff --git a/Samples/Views/MainView.xaml b/Samples/Views/MainView.xaml
index 08f1fb022d132881d9c642c9d86d00737aff90bc..6949a4cb3446bd4566ea42d6474375733b009c9f 100644
--- a/Samples/Views/MainView.xaml
+++ b/Samples/Views/MainView.xaml
@@ -4,7 +4,7 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:local="clr-namespace:Samples.Views"
-            xmlns:pu="https://opensource.panuon.com/wpf-ui"
+            xmlns:pui="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
             mc:Ignorable="d"
             Title="MainView"
             Height="600"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Panuon.WPF.UI.Internal.projitems b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Panuon.WPF.UI.Internal.projitems
index fb849ef875c7b9d2d3fc3117e0aad799228680ea..c7d2218f0a46f0ac946182f77d98bbb0b543e7fd 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Panuon.WPF.UI.Internal.projitems
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Panuon.WPF.UI.Internal.projitems
@@ -701,7 +701,4 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="$(MSBuildThisFileDirectory)Attributes\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ButtonTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ButtonTemplate.xaml
index 5f613dfeb50f647557a22637438ddec252b3585d..ebd232c172d53b77db6327a9abc580826ed26418 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ButtonTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ButtonTemplate.xaml
@@ -194,3 +194,8 @@
 
 </ResourceDictionary>
 
+<DataTrigger Binding="{Binding Path=(local:ButtonHelper.ClickBackground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+             Value="True" />
+    <Setter Property="Background"
+            Value="{Binding Path=(local:ButtonHelper.ClickBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+</DataTrigger>
\ No newline at end of file
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/LabelTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/LabelTemplate.xaml
index 911d764801ff3d6eb451231d59a2ee6cc7cc3d8a..aa3563c1c356016deb153a13e045e58ec065f02e 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/LabelTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/LabelTemplate.xaml
@@ -12,7 +12,6 @@
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.LabelTemplate}"
                      TargetType="Label">
         <Border x:Name="BdrContainer"
-                i:VisualStateHelper.IsClickEffectPressed="{Binding IsPressed, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                 Padding="{TemplateBinding Padding}"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ToolTipTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ToolTipTemplate.xaml
index 6b5190195376115e4c49e1ffe53817641b516690..6c824018ec99832d86131dc2cbf843fcfef5cce1 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ToolTipTemplate.xaml
+++ b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ToolTipTemplate.xaml
@@ -12,7 +12,6 @@
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ToolTipTemplate}"
                      TargetType="ToolTip">
         <Border x:Name="BdrContainer"
-                i:VisualStateHelper.IsClickEffectPressed="{Binding IsPressed, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                 Padding="{TemplateBinding Padding}"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI/Controls/MultiComboBox.cs b/SourceCode/SharedResources/Panuon.WPF.UI/Controls/MultiComboBox.cs
index 0b223fa140788d5e1d44932e0eaea12b500d86a5..666b7ef8540bdaffe318646d8f04cc4df5b5f8dd 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI/Controls/MultiComboBox.cs
+++ b/SourceCode/SharedResources/Panuon.WPF.UI/Controls/MultiComboBox.cs
@@ -140,7 +140,7 @@ namespace Panuon.WPF.UI
         }
 
         public static readonly DependencyProperty ShadowColorProperty =
-            DependencyProperty.Register("ShadowColor", typeof(Color?), typeof(MultiComboBox));
+            VisualStateHelper.ShadowColorProperty.AddOwner(typeof(MultiComboBox));
         #endregion
 
         #region CornerRadius
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs b/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
index 0d03b8db03034d2442c33f115c79365606ca16f7..bfbd08c587ee0bd3a05f4926877b44c92965d42a 100644
--- a/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
+++ b/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Windows.Markup;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Panuon.WPF.UI")]
-[assembly: AssemblyCopyright("Copyright ©2018-2022 Panuon Group (open source orgnization).")]
+[assembly: AssemblyCopyright("Copyright ©2018-2023 Panuon Group (open source orgnization).")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -25,5 +25,5 @@ using System.Windows.Markup;
     ResourceDictionaryLocation.SourceAssembly
 )]
 
-[assembly: AssemblyVersion("1.1.11.7")]
-[assembly: AssemblyFileVersion("1.1.11.7")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.1.11.8")]
+[assembly: AssemblyFileVersion("1.1.11.8")]
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 5e0a8aa1df8a3b20e7986aace07f9d6f175bab15..3a0853ad79a6938d012892bb60c76722cd176a49 100644
--- a/readme.md
+++ b/readme.md
@@ -65,13 +65,12 @@ xmlns:pu="https://opensource.panuon.com/wpf-ui"
 ```
 
 ```
-xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
-xmlns:purs="clr-namespace:Panuon.WPF.UI.Resources;assembly=Panuon.WPF.UI"
+xmlns:pu="https://opensource.panuon.com/wpf-ui"
 ...
 
 <Button Width="150"
         Height="35"
-        Style="{StaticResource {x:Static purs:StyleKeys.ButtonStyle}}"
+        Style="{StaticResource {x:Static pu:StyleKeys.ButtonStyle}}"
         Background="#6CBCEA"
         pu:ButtonHelper.CornerRadius="5"
         pu:ButtonHelper.HoverBackground="#6CA3EA"
diff --git a/readme.zh-CN.md b/readme.zh-CN.md
index f6104b1dc7ac8928830214cc74e339470ff2f775..212cf4a1339792c9d82189e8b2e84f45558ea56a 100644
--- a/readme.zh-CN.md
+++ b/readme.zh-CN.md
@@ -65,13 +65,12 @@ xmlns:pu="https://opensource.panuon.com/wpf-ui"
 ```
 
 ```
-xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
-xmlns:purs="clr-namespace:Panuon.WPF.UI.Resources;assembly=Panuon.WPF.UI"
+xmlns:pu="https://opensource.panuon.com/wpf-ui"
 ...
 
 <Button Width="150"
         Height="35"
-        Style="{StaticResource {x:Static purs:StyleKeys.ButtonStyle}}"
+        Style="{StaticResource {x:Static pu:StyleKeys.ButtonStyle}}"
         Background="#6CBCEA"
         pu:ButtonHelper.CornerRadius="5"
         pu:ButtonHelper.HoverBackground="#6CA3EA"