diff --git a/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Resources/PanuonIcon.ttf b/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Resources/PanuonIcon.ttf
index f3224020..b4a6aaf5 100644
Binary files a/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Resources/PanuonIcon.ttf and b/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Resources/PanuonIcon.ttf differ
diff --git a/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Themes/Generic.xaml b/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Themes/Generic.xaml
index eb5881a8..a69d2cb0 100644
--- a/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Themes/Generic.xaml
+++ b/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Themes/Generic.xaml
@@ -14,7 +14,7 @@
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
                 <WindowChrome  ResizeBorderThickness="3"
-                               GlassFrameThickness="3"
+                               GlassFrameThickness="0,1,0,0"
                                CornerRadius="0" />
             </Setter.Value>
         </Setter>
diff --git a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Panuon.UI.Silver.csproj b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Panuon.UI.Silver.csproj
index b74c36fa..98385658 100644
--- a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Panuon.UI.Silver.csproj
+++ b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Panuon.UI.Silver.csproj
@@ -65,11 +65,11 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="packages.config" />
+    <Resource Include="Resources\PanuonIcon.ttf" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Resource Include="Resources\PanuonIcon.ttf" />
     <Resource Include="Resources\Fonts\PanuonIcon.ttf" />
   </ItemGroup>
   <ItemGroup>
diff --git a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Resources/PanuonIcon.ttf b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Resources/PanuonIcon.ttf
index f3224020..b4a6aaf5 100644
Binary files a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Resources/PanuonIcon.ttf and b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Resources/PanuonIcon.ttf differ
diff --git a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Themes/Generic.xaml b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Themes/Generic.xaml
index ed75baab..efb02a45 100644
--- a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Themes/Generic.xaml
+++ b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Themes/Generic.xaml
@@ -15,7 +15,7 @@
         <Setter Property="shell:WindowChrome.WindowChrome">
                 <Setter.Value>
                 <shell:WindowChrome  ResizeBorderThickness="3"
-                                     GlassFrameThickness="3"
+                                     GlassFrameThickness="0,1,0,0"
                                      CornerRadius="0" />
             </Setter.Value>
         </Setter>
diff --git a/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Resources/PanuonIcon.ttf b/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Resources/PanuonIcon.ttf
index f3224020..b4a6aaf5 100644
Binary files a/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Resources/PanuonIcon.ttf and b/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Resources/PanuonIcon.ttf differ
diff --git a/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Themes/Generic.xaml b/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Themes/Generic.xaml
index eb5881a8..a69d2cb0 100644
--- a/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Themes/Generic.xaml
+++ b/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Themes/Generic.xaml
@@ -14,7 +14,7 @@
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
                 <WindowChrome  ResizeBorderThickness="3"
-                               GlassFrameThickness="3"
+                               GlassFrameThickness="0,1,0,0"
                                CornerRadius="0" />
             </Setter.Value>
         </Setter>
diff --git a/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Resources/PanuonIcon.ttf b/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Resources/PanuonIcon.ttf
index f3224020..b4a6aaf5 100644
Binary files a/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Resources/PanuonIcon.ttf and b/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Resources/PanuonIcon.ttf differ
diff --git a/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Themes/Generic.xaml b/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Themes/Generic.xaml
index 9e21c4c3..a69d2cb0 100644
--- a/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Themes/Generic.xaml
+++ b/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Themes/Generic.xaml
@@ -14,7 +14,7 @@
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
                 <WindowChrome  ResizeBorderThickness="3"
-                               GlassFrameThickness="5"
+                               GlassFrameThickness="0,1,0,0"
                                CornerRadius="0" />
             </Setter.Value>
         </Setter>
diff --git a/DotNet/WPF/Src/Samples/Views/MainView.xaml b/DotNet/WPF/Src/Samples/Views/MainView.xaml
index d02f8e6f..c1425691 100644
--- a/DotNet/WPF/Src/Samples/Views/MainView.xaml
+++ b/DotNet/WPF/Src/Samples/Views/MainView.xaml
@@ -55,6 +55,7 @@
                     Click="BtnTestPendingBox_Click" />
         </StackPanel>
         <ScrollViewer Grid.Row="1"
+                      Visibility="Collapsed"
                       Margin="0,15,0,0"
                       VerticalScrollBarVisibility="Disabled"
                       HorizontalScrollBarVisibility="Auto"
@@ -105,6 +106,14 @@
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
         </ScrollViewer>
+        <Button Grid.Row="1"
+                Height="50"
+                Width="200"
+                pu:ButtonHelper.Icon="/Samples;component/Resources/Logo.png"
+                Content="Go"/>
+        <Grid Grid.Row="1">
+
+        </Grid>
         <TextBlock Grid.Row="2"
                    FontSize="14"
                    Foreground="Gray"
diff --git a/DotNet/WPF/Src/Samples/Views/Tools/IconFontView.xaml b/DotNet/WPF/Src/Samples/Views/Tools/IconFontView.xaml
index f5f5136b..bcaf0f7f 100644
--- a/DotNet/WPF/Src/Samples/Views/Tools/IconFontView.xaml
+++ b/DotNet/WPF/Src/Samples/Views/Tools/IconFontView.xaml
@@ -63,13 +63,13 @@
                     <Setter Property="BorderThickness"
                             Value="2" />
                     <Setter Property="FontFamily"
-                            Value="/Samples;component/Resources/#PanuonIcon" />
+                            Value="/Panuon.UI.Silver;component/Resources/Fonts/#PanuonIcon" />
                     <Setter Property="ToolTip">
                         <Setter.Value>
                             <StackPanel>
                                 <TextBlock Text="{Binding Icon}"
                                            Foreground="Black"
-                                           FontFamily="/Samples;component/Resources/#PanuonIcon"
+                                           FontFamily="/Panuon.UI.Silver;component/Resources/Fonts/#PanuonIcon"
                                            FontSize="50" />
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{Binding Code}" />
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/PendingBoxWindow.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/PendingBoxWindow.cs
index 4571b77e..0622e4b0 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/PendingBoxWindow.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/PendingBoxWindow.cs
@@ -67,9 +67,12 @@ public PendingBoxWindow(Window owner, bool interopOwnersMask, Rect? ownerRect, s
             _cancelButtonStyle = XamlUtil.FromXaml<Style>(cancelButtonStyle);
             _spinnerStyle = XamlUtil.FromXaml<Style>(spinnerStyle);
 
-            WindowStartupLocation = owner == null
-                ? (ownerRect == null ? WindowStartupLocation.CenterScreen : WindowStartupLocation.Manual)
-                : WindowStartupLocation.CenterOwner;
+            if(ownerRect == null)
+            {
+                WindowStartupLocation = owner == null
+                  ? WindowStartupLocation.CenterScreen
+                  : WindowStartupLocation.CenterOwner;
+            }
 
             if (ownerRect == null)
             {
@@ -88,6 +91,7 @@ public PendingBoxWindow(Window owner, bool interopOwnersMask, Rect? ownerRect, s
                 }));
                 _owner = ownerX;
             }
+            Loaded += PendingBoxWindow_Loaded;
         }
 
         #endregion
@@ -113,9 +117,16 @@ public override void OnApplyTemplate()
                     _cancelButton.Visibility = _canCancel ? Visibility.Visible : Visibility.Collapsed;
                     _cancelButton.Click += CancelButton_Click;
                 }
-                if(captionTextBlock != null)
+                if (captionTextBlock != null)
                 {
-                    captionTextBlock.Text = _captionText;
+                    if (_captionText == null)
+                    {
+                        captionTextBlock.Visibility = Visibility.Collapsed;
+                    }
+                    else
+                    {
+                        captionTextBlock.Text = _captionText;
+                    }
                 }
                 if (_messageTextBlock != null)
                 {
@@ -160,23 +171,8 @@ protected override void OnClosed(EventArgs e)
         }
         #endregion
 
-        #region 
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            if (_ownerRect is Rect ownerRect)
-            {
-                var source = PresentationSource.FromVisual(this).CompositionTarget.TransformToDevice;
-
-                var width = (int)(sizeInfo.NewSize.Width * source.M11);
-                var height = (int)(sizeInfo.NewSize.Height * source.M22);
-                var left = ownerRect.X + (ownerRect.Width - width) / 2;
-                var top = ownerRect.Y + (ownerRect.Height - height) / 2;
+        #region OnRenderSizeChanged
 
-                Left = left / source.M11;
-                Top = top / source.M22;
-            }
-            base.OnRenderSizeChanged(sizeInfo);
-        }
         #endregion
 
         #endregion
@@ -208,6 +204,23 @@ public void UpdateMessage(string message)
         #endregion
 
         #region Event Handlers
+        private void PendingBoxWindow_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (_ownerRect is Rect ownerRect)
+            {
+                var hwndSource = PresentationSource.FromVisual(this) as HwndSource;
+                var source = hwndSource.CompositionTarget.TransformToDevice;
+
+                var width = (int)(ActualWidth * source.M11);
+                var height = (int)(ActualHeight * source.M22);
+                var left = ownerRect.X + (ownerRect.Width - width) / 2;
+                var top = ownerRect.Y + (ownerRect.Height - height) / 2;
+
+                Left = left / source.M11;
+                Top = top / source.M22;
+            }
+        }
+
         private void CancelButton_Click(object sender, RoutedEventArgs e)
         {
             if (_handler.TriggerCancel())
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Converters/TransparentColorToBrushConverter.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Converters/TransparentColorToBrushConverter.cs
index ff3c6a21..c54687d4 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Converters/TransparentColorToBrushConverter.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Converters/TransparentColorToBrushConverter.cs
@@ -82,7 +82,7 @@ public override object Convert(object[] values, Type targetType, object paramete
                 {
                     Children = new DrawingCollection()
                     {
-                          new GeometryDrawing(_stackBrush, null, new RectangleGeometry(new Rect(1, 1, width - 2, height - 2))),
+                          new GeometryDrawing(_stackBrush, null, new RectangleGeometry(new Rect(1, 1, Math.Max(0, width - 2), Math.Max(0, height - 2)))),
                           new GeometryDrawing(background, null, new RectangleGeometry(new Rect(0, 0, width, height))),
                      }
                 }
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Implements/PendingHandlerImpl.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Implements/PendingHandlerImpl.cs
index 05d0b8ad..696bc733 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Implements/PendingHandlerImpl.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Implements/PendingHandlerImpl.cs
@@ -25,15 +25,12 @@ public PendingHandlerImpl()
         #region Methods
         public void Close()
         {
-            if(_window.IsAlive && _window.Target is PendingBoxWindow window)
+            if (_window.IsAlive && _window.Target is PendingBoxWindow window)
             {
-                if (window.Dispatcher.CheckAccess())
+                window.Dispatcher.Invoke(new Action(() =>
                 {
-                    window.Dispatcher.Invoke(new Action(() =>
-                    {
-                        window.Close();
-                    }));
-                }
+                    window.Close();
+                }));
             }
         }
         #endregion
@@ -60,13 +57,10 @@ public void UpdateMessage(string message)
         {
             if (_window.IsAlive && _window.Target is PendingBoxWindow window)
             {
-                if (window.Dispatcher.CheckAccess())
+                window.Dispatcher.Invoke(new Action(() =>
                 {
-                    window.Dispatcher.Invoke(new Action(() =>
-                    {
-                        window.UpdateMessage(message);
-                    }));
-                }
+                    window.UpdateMessage(message);
+                }));
             }
         }
         #endregion
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Panuon.UI.Silver.Internal.projitems b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Panuon.UI.Silver.Internal.projitems
index 5e5dc752..0ca56080 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Panuon.UI.Silver.Internal.projitems
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Panuon.UI.Silver.Internal.projitems
@@ -12,8 +12,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CalendarXDayPresenter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\NoticeBoxWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ClippingBorder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ContentControlX.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\CustomPopup.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\IconPresenter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\InternalSpinner.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageBoxXWindow.cs" />
@@ -130,14 +128,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\CalendarXItemStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\CalendarXStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Styles\CardStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ButtonStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ButtonStyle.xaml
index ee6f29c5..b7ee3b0c 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ButtonStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ButtonStyle.xaml
@@ -18,7 +18,11 @@
         <Setter Property="Height"
                 Value="{Binding FontSize, Converter={StaticResource {x:Static rs:ConverterKeys.DoublePlusConverter}}, ConverterParameter=6, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
     </Style>
-    
+
+    <Style x:Key="{x:Static rs:ComponentKeys.ButtonHelperPendingSpinnerStyle}"
+           TargetType="local:Spinner"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=PendingSpinnerStyle, TypeInTargetAssembly={x:Type local:ButtonHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.ButtonStyle}"
            TargetType="Button">
         <Setter Property="i:VisualStateHelper.Regist"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/CalendarXItemStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/CalendarXItemStyle.xaml
deleted file mode 100644
index eacd0a42..00000000
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/CalendarXItemStyle.xaml
+++ /dev/null
@@ -1,58 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Panuon.UI.Silver"
-                    xmlns:core="clr-namespace:Panuon.UI.Core;assembly=Panuon.UI.Core"
-                    xmlns:i="clr-namespace:Panuon.UI.Silver.Internal"
-                    xmlns:rs="clr-namespace:Panuon.UI.Silver.Resources"
-                    xmlns:irs="clr-namespace:Panuon.UI.Silver.Internal.Resources">
-    <ResourceDictionary.MergedDictionaries>
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Templates/CalendarXItemTemplate.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <DataTemplate x:Key="{ComponentResourceKey ResourceId=HighlightGlyphTemplate, TypeInTargetAssembly={x:Type local:CalendarXItem}}">
-        <Ellipse Width="6"
-                 Height="6"
-                 Fill="DimGray"
-                 HorizontalAlignment="Right"
-                 VerticalAlignment="Top"
-                 Margin="6"/>
-    </DataTemplate>
-
-    <Style TargetType="local:CalendarXItem">
-        <Setter Property="i:VisualStateHelper.Regist"
-                Value="True" />
-        <Setter Property="i:VisualStateHelper.IsHover"
-                Value="{Binding IsMouseOver, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
-        <Setter Property="VerticalContentAlignment"
-                Value="Center" />
-        <Setter Property="HorizontalContentAlignment"
-                Value="Center" />
-        <Setter Property="HoverBackground"
-                Value="#EAEAEA" />
-        <Setter Property="SelectedBackground"
-                Value="#E1E1E1" />
-        <Setter Property="Background"
-                Value="Transparent" />
-        <Setter Property="BorderThickness"
-                Value="0" />
-        <Setter Property="HighlightGlyphTemplate"
-                Value="{StaticResource {ComponentResourceKey ResourceId=HighlightGlyphTemplate, TypeInTargetAssembly={x:Type local:CalendarXItem}}}" />
-        <Setter Property="Template"
-                Value="{StaticResource {x:Static irs:TemplateKeys.CalendarXItemTemplate}}" />
-        <Style.Triggers>
-            <Trigger Property="IsToday"
-                     Value="True">
-                <Setter Property="BorderBrush"
-                        Value="DimGray" />
-                <Setter Property="BorderThickness"
-                        Value="1" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-                <Setter Property="Opacity"
-                        Value="{Binding DisabledOpacity, Source={x:Static local:GlobalSettings.Setting}}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-</ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/CalendarXStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/CalendarXStyle.xaml
deleted file mode 100644
index 121eaf00..00000000
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/CalendarXStyle.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Panuon.UI.Silver"
-                    xmlns:core="clr-namespace:Panuon.UI.Core;assembly=Panuon.UI.Core"
-                    xmlns:i="clr-namespace:Panuon.UI.Silver.Internal"
-                    xmlns:rs="clr-namespace:Panuon.UI.Silver.Resources"
-                    xmlns:irs="clr-namespace:Panuon.UI.Silver.Internal.Resources">
-    <ResourceDictionary.MergedDictionaries>
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Templates/CalendarXTemplate.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style x:Key="{ComponentResourceKey ResourceId=CalendarXItemStyle, TypeInTargetAssembly={x:Type local:CalendarX}}"
-           TargetType="local:CalendarXItem">
-    </Style>
-
-    <Style TargetType="local:CalendarX">
-        <Setter Property="Background"
-                Value="White" />
-        <Setter Property="BorderBrush"
-                Value="DimGray" />
-        <Setter Property="BorderThickness"
-                Value="1" />
-        <Setter Property="VerticalContentAlignment"
-                Value="Center" />
-        <Setter Property="HorizontalContentAlignment"
-                Value="Center" />
-        <Setter Property="CalendarXItemStyle"
-                Value="{StaticResource {ComponentResourceKey ResourceId=CalendarXItemStyle, TypeInTargetAssembly={x:Type local:CalendarX}}}" />
-        <Setter Property="Template"
-                Value="{StaticResource {x:Static irs:TemplateKeys.CalendarXTemplate}}" />
-        <Style.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-                <Setter Property="Opacity"
-                        Value="{Binding DisabledOpacity, Source={x:Static local:GlobalSettings.Setting}}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-</ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ColorPickerStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ColorPickerStyle.xaml
index df82cd94..7e7a371e 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ColorPickerStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ColorPickerStyle.xaml
@@ -33,6 +33,10 @@
                 Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ColorPickerClearButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ClearButtonStyle, TypeInTargetAssembly={x:Type local:ColorPicker}}}" />
+
     <DataTemplate x:Key="{ComponentResourceKey ResourceId=PreviewTemplate, TypeInTargetAssembly={x:Type local:ColorPicker}}">
         <Border Background="{Binding}"
                 BorderBrush="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
@@ -66,10 +70,18 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ColorPickerToggleArrowTransformControlStyle}"
+           TargetType="local:TransformControl"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ToggleArrowTransformControlStyle, TypeInTargetAssembly={x:Type local:ColorPicker}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=ColorSelectorStyle, TypeInTargetAssembly={x:Type local:ColorPicker}}"
            TargetType="local:ColorSelector">
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ColorPickerColorSelectorStyle}"
+           TargetType="local:ColorSelector"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ColorSelectorStyle, TypeInTargetAssembly={x:Type local:ColorPicker}}}" />
+
     <Style TargetType="local:ColorPicker">
         <Setter Property="i:VisualStateHelper.Regist"
                 Value="True" />
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ColorSelectorStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ColorSelectorStyle.xaml
index afd2bdef..4ead5cf5 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ColorSelectorStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ColorSelectorStyle.xaml
@@ -35,6 +35,10 @@
                 Value="/Panuon.UI.Silver;component/Resources/#PanuonIcon" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ColorSelectorDropperThumbStyle}"
+           TargetType="Thumb"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=DropperThumbStyle, TypeInTargetAssembly={x:Type local:ColorSelector}}}" />
+    
     <Style x:Key="{ComponentResourceKey ResourceId=SliderStyle, TypeInTargetAssembly={x:Type local:ColorSelector}}"
            TargetType="Slider"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.SliderStyle}}">
@@ -96,6 +100,10 @@
 
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ColorSelectorSliderStyle}"
+           TargetType="Slider"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=SliderStyle, TypeInTargetAssembly={x:Type local:ColorSelector}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=ThumbFenceStyle, TypeInTargetAssembly={x:Type local:ColorSelector}}"
            TargetType="local:ThumbFence">
         <Setter Property="MinHeight"
@@ -127,6 +135,10 @@
         </Setter>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ColorSelectorThumbFenceStyle}"
+           TargetType="local:ThumbFence"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ThumbFenceStyle, TypeInTargetAssembly={x:Type local:ColorSelector}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=InputTextBoxStyle, TypeInTargetAssembly={x:Type local:ColorSelector}}"
            TargetType="TextBox"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.TextBoxStyle}}">
@@ -152,7 +164,11 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-    
+
+    <Style x:Key="{x:Static rs:ComponentKeys.ColorSelectorInputTextBoxStyle}"
+           TargetType="TextBox"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=InputTextBoxStyle, TypeInTargetAssembly={x:Type local:ColorSelector}}}" />
+
     <Style TargetType="local:ColorSelector">
         <Setter Property="Background"
                 Value="White" />
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ComboBoxStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ComboBoxStyle.xaml
index e17b6226..8a8700a4 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ComboBoxStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ComboBoxStyle.xaml
@@ -34,6 +34,10 @@
                 Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ComboBoxHelperClearButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ClearButtonStyle, TypeInTargetAssembly={x:Type local:ComboBoxHelper}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=RemoveButtonStyle, TypeInTargetAssembly={x:Type local:ComboBoxHelper}}"
            TargetType="Button"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.ButtonStyle}}">
@@ -57,6 +61,10 @@
                 Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ComboBoxHelperRemoveButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=RemoveButtonStyle, TypeInTargetAssembly={x:Type local:ComboBoxHelper}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=ToggleArrowTransformControlStyle, TypeInTargetAssembly={x:Type local:ComboBoxHelper}}"
            TargetType="local:TransformControl">
         <Setter Property="VerticalContentAlignment"
@@ -82,6 +90,10 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ComboBoxHelperToggleArrowTransformControlStyle}"
+           TargetType="local:TransformControl"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ToggleArrowTransformControlStyle, TypeInTargetAssembly={x:Type local:ComboBoxHelper}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=SearchTextBoxStyle, TypeInTargetAssembly={x:Type local:ComboBoxHelper}}"
            TargetType="TextBox"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.TextBoxStyle}}">
@@ -103,6 +115,10 @@
                 Value="{Binding Path=(local:ComboBoxHelper.ItemsHeight), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ComboBoxHelperSearchTextBoxStyle}"
+           TargetType="TextBox"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=SearchTextBoxStyle, TypeInTargetAssembly={x:Type local:ComboBoxHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.ComboBoxStyle}"
            TargetType="ComboBox">
         <Setter Property="i:VisualStateHelper.Regist"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ContentControlXStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ContentControlXStyle.xaml
index 4b081c07..2d74a2c8 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ContentControlXStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ContentControlXStyle.xaml
@@ -9,7 +9,7 @@
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Templates/ContentControlXTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style TargetType="i:ContentControlX">
+    <Style TargetType="local:ContentControlX">
         <Setter Property="VerticalContentAlignment"
                 Value="Stretch" />
         <Setter Property="HorizontalContentAlignment"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ContextMenuStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ContextMenuStyle.xaml
index 0c2bd023..e7801541 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ContextMenuStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ContextMenuStyle.xaml
@@ -85,6 +85,12 @@
                 Value="{Binding Path=(local:ContextMenuHelper.ItemsClickBorderBrush), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}" />
         <Setter Property="local:MenuItemHelper.ClickForeground"
                 Value="{Binding Path=(local:ContextMenuHelper.ItemsClickForeground), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}" />
+        <Setter Property="local:MenuItemHelper.OpenedBackground"
+                Value="{Binding Path=(local:ContextMenuHelper.ItemsOpenedBackground), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}" />
+        <Setter Property="local:MenuItemHelper.OpenedBorderBrush"
+                Value="{Binding Path=(local:ContextMenuHelper.ItemsOpenedBorderBrush), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}" />
+        <Setter Property="local:MenuItemHelper.OpenedForeground"
+                Value="{Binding Path=(local:ContextMenuHelper.ItemsOpenedForeground), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}" />
         <Setter Property="Padding"
                 Value="{Binding Path=(local:ContextMenuHelper.ItemsPadding), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}" />
         <Setter Property="Margin"
@@ -105,6 +111,10 @@
                 Value="{StaticResource {x:Static irs:TemplateKeys.ContextMenuItemTemplate}}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ContextMenuHelperMenuItemStyle}"
+           TargetType="MenuItem"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=MenuItemStyle, TypeInTargetAssembly={x:Type local:ContextMenuHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.ContextMenuStyle}"
         TargetType="{x:Type ContextMenu}">
         <Style.Resources>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/DataGridStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/DataGridStyle.xaml
index b00ab991..435cfea9 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/DataGridStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/DataGridStyle.xaml
@@ -28,6 +28,10 @@
                 Value="{Binding Path=(local:DataGridHelper.RowHeaderClickBackground), RelativeSource={RelativeSource AncestorType=DataGrid}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.DataGridHelperSelectAllButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=SelectAllButtonStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=SortArrowTransformControlStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}"
            TargetType="local:TransformControl">
         <Setter Property="VerticalContentAlignment"
@@ -51,6 +55,10 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.DataGridHelperSortArrowTransformControlStyle}"
+           TargetType="local:TransformControl"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=SortArrowTransformControlStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=AutoGeneratedTextBoxStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}"
            TargetType="TextBox"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.TextBoxStyle}}">
@@ -62,6 +70,10 @@
                 Value="#E3E3E3" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.DataGridHelperAutoGeneratedTextBoxStyle}"
+           TargetType="TextBox"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=AutoGeneratedTextBoxStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=AutoGeneratedComboBoxStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}"
            TargetType="ComboBox"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.ComboBoxStyle}}">
@@ -73,6 +85,10 @@
                 Value="#E3E3E3" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.DataGridHelperAutoGeneratedComboBoxStyle}"
+           TargetType="ComboBox"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=AutoGeneratedComboBoxStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=AutoGeneratedCheckBoxStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}"
            TargetType="CheckBox"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.CheckBoxStyle}}">
@@ -80,6 +96,10 @@
                 Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType=DataGrid}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.DataGridHelperAutoGeneratedCheckBoxStyle}"
+           TargetType="CheckBox"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=AutoGeneratedCheckBoxStyle, TypeInTargetAssembly={x:Type local:DataGridHelper}}}" />
+
     <Style x:Key="{x:Static irs:StyleKeys.DataGridComboBoxStyle}"
            TargetType="ComboBox">
         <Setter Property="BorderThickness"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ExpanderStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ExpanderStyle.xaml
index a35fdd95..247416aa 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ExpanderStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ExpanderStyle.xaml
@@ -88,6 +88,10 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ExpanderHelperToggleArrowTransformControlStyle}"
+           TargetType="local:TransformControl"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ToggleArrowTransformControlStyle, TypeInTargetAssembly={x:Type local:ExpanderHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.ExpanderStyle}"
            TargetType="Expander">
         <Setter Property="i:VisualStateHelper.Regist"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/GroupBoxStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/GroupBoxStyle.xaml
index 31163a41..aa4d7c76 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/GroupBoxStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/GroupBoxStyle.xaml
@@ -18,7 +18,9 @@
         <Setter Property="local:IconHelper.FontSize"
                 Value="{Binding IconFontSize, Source={x:Static local:GlobalSettings.Setting}}" />
         <Setter Property="local:IconHelper.Margin"
-                Value="10,0,0,0" />
+                Value="0,0,5,0" />
+        <Setter Property="local:IconHelper.Foreground"
+                Value="{Binding Path=(local:GroupBoxHelper.HeaderForeground), RelativeSource={RelativeSource Self}}" />
         <Setter Property="local:GroupBoxHelper.HeaderSeparatorBrush"
                 Value="{Binding BorderBrush, RelativeSource={RelativeSource Self}}" />
         <Setter Property="local:GroupBoxHelper.HeaderSeparatorThickness"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ListBoxItemStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ListBoxItemStyle.xaml
index 39c4b443..0fcdfcc8 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ListBoxItemStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ListBoxItemStyle.xaml
@@ -53,6 +53,8 @@
                 Value="{Binding Path=(local:ListBoxHelper.ItemsIconPlacement), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.CornerRadius"
                 Value="{Binding Path=(local:ListBoxHelper.ItemsCornerRadius), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
+        <Setter Property="local:ListBoxItemHelper.ShadowColor"
+                Value="{Binding Path=(local:ListBoxHelper.ItemsShadowColor), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.RemoveButtonVisibility"
                 Value="{Binding Path=(local:ListBoxHelper.ItemsRemoveButtonVisibility), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.HoverBackground"
@@ -61,6 +63,8 @@
                 Value="{Binding Path=(local:ListBoxHelper.ItemsHoverBorderBrush), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.HoverForeground"
                 Value="{Binding Path=(local:ListBoxHelper.ItemsHoverForeground), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
+        <Setter Property="local:ListBoxItemHelper.HoverShadowColor"
+                Value="{Binding Path=(local:ListBoxHelper.ItemsHoverShadowColor), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.SelectedBackground"
                 Value="{Binding Path=(local:ListBoxHelper.ItemsSelectedBackground), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.SelectedBorderBrush"
@@ -69,6 +73,8 @@
                 Value="{Binding Path=(local:ListBoxHelper.ItemsSelectedForeground), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.SelectedBorderThickness"
                 Value="{Binding Path=(local:ListBoxHelper.ItemsSelectedBorderThickness), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
+        <Setter Property="local:ListBoxItemHelper.SelectedShadowColor"
+                Value="{Binding Path=(local:ListBoxHelper.ItemsSelectedShadowColor), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.SeparatorBrush"
                 Value="{Binding Path=(local:ListBoxHelper.ItemsSeparatorBrush), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.SeparatorThickness"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ListBoxStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ListBoxStyle.xaml
index 29e79e7d..8cf93e9f 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ListBoxStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ListBoxStyle.xaml
@@ -33,8 +33,14 @@
                 Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=ListBoxItem}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ListBoxHelperRemoveButtonStyle}"
+           TargetType="local:TransformControl"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=RemoveButtonStyle, TypeInTargetAssembly={x:Type local:ListBoxHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.ListBoxStyle}"
            TargetType="ListBox">
+        <Setter Property="i:VisualStateHelper.Regist"
+                Value="True" />
         <Setter Property="local:IconHelper.FontFamily"
                 Value="{Binding IconFontFamily, Source={x:Static local:GlobalSettings.Setting}}" />
         <Setter Property="local:IconHelper.FontSize"
@@ -59,8 +65,6 @@
                 Value="Collapsed" />
         <Setter Property="local:ListBoxHelper.RemoveButtonStyle"
                 Value="{StaticResource {ComponentResourceKey ResourceId=RemoveButtonStyle, TypeInTargetAssembly={x:Type local:ListBoxHelper}}}" />
-        <Setter Property="Background"
-                Value="Transparent" />
         <Setter Property="VerticalContentAlignment"
                 Value="Center" />
         <Setter Property="Template"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MenuItemStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MenuItemStyle.xaml
index 78e6e72d..c34add4d 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MenuItemStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MenuItemStyle.xaml
@@ -70,6 +70,12 @@
                         Value="{Binding Path=(local:MenuHelper.TopLevelItemsClickBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="local:MenuItemHelper.ClickForeground"
                         Value="{Binding Path=(local:MenuHelper.TopLevelItemsClickForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedBackground"
+                        Value="{Binding Path=(local:MenuHelper.TopLevelItemsOpenedBackground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedBorderBrush"
+                        Value="{Binding Path=(local:MenuHelper.TopLevelItemsOpenedBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedForeground"
+                        Value="{Binding Path=(local:MenuHelper.TopLevelItemsOpenedForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Padding"
                         Value="{Binding Path=(local:MenuHelper.TopLevelItemsPadding), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Margin"
@@ -121,6 +127,12 @@
                         Value="{Binding Path=(local:MenuHelper.TopLevelItemsClickBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="local:MenuItemHelper.ClickForeground"
                         Value="{Binding Path=(local:MenuHelper.TopLevelItemsClickForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedBackground"
+                        Value="{Binding Path=(local:MenuHelper.TopLevelItemsOpenedBackground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedBorderBrush"
+                        Value="{Binding Path=(local:MenuHelper.TopLevelItemsOpenedBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedForeground"
+                        Value="{Binding Path=(local:MenuHelper.TopLevelItemsOpenedForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Padding"
                         Value="{Binding Path=(local:MenuHelper.TopLevelItemsPadding), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Margin"
@@ -172,6 +184,12 @@
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsClickBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="local:MenuItemHelper.ClickForeground"
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsClickForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedBackground"
+                        Value="{Binding Path=(local:MenuHelper.SubmenuItemsOpenedBackground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedBorderBrush"
+                        Value="{Binding Path=(local:MenuHelper.SubmenuItemsOpenedBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedForeground"
+                        Value="{Binding Path=(local:MenuHelper.SubmenuItemsOpenedForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Padding"
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsPadding), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Margin"
@@ -223,6 +241,12 @@
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsClickBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="local:MenuItemHelper.ClickForeground"
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsClickForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedBackground"
+                        Value="{Binding Path=(local:MenuHelper.SubmenuItemsOpenedBackground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedBorderBrush"
+                        Value="{Binding Path=(local:MenuHelper.SubmenuItemsOpenedBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="local:MenuItemHelper.OpenedForeground"
+                        Value="{Binding Path=(local:MenuHelper.SubmenuItemsOpenedForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Padding"
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsPadding), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Margin"
@@ -231,6 +255,8 @@
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsIcon), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="Background"
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsBackground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
+                <Setter Property="Foreground"
+                        Value="{Binding Path=(local:MenuHelper.SubmenuItemsForeground), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="BorderBrush"
                         Value="{Binding Path=(local:MenuHelper.SubmenuItemsBorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                 <Setter Property="BorderThickness"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MenuStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MenuStyle.xaml
index 2ba407da..4d4b5de6 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MenuStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MenuStyle.xaml
@@ -51,7 +51,7 @@
         <Setter Property="local:MenuHelper.TopLevelItemsHoverBackground"
                 Value="#F1F1F1" />
         <Setter Property="local:MenuHelper.TopLevelItemsForeground"
-                Value="#3E3E3E" />
+                Value="{Binding Foreground, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:MenuHelper.SubmenuItemsIconWidth"
                 Value="{Binding Path=(local:MenuHelper.SubmenuItemsHeight), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:MenuHelper.SubmenuItemsHeight"
@@ -63,25 +63,29 @@
         <Setter Property="local:MenuHelper.SubmenuItemsHoverBackground"
                 Value="#F1F1F1" />
         <Setter Property="local:MenuHelper.SubmenuItemsForeground"
-                Value="#3E3E3E" />
-        <Setter Property="local:DropDownHelper.Width"
-                Value="150" />
-        <Setter Property="local:DropDownHelper.Background"
-                Value="White" />
+                Value="{Binding Foreground, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:DropDownHelper.Background"
                 Value="White" />
         <Setter Property="local:DropDownHelper.BorderBrush"
                 Value="LightGray" />
         <Setter Property="local:DropDownHelper.BorderThickness"
                 Value="1" />
-        <Setter Property="local:MenuHelper.TopLevelDropDownPlacement"
+        <Setter Property="local:DropDownHelper.Placement"
                 Value="BottomRight" />
-        <Setter Property="local:MenuHelper.TopLevelDropDownVerticalOffset"
+        <Setter Property="local:DropDownHelper.VerticalOffset"
                 Value="0" />
+        <Setter Property="local:MenuHelper.TopLevelDropDownPlacement"
+                Value="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
+        <Setter Property="local:MenuHelper.TopLevelDropDownVerticalOffset"
+                Value="{Binding Path=(local:DropDownHelper.VerticalOffset), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
+        <Setter Property="local:MenuHelper.TopLevelDropDownHorizontalOffset"
+                Value="{Binding Path=(local:DropDownHelper.HorizontalOffset), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:MenuHelper.SubmenuDropDownPlacement"
-                Value="RightBottom" />
+                Value="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:MenuHelper.SubmenuDropDownVerticalOffset"
-                Value="0" />
+                Value="{Binding Path=(local:DropDownHelper.VerticalOffset), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
+        <Setter Property="local:MenuHelper.SubmenuDropDownHorizontalOffset"
+                Value="{Binding Path=(local:DropDownHelper.HorizontalOffset), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:DropDownHelper.ShadowColor"
                 Value="#E6E6E6" />
         <Setter Property="local:MenuHelper.TopLevelItemsSeparatorBrush"
@@ -94,10 +98,12 @@
                 Value="1" />
         <Setter Property="BorderThickness"
                 Value="1" />
-        <Setter Property="Background"
-                Value="Transparent" />
         <Setter Property="Padding"
                 Value="0" />
+        <Setter Property="FontFamily"
+                Value="{Binding FontFamily, Source={x:Static local:GlobalSettings.Setting}}" />
+        <Setter Property="FontSize"
+                Value="{Binding FontSize, Source={x:Static local:GlobalSettings.Setting}}" />
         <Setter Property="local:MenuHelper.SubmenuArrowIconTemplate"
                 Value="{StaticResource {ComponentResourceKey ResourceId=SubemnuArrowIconTemplate, TypeInTargetAssembly={x:Type local:MenuHelper}}}" />
         <Setter Property="local:MenuHelper.CheckedIconTemplate"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MessageBoxXStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MessageBoxXStyle.xaml
index c4608a86..3bbe95c9 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MessageBoxXStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/MessageBoxXStyle.xaml
@@ -28,6 +28,10 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.MessageBoxXButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ButtonStyle, TypeInTargetAssembly={x:Type local:MessageBoxX}}}" />
+
     <DataTemplate x:Key="{ComponentResourceKey ResourceId=ContentTemplate, TypeInTargetAssembly={x:Type local:MessageBoxX}}">
         <Grid>
             <Grid.ColumnDefinitions>
@@ -100,4 +104,9 @@
                 Value="NoResize" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.MessageBoxXWindowXStyle}"
+           TargetType="local:WindowX"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=WindowXStyle, TypeInTargetAssembly={x:Type local:MessageBoxX}}}" />
+
+
 </ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/NoticeBoxStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/NoticeBoxStyle.xaml
index f480236b..63a15050 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/NoticeBoxStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/NoticeBoxStyle.xaml
@@ -9,6 +9,14 @@
 
     <Style x:Key="{ComponentResourceKey ResourceId=NoticeBoxItemStyle, TypeInTargetAssembly={x:Type local:NoticeBox}}"
            TargetType="local:NoticeBoxItem">
+        <Setter Property="local:IconHelper.FontFamily"
+                Value="{Binding IconFontFamily, Source={x:Static local:GlobalSettings.Setting}}" />
+        <Setter Property="local:IconHelper.FontSize"
+                Value="{Binding IconFontSize, Source={x:Static local:GlobalSettings.Setting}}" />
+        <Setter Property="FontFamily"
+                Value="{Binding FontFamily, Source={x:Static local:GlobalSettings.Setting}}" />
+        <Setter Property="FontSize"
+                Value="{Binding FontSize, Source={x:Static local:GlobalSettings.Setting}}" />
         <Setter Property="Width"
                 Value="350" />
         <Setter Property="Height"
@@ -21,4 +29,9 @@
                 Value="Stretch" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.NoticeBoxNoticeBoxItemStyle}"
+           TargetType="local:NoticeBoxItem"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=NoticeBoxItemStyle, TypeInTargetAssembly={x:Type local:NoticeBox}}}" />
+
+
 </ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PaginationStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PaginationStyle.xaml
index 330001f8..66532135 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PaginationStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PaginationStyle.xaml
@@ -43,6 +43,10 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.PaginationTurnPageButtonStyle}"
+           TargetType="RepeatButton"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=TurnPageButtonStyle, TypeInTargetAssembly={x:Type local:Pagination}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=PaginationItemStyle, TypeInTargetAssembly={x:Type local:Pagination}}"
            TargetType="local:PaginationItem">
         <Setter Property="Width"
@@ -57,6 +61,10 @@
                 Value="2" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.PaginationPaginationItemStyle}"
+           TargetType="local:PaginationItem"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=PaginationItemStyle, TypeInTargetAssembly={x:Type local:Pagination}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=OmittingTextBlockStyle, TypeInTargetAssembly={x:Type local:Pagination}}"
            TargetType="TextBlock">
         <Setter Property="Margin"
@@ -65,6 +73,10 @@
                 Value="..." />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.PaginationOmittingTextBlockStyle}"
+           TargetType="TextBlock"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=OmittingTextBlockStyle, TypeInTargetAssembly={x:Type local:Pagination}}}" />
+
     <Style TargetType="local:Pagination">
         <Setter Property="TurnPageButtonStyle"
                 Value="{StaticResource {ComponentResourceKey ResourceId=TurnPageButtonStyle, TypeInTargetAssembly={x:Type local:Pagination}}}" />
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PasswordBoxStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PasswordBoxStyle.xaml
index 0ceaf7f9..a520cc84 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PasswordBoxStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PasswordBoxStyle.xaml
@@ -33,6 +33,10 @@
                 Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType=PasswordBox}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.PasswordBoxHelperClearButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ClearButtonStyle, TypeInTargetAssembly={x:Type local:PasswordBoxHelper}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=PlainButtonStyle, TypeInTargetAssembly={x:Type local:PasswordBoxHelper}}"
            TargetType="Button"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.ButtonStyle}}">
@@ -63,6 +67,10 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.PasswordBoxHelperPlainButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=PlainButtonStyle, TypeInTargetAssembly={x:Type local:PasswordBoxHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.PasswordBoxStyle}"
            TargetType="PasswordBox">
         <Setter Property="i:VisualStateHelper.Regist"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PendingBoxStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PendingBoxStyle.xaml
index eb5c9991..423a94ae 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PendingBoxStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PendingBoxStyle.xaml
@@ -38,10 +38,18 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.PendingBoxCancelButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=CancelButtonStyle, TypeInTargetAssembly={x:Type local:PendingBox}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=SpinnerStyle, TypeInTargetAssembly={x:Type local:PendingBox}}"
            TargetType="local:Spinner">
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.PendingBoxSpinnerStyle}"
+           TargetType="local:Spinner"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=SpinnerStyle, TypeInTargetAssembly={x:Type local:PendingBox}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=WindowStyle, TypeInTargetAssembly={x:Type local:PendingBox}}"
            TargetType="Window">
         <Setter Property="MinWidth"
@@ -68,6 +76,10 @@
                 Value="True" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.PendingBoxWindowStyle}"
+           TargetType="Window"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=WindowStyle, TypeInTargetAssembly={x:Type local:PendingBox}}}" />
+
     <DataTemplate x:Key="{ComponentResourceKey ResourceId=ContentTemplate, TypeInTargetAssembly={x:Type local:PendingBox}}">
         <Grid>
             <Grid.RowDefinitions>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/RepeatButtonStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/RepeatButtonStyle.xaml
index a7274a22..d1e34d58 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/RepeatButtonStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/RepeatButtonStyle.xaml
@@ -19,6 +19,10 @@
                 Value="{Binding FontSize, Converter={StaticResource {x:Static rs:ConverterKeys.DoublePlusConverter}}, ConverterParameter=6, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.RepeatButtonHelperPendingSpinnerStyle}"
+           TargetType="local:Spinner"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=PendingSpinnerStyle, TypeInTargetAssembly={x:Type local:RepeatButtonHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.RepeatButtonStyle}"
            TargetType="RepeatButton">
         <Setter Property="i:VisualStateHelper.Regist"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ScrollBarStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ScrollBarStyle.xaml
index a78d3db8..9da5a535 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ScrollBarStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ScrollBarStyle.xaml
@@ -65,7 +65,11 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-    
+
+    <Style x:Key="{x:Static rs:ComponentKeys.ScrollBarHelperScrollButtonStyle}"
+           TargetType="RepeatButton"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ScrollButtonStyle, TypeInTargetAssembly={x:Type local:ScrollBarHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.ScrollBarStyle}"
            TargetType="ScrollBar">   
         <Setter Property="local:ScrollBarHelper.InternalThumbBackground"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/SliderStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/SliderStyle.xaml
index 3edc840d..d1acdcb6 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/SliderStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/SliderStyle.xaml
@@ -27,6 +27,10 @@
                 Value="LightGray" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.SliderHelperThumbStyle}"
+           TargetType="Thumb"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ThumbStyle, TypeInTargetAssembly={x:Type local:SliderHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.SliderStyle}"
            TargetType="Slider">
         <Setter Property="Background"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TabControlStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TabControlStyle.xaml
index 718cbbba..cc21c554 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TabControlStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TabControlStyle.xaml
@@ -33,6 +33,10 @@
                 Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=TabItem}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.TabControlHelperRemoveButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=RemoveButtonStyle, TypeInTargetAssembly={x:Type local:TabControlHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.TabControlStyle}"
            TargetType="TabControl">
         <Setter Property="local:IconHelper.FontFamily"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TextBoxStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TextBoxStyle.xaml
index cc03bd9b..d5090fe9 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TextBoxStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TextBoxStyle.xaml
@@ -33,6 +33,10 @@
                 Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType=TextBox}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.TextBoxHelperClearButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ClearButtonStyle, TypeInTargetAssembly={x:Type local:TextBoxHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.TextBoxStyle}"
            TargetType="TextBox">
         <Setter Property="i:VisualStateHelper.Regist"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ThumbFenceStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ThumbFenceStyle.xaml
index b180dea3..d8b88f99 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ThumbFenceStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ThumbFenceStyle.xaml
@@ -19,6 +19,10 @@
                 Value="40" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ThumbFenceThumbStyle}"
+           TargetType="Thumb"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ThumbStyle, TypeInTargetAssembly={x:Type local:ThumbFence}}}" />
+
     <Style TargetType="local:ThumbFence">
         <Setter Property="Background"
                 Value="#FFFFFF" />
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ToggleButtonStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ToggleButtonStyle.xaml
index 7d108cd0..305be7c7 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ToggleButtonStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/ToggleButtonStyle.xaml
@@ -19,6 +19,10 @@
                 Value="{Binding FontSize, Converter={StaticResource {x:Static rs:ConverterKeys.DoublePlusConverter}}, ConverterParameter=6, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.ToggleButtonHelperPendingSpinnerStyle}"
+           TargetType="Thumb"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=PendingSpinnerStyle, TypeInTargetAssembly={x:Type local:ToggleButtonHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.ToggleButtonStyle}"
            TargetType="ToggleButton">
         <Setter Property="i:VisualStateHelper.Regist"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TreeViewStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TreeViewStyle.xaml
index f26a008e..a7bfa284 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TreeViewStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TreeViewStyle.xaml
@@ -51,6 +51,10 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.TreeViewHelperToggleArrowToggleButtonStyle}"
+           TargetType="ToggleButton"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ToggleArrowToggleButtonStyle, TypeInTargetAssembly={x:Type local:TreeViewHelper}}}" />
+
     <Style x:Key="{x:Static rs:StyleKeys.TreeViewStyle}"
            TargetType="TreeView">
         <Setter Property="local:IconHelper.FontFamily"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/WindowXStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/WindowXStyle.xaml
index 63f21440..c96a9c9c 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/WindowXStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/WindowXStyle.xaml
@@ -10,6 +10,7 @@
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Templates/WindowXTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
+
     <Style x:Key="{ComponentResourceKey ResourceId=ButtonStyle, TypeInTargetAssembly={x:Type local:WindowXModalDialog}}"
            TargetType="Button"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.ButtonStyle}}">
@@ -27,6 +28,10 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+    
+    <Style x:Key="{x:Static rs:ComponentKeys.WindowXModalButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=ButtonStyle, TypeInTargetAssembly={x:Type local:WindowXModalDialog}}}" />
 
     <Style x:Key="{ComponentResourceKey ResourceId=MinimizeButtonStyle, TypeInTargetAssembly={x:Type local:WindowXCaption}}"
            TargetType="Button"
@@ -63,6 +68,10 @@
                 Value="&#xe92a;" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.WindowXCaptionMinimizeButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=MinimizeButtonStyle, TypeInTargetAssembly={x:Type local:WindowXCaption}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=MaximizeButtonStyle, TypeInTargetAssembly={x:Type local:WindowXCaption}}"
            TargetType="Button"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.ButtonStyle}}">
@@ -105,6 +114,10 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.WindowXCaptionMaximizeButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=MaximizeButtonStyle, TypeInTargetAssembly={x:Type local:WindowXCaption}}}" />
+
     <Style x:Key="{ComponentResourceKey ResourceId=CloseButtonStyle, TypeInTargetAssembly={x:Type local:WindowXCaption}}"
            TargetType="Button"
            BasedOn="{StaticResource {x:Static rs:StyleKeys.ButtonStyle}}">
@@ -140,6 +153,10 @@
                 Value="0" />
     </Style>
 
+    <Style x:Key="{x:Static rs:ComponentKeys.WindowXCaptionCloseButtonStyle}"
+           TargetType="Button"
+           BasedOn="{StaticResource {ComponentResourceKey ResourceId=CloseButtonStyle, TypeInTargetAssembly={x:Type local:WindowXCaption}}}" />
+
     <DataTemplate x:Key="{ComponentResourceKey ResourceId=HeaderTemplate, TypeInTargetAssembly={x:Type local:WindowXCaption}}">
         <StackPanel  Orientation="Horizontal"
                      Margin="5,0,0,0"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/TemplateSelectors/IconPresenterContentTemplateSelector.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/TemplateSelectors/IconPresenterContentTemplateSelector.cs
index d5702294..d1db8371 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/TemplateSelectors/IconPresenterContentTemplateSelector.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/TemplateSelectors/IconPresenterContentTemplateSelector.cs
@@ -11,7 +11,7 @@ class IconPresenterContentTemplateSelector : DataTemplateSelector
     {
         private static List<string> _imageFileFormats = new List<string>()
         {
-            ".bmp", ".jpg", ".jpe", ".jpeg", ".gif", ".tif", ".ico"
+            ".bmp", ".jpg", ".jpe", ".png", ".jpeg", ".gif", ".tif", ".ico"
         };
 
         public override DataTemplate SelectTemplate(object item, DependencyObject container)
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ButtonTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ButtonTemplate.xaml
index dab26b98..2c04e349 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ButtonTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ButtonTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ButtonTemplate}"
                      TargetType="Button">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -42,7 +42,7 @@
                                   VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                   HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <Trigger Property="local:ButtonHelper.IsPending"
                      Value="True">
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CalendarXItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CalendarXItemTemplate.xaml
index 72dc6eaf..666006db 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CalendarXItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CalendarXItemTemplate.xaml
@@ -11,14 +11,14 @@
 
     <ControlTemplate  x:Key="{x:Static irs:TemplateKeys.CalendarXItemTemplate}"
                       TargetType="local:CalendarXItem">
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                BorderThickness="{TemplateBinding BorderThickness}"
                                Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                CornerRadius="{TemplateBinding CornerRadius}"
                                >
-                <i:ContentControlX.Effect>
+                <local:ContentControlX.Effect>
                     <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
                         <Binding Path="ShadowColor"
                                  RelativeSource="{RelativeSource TemplatedParent}"
@@ -39,7 +39,7 @@
                                  RelativeSource="{RelativeSource TemplatedParent}"
                                  Mode="OneWay" />
                     </MultiBinding>
-                </i:ContentControlX.Effect>
+                </local:ContentControlX.Effect>
             <Grid>
                 <ContentPresenter x:Name="CpContent"
                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -48,7 +48,7 @@
                                 Visibility="{Binding IsSpecialDay, Converter={StaticResource {x:Static rs:ConverterKeys.FalseToCollapseConverter}}, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                 ContentTemplate="{TemplateBinding HighlightGlyphTemplate}" />
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
          
         <ControlTemplate.Triggers>
             <MultiDataTrigger>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CalendarXTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CalendarXTemplate.xaml
index 6ab7e779..c2403c77 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CalendarXTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CalendarXTemplate.xaml
@@ -11,11 +11,11 @@
 
     <ControlTemplate  x:Key="{x:Static irs:TemplateKeys.CalendarXTemplate}"
                       TargetType="local:CalendarX">
-        <i:ContentControlX Background="{TemplateBinding Background}"
+        <local:ContentControlX Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
                            CornerRadius="{TemplateBinding CornerRadius}">
-            <i:ContentControlX.Effect>
+            <local:ContentControlX.Effect>
                 <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
                     <Binding Path="ShadowColor"
                              RelativeSource="{RelativeSource TemplatedParent}"
@@ -36,7 +36,7 @@
                              RelativeSource="{RelativeSource TemplatedParent}"
                              Mode="OneWay" />
                 </MultiBinding>
-            </i:ContentControlX.Effect>
+            </local:ContentControlX.Effect>
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
@@ -50,7 +50,7 @@
                 </Grid>
             </Grid>
 
-        </i:ContentControlX>
+        </local:ContentControlX>
     </ControlTemplate>
 
 </ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CardTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CardTemplate.xaml
index fc475247..d78f3499 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CardTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CardTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.CardTemplate}"
                      TargetType="local:Card">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -25,7 +25,7 @@
             <ContentPresenter Focusable="False"
                               VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                               HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CheckBoxTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CheckBoxTemplate.xaml
index e072e4eb..3e14a97c 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CheckBoxTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/CheckBoxTemplate.xaml
@@ -19,7 +19,7 @@
                 <ColumnDefinition />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <i:ContentControlX x:Name="CcBox"
+            <local:ContentControlX x:Name="CcBox"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                Height="{Binding Path=(local:CheckBoxHelper.BoxHeight),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                Width="{Binding Path=(local:CheckBoxHelper.BoxWidth),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -66,7 +66,7 @@
                             Width="{Binding Path=(local:CheckBoxHelper.BoxWidth), Converter={StaticResource {x:Static rs:ConverterKeys.DoubleDivideByConverter}}, ConverterParameter=2, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                             Height="{Binding Path=(local:CheckBoxHelper.BoxHeight), Converter={StaticResource {x:Static rs:ConverterKeys.DoubleDivideByConverter}}, ConverterParameter=2, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 </Grid>
-            </i:ContentControlX>
+            </local:ContentControlX>
             <ContentPresenter x:Name="CpContent"
                               Grid.Column="1"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -172,15 +172,26 @@
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding IsChecked, RelativeSource={RelativeSource Self}, Mode=OneWay}"
                                Value="{x:Null}" />
-                    <Condition Binding="{Binding Path=(local:CheckBoxHelper.NullableForeround), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                    <Condition Binding="{Binding Path=(local:CheckBoxHelper.NullableBorderThickness), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="CcBox"
+                        Property="BorderThickness"
+                        Value="{Binding Path=(local:CheckBoxHelper.NullableBorderThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsChecked, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="{x:Null}" />
+                    <Condition Binding="{Binding Path=(local:CheckBoxHelper.NullableForeground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
                                Value="True" />
                 </MultiDataTrigger.Conditions>
                 <Setter TargetName="CpContent"
                         Property="TextElement.Foreground"
-                        Value="{Binding Path=(local:CheckBoxHelper.NullableForeround), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                        Value="{Binding Path=(local:CheckBoxHelper.NullableForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <Setter TargetName="CpContent"
                         Property="TextBlock.Foreground"
-                        Value="{Binding Path=(local:CheckBoxHelper.NullableForeround), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                        Value="{Binding Path=(local:CheckBoxHelper.NullableForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ColorPickerTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ColorPickerTemplate.xaml
index 9c816b73..a9876d4c 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ColorPickerTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ColorPickerTemplate.xaml
@@ -12,7 +12,7 @@
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ColorPickerTemplate}"
                      TargetType="local:ColorPicker">
         <Grid>
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
                                BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
@@ -115,8 +115,8 @@
                                                 TextBlock.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}" />
                     </Grid>
                 </ToggleButton>
-            </i:ContentControlX>
-            <i:CustomPopup x:Name="PART_Popup"
+            </local:ContentControlX>
+            <local:PopupX x:Name="PART_Popup"
                            Focusable="False"
                            AllowsTransparency="True"
                            IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=TwoWay}"
@@ -124,7 +124,7 @@
                            Placement="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
                            PopupAnimation="Fade"
                            StaysOpen="False">
-                <i:CustomPopup.HorizontalOffset>
+                <local:PopupX.HorizontalOffset>
                     <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownHorizontalOffsetConverter}}">
                         <Binding Path="(local:ShadowHelper.BlurRadius)"
                                  RelativeSource="{RelativeSource AncestorType=local:ColorPicker}"
@@ -139,8 +139,8 @@
                                  RelativeSource="{RelativeSource AncestorType=local:ColorPicker}"
                                  Mode="OneWay" />
                     </MultiBinding>
-                </i:CustomPopup.HorizontalOffset>
-                <i:CustomPopup.VerticalOffset>
+                </local:PopupX.HorizontalOffset>
+                <local:PopupX.VerticalOffset>
                     <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownVerticalOffsetConverter}}">
                         <Binding Path="(local:ShadowHelper.BlurRadius)"
                                  RelativeSource="{RelativeSource AncestorType=local:ColorPicker}"
@@ -155,7 +155,7 @@
                                  RelativeSource="{RelativeSource AncestorType=local:ColorPicker}"
                                  Mode="OneWay" />
                     </MultiBinding>
-                </i:CustomPopup.VerticalOffset>
+                </local:PopupX.VerticalOffset>
                 <Grid x:Name="GrdDropDown"
                       Height="{Binding Path=(local:DropDownHelper.Height), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
                       Width="{Binding Path=(local:DropDownHelper.Width), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
@@ -176,12 +176,12 @@
                                      Mode="OneWay" />
                         </MultiBinding>
                     </Grid.Margin>
-                    <i:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                    <local:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                        Background="{Binding Path=(local:DropDownHelper.Background), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
                                        BorderBrush="{Binding Path=(local:DropDownHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=local:ColorPicker},Mode=OneWay}"
                                        BorderThickness="{Binding Path=(local:DropDownHelper.BorderThickness), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
                                        CornerRadius="{Binding Path=(local:DropDownHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}">
-                        <i:ContentControlX.Effect>
+                        <local:ContentControlX.Effect>
                             <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
                                 <Binding Path="(local:DropDownHelper.ShadowColor)"
                                          RelativeSource="{RelativeSource AncestorType=local:ColorPicker}"
@@ -202,14 +202,14 @@
                                          RelativeSource="{RelativeSource AncestorType=local:ColorPicker}"
                                          Mode="OneWay" />
                             </MultiBinding>
-                        </i:ContentControlX.Effect>
+                        </local:ContentControlX.Effect>
                         <local:ColorSelector x:Name="PART_ColorSelector"
                                              Style="{TemplateBinding ColorSelectorStyle}"
                                              ColorChannels="{TemplateBinding ColorChannels}"
                                              Margin="{Binding Path=(local:DropDownHelper.Padding),RelativeSource={RelativeSource AncestorType=local:ColorPicker},Mode=OneWay}" />
-                    </i:ContentControlX>
+                    </local:ContentControlX>
                 </Grid>
-            </i:CustomPopup>
+            </local:PopupX>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger  Property="ClearButtonVisibility"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ComboBoxItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ComboBoxItemTemplate.xaml
index 4ec88502..5c5650ca 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ComboBoxItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ComboBoxItemTemplate.xaml
@@ -16,7 +16,7 @@
                 <RowDefinition />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Grid.Column="1"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -42,7 +42,7 @@
                             Command="{Binding Path=(local:ComboBoxHelper.RemoveCommand), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                             CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 </Grid>
-            </i:ContentControlX>
+            </local:ContentControlX>
             <local:SeparatorX x:Name="SprtSeparator"
                               Grid.Row="1"
                               VerticalAlignment="Center"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ComboBoxTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ComboBoxTemplate.xaml
index 8addeb55..bcbfac85 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ComboBoxTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ComboBoxTemplate.xaml
@@ -12,7 +12,7 @@
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ComboBoxTemplate}"
                      TargetType="ComboBox">
         <Grid>
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
@@ -54,14 +54,16 @@
                                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
                         </Border>
-                        <TextBlock x:Name="TxtWatermark"
-                                   Visibility="{Binding Text, Converter={StaticResource {x:Static rs:ConverterKeys.StringNonnullAndNotEmptyToCollapseConverter}}, RelativeSource={RelativeSource AncestorType=ComboBox},Mode=OneWay}"
-                                   Text="{Binding Path=(local:ComboBoxHelper.Watermark), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
-                                   Foreground="{Binding Path=(local:ComboBoxHelper.WatermarkBrush),RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
-                                   Padding="2,0,0,0"
-                                   Margin="{TemplateBinding Padding}"
-                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        <Border IsHitTestVisible="False"
+                                Focusable="False"
+                                Margin="{TemplateBinding Padding}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                Visibility="{Binding Text, Converter={StaticResource {x:Static rs:ConverterKeys.StringNonnullAndNotEmptyToCollapseConverter}}, RelativeSource={RelativeSource AncestorType=ComboBox},Mode=OneWay}">
+                            <ContentControl Content="{Binding Path=(local:ComboBoxHelper.Watermark), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
+                                            Foreground="{Binding Path=(local:ComboBoxHelper.WatermarkBrush),RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
+                                            Margin="2,0,0,0" />
+                        </Border>
                         <TextBox x:Name="PART_EditableTextBox"
                                  Focusable="True"
                                  Padding="{TemplateBinding Padding}"
@@ -97,8 +99,8 @@
                                                 TextBlock.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}" />
                     </Grid>
                 </ToggleButton>
-            </i:ContentControlX>
-            <i:CustomPopup x:Name="PART_Popup"
+            </local:ContentControlX>
+            <local:PopupX x:Name="PART_Popup"
                            Focusable="False"
                            AllowsTransparency="True"
                            IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=TwoWay}"
@@ -106,7 +108,7 @@
                            Placement="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                            PopupAnimation="Fade"
                            StaysOpen="False">
-                <i:CustomPopup.HorizontalOffset>
+                <local:PopupX.HorizontalOffset>
                     <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownHorizontalOffsetConverter}}">
                         <Binding Path="(local:ShadowHelper.BlurRadius)"
                                  RelativeSource="{RelativeSource AncestorType=ComboBox}"
@@ -121,8 +123,8 @@
                                  RelativeSource="{RelativeSource AncestorType=ComboBox}"
                                  Mode="OneWay" />
                     </MultiBinding>
-                </i:CustomPopup.HorizontalOffset>
-                <i:CustomPopup.VerticalOffset>
+                </local:PopupX.HorizontalOffset>
+                <local:PopupX.VerticalOffset>
                     <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownVerticalOffsetConverter}}">
                         <Binding Path="(local:ShadowHelper.BlurRadius)"
                                  RelativeSource="{RelativeSource AncestorType=ComboBox}"
@@ -137,7 +139,7 @@
                                  RelativeSource="{RelativeSource AncestorType=ComboBox}"
                                  Mode="OneWay" />
                     </MultiBinding>
-                </i:CustomPopup.VerticalOffset>
+                </local:PopupX.VerticalOffset>
                 <Grid x:Name="GrdDropDown"
                       Height="{Binding Path=(local:DropDownHelper.Height), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                       Width="{Binding Path=(local:DropDownHelper.Width), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
@@ -158,12 +160,12 @@
                                      Mode="OneWay" />
                         </MultiBinding>
                     </Grid.Margin>
-                    <i:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                    <local:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                        Background="{Binding Path=(local:DropDownHelper.Background), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                        BorderBrush="{Binding Path=(local:DropDownHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=ComboBox},Mode=OneWay}"
                                        BorderThickness="{Binding Path=(local:DropDownHelper.BorderThickness), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                        CornerRadius="{Binding Path=(local:DropDownHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}">
-                        <i:ContentControlX.Effect>
+                        <local:ContentControlX.Effect>
                             <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
                                 <Binding Path="(local:DropDownHelper.ShadowColor)"
                                          RelativeSource="{RelativeSource AncestorType=ComboBox}"
@@ -184,7 +186,7 @@
                                          RelativeSource="{RelativeSource AncestorType=ComboBox}"
                                          Mode="OneWay" />
                             </MultiBinding>
-                        </i:ContentControlX.Effect>
+                        </local:ContentControlX.Effect>
                         <ScrollViewer Margin="{Binding Path=(local:DropDownHelper.Padding),RelativeSource={RelativeSource AncestorType=ComboBox},Mode=OneWay}">
                             <Grid>
                                 <Grid.RowDefinitions>
@@ -199,9 +201,9 @@
                                                 KeyboardNavigation.DirectionalNavigation="Contained" />
                             </Grid>
                         </ScrollViewer>
-                    </i:ContentControlX>
+                    </local:ContentControlX>
                 </Grid>
-            </i:CustomPopup>
+            </local:PopupX>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger  Property="local:ComboBoxHelper.ClearButtonVisibility"
@@ -275,7 +277,7 @@
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ComboBoxWithFixedSearchBoxTemplate}"
                      TargetType="ComboBox">
         <Grid>
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
@@ -314,10 +316,9 @@
                                         ContentStringFormat="{TemplateBinding ItemStringFormat}"
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                        <TextBlock x:Name="TxtWatermark"
-                                   Visibility="{Binding Text, Converter={StaticResource {x:Static rs:ConverterKeys.StringNonnullAndNotEmptyToCollapseConverter}}, RelativeSource={RelativeSource AncestorType=ComboBox},Mode=OneWay}"
+                        <ContentControl Visibility="{Binding Text, Converter={StaticResource {x:Static rs:ConverterKeys.StringNonnullAndNotEmptyToCollapseConverter}}, RelativeSource={RelativeSource AncestorType=ComboBox},Mode=OneWay}"
                                    Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
-                                   Text="{Binding Path=(local:ComboBoxHelper.Watermark), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
+                                   Content="{Binding Path=(local:ComboBoxHelper.Watermark), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                    Padding="2,0,0,0"
                                    Margin="{TemplateBinding Padding}"
                                    Opacity="0.6"
@@ -357,8 +358,8 @@
                                                 TextBlock.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}" />
                     </Grid>
                 </ToggleButton>
-            </i:ContentControlX>
-            <i:CustomPopup x:Name="PART_Popup"
+            </local:ContentControlX>
+            <local:PopupX x:Name="PART_Popup"
                            Focusable="False"
                            AllowsTransparency="True"
                            IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=TwoWay}"
@@ -366,7 +367,7 @@
                            Placement="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                            PopupAnimation="Fade"
                            StaysOpen="False">
-                <i:CustomPopup.HorizontalOffset>
+                <local:PopupX.HorizontalOffset>
                     <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownHorizontalOffsetConverter}}">
                         <Binding Path="(local:ShadowHelper.BlurRadius)"
                                  RelativeSource="{RelativeSource AncestorType=ComboBox}"
@@ -381,8 +382,8 @@
                                  RelativeSource="{RelativeSource AncestorType=ComboBox}"
                                  Mode="OneWay" />
                     </MultiBinding>
-                </i:CustomPopup.HorizontalOffset>
-                <i:CustomPopup.VerticalOffset>
+                </local:PopupX.HorizontalOffset>
+                <local:PopupX.VerticalOffset>
                     <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownVerticalOffsetConverter}}">
                         <Binding Path="(local:ShadowHelper.BlurRadius)"
                                  RelativeSource="{RelativeSource AncestorType=ComboBox}"
@@ -397,7 +398,7 @@
                                  RelativeSource="{RelativeSource AncestorType=ComboBox}"
                                  Mode="OneWay" />
                     </MultiBinding>
-                </i:CustomPopup.VerticalOffset>
+                </local:PopupX.VerticalOffset>
                 <Grid x:Name="GrdDropDown"
                       Height="{Binding Path=(local:DropDownHelper.Height), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                       Width="{Binding Path=(local:DropDownHelper.Width), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
@@ -418,12 +419,12 @@
                                      Mode="OneWay" />
                         </MultiBinding>
                     </Grid.Margin>
-                    <i:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                    <local:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                        Background="{Binding Path=(local:DropDownHelper.Background), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                        BorderBrush="{Binding Path=(local:DropDownHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=ComboBox},Mode=OneWay}"
                                        BorderThickness="{Binding Path=(local:DropDownHelper.BorderThickness), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                        CornerRadius="{Binding Path=(local:DropDownHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}">
-                        <i:ContentControlX.Effect>
+                        <local:ContentControlX.Effect>
                             <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
                                 <Binding Path="(local:DropDownHelper.ShadowColor)"
                                          RelativeSource="{RelativeSource AncestorType=ComboBox}"
@@ -444,7 +445,7 @@
                                          RelativeSource="{RelativeSource AncestorType=ComboBox}"
                                          Mode="OneWay" />
                             </MultiBinding>
-                        </i:ContentControlX.Effect>
+                        </local:ContentControlX.Effect>
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
@@ -459,9 +460,9 @@
                                 <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" />
                             </ScrollViewer>
                         </Grid>
-                    </i:ContentControlX>
+                    </local:ContentControlX>
                 </Grid>
-            </i:CustomPopup>
+            </local:PopupX>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger  Property="local:ComboBoxHelper.ClearButtonVisibility"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContentControlXTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContentControlXTemplate.xaml
index 9f6d3fa2..dab705c0 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContentControlXTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContentControlXTemplate.xaml
@@ -10,7 +10,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ContentControlXTemplate}"
-                     TargetType="i:ContentControlX">
+                     TargetType="local:ContentControlX">
         <Grid>
             <Border SnapsToDevicePixels="True"
                     Background="{TemplateBinding Background}"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContextMenuItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContextMenuItemTemplate.xaml
index 0466bcbf..ffbef5e5 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContextMenuItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContextMenuItemTemplate.xaml
@@ -17,7 +17,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid>
-                <i:ContentControlX x:Name="CcMain"
+                <local:ContentControlX x:Name="CcMain"
                                    Grid.Column="1"
                                    Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                    Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -54,8 +54,8 @@
                                         Foreground="{Binding Path=(i:VisualStateHelper.Foreground) ,RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
                                         ContentTemplate="{Binding Path=(local:ContextMenuHelper.ArrowIconTemplate), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}" />
                     </Grid>
-                </i:ContentControlX>
-                <i:CustomPopup x:Name="popDropDown"
+                </local:ContentControlX>
+                <local:PopupX x:Name="popDropDown"
                                Placement="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}"
                                IsOpen="{Binding IsSubmenuOpen,  RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
                                PlacementTarget="{Binding RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
@@ -68,7 +68,7 @@
                                AllowsTransparency="True"
                                Focusable="False"
                                PopupAnimation="Fade">
-                    <i:CustomPopup.HorizontalOffset>
+                    <local:PopupX.HorizontalOffset>
                         <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownHorizontalOffsetConverter}}">
                             <Binding Path="(local:ShadowHelper.BlurRadius)"
                                      RelativeSource="{RelativeSource AncestorType=ContextMenu}"
@@ -83,8 +83,8 @@
                                      RelativeSource="{RelativeSource AncestorType=ContextMenu}"
                                      Mode="OneWay" />
                         </MultiBinding>
-                    </i:CustomPopup.HorizontalOffset>
-                    <i:CustomPopup.VerticalOffset>
+                    </local:PopupX.HorizontalOffset>
+                    <local:PopupX.VerticalOffset>
                         <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownVerticalOffsetConverter}}">
                             <Binding Path="(local:ShadowHelper.BlurRadius)"
                                      RelativeSource="{RelativeSource AncestorType=ContextMenu}"
@@ -99,12 +99,12 @@
                                      RelativeSource="{RelativeSource AncestorType=ContextMenu}"
                                      Mode="OneWay" />
                         </MultiBinding>
-                    </i:CustomPopup.VerticalOffset>
-                    <i:ContentControlX Background="{Binding Path=(local:DropDownHelper.Background), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}"
+                    </local:PopupX.VerticalOffset>
+                    <local:ContentControlX Background="{Binding Path=(local:DropDownHelper.Background), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}"
                                        BorderBrush="{TemplateBinding BorderBrush}"
                                        BorderThickness="{TemplateBinding BorderThickness}"
                                        CornerRadius="{Binding Path=(local:DropDownHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=ContextMenu},Mode=OneWay}">
-                        <i:ContentControlX.Margin>
+                        <local:ContentControlX.Margin>
                             <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ContextMenuDropDownMarginConverter}}">
                                 <Binding Path="(local:ShadowHelper.BlurRadius)"
                                          RelativeSource="{RelativeSource AncestorType=ContextMenu}"
@@ -116,8 +116,8 @@
                                          RelativeSource="{RelativeSource AncestorType=ContextMenu}"
                                          Mode="OneWay" />
                             </MultiBinding>
-                        </i:ContentControlX.Margin>
-                        <i:ContentControlX.Effect>
+                        </local:ContentControlX.Margin>
+                        <local:ContentControlX.Effect>
                             <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
                                 <Binding Path="(local:DropDownHelper.ShadowColor)"
                                          RelativeSource="{RelativeSource AncestorType=ContextMenu}"
@@ -138,15 +138,15 @@
                                          RelativeSource="{RelativeSource AncestorType=ContextMenu}"
                                          Mode="OneWay" />
                             </MultiBinding>
-                        </i:ContentControlX.Effect>
+                        </local:ContentControlX.Effect>
                         <ScrollViewer VerticalScrollBarVisibility="{Binding Path=(ScrollViewer.VerticalScrollBarVisibility), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}"
                                       HorizontalScrollBarVisibility="{Binding Path=(ScrollViewer.HorizontalScrollBarVisibility), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}"
                                       Padding="{Binding Path=(local:DropDownHelper.Padding), RelativeSource={RelativeSource AncestorType=ContextMenu}, Mode=OneWay}">
                             <StackPanel IsItemsHost="True"
                                         KeyboardNavigation.DirectionalNavigation="Cycle" />
                         </ScrollViewer>
-                    </i:ContentControlX>
-                </i:CustomPopup>
+                    </local:ContentControlX>
+                </local:PopupX>
             </Grid>
             <local:SeparatorX x:Name="SprtSeparator"
                               Grid.Row="1"
@@ -286,6 +286,51 @@
                         Property="BorderBrush"
                         Value="{Binding Path=(local:MenuItemHelper.ClickBorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedForeground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="cpHeader"
+                        Property="TextBlock.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="cpHeader"
+                        Property="TextElement.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="ccChecked"
+                        Property="TextBlock.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="ccChecked"
+                        Property="TextElement.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="IpIcon"
+                        Property="Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedBackground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="CcMain"
+                        Property="Background"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedBorderBrush), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="CcMain"
+                        Property="BorderBrush"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedBorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContextMenuTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContextMenuTemplate.xaml
index 51050644..79ef7649 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContextMenuTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ContextMenuTemplate.xaml
@@ -11,17 +11,17 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ContextMenuTemplate}"
                      TargetType="ContextMenu">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                            Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
                            Padding="{TemplateBinding Padding}"
-                           CornerRadius="{Binding Path=(local:DropDownHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                           CornerRadius="{Binding Path=(local:ContextMenuHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            Margin="{Binding Path=(local:ShadowHelper.BlurRadius), Converter={StaticResource {x:Static irs:ConverterKeys.DropDownMarginConverter}}, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
-            <i:ContentControlX.Effect>
+            <local:ContentControlX.Effect>
                 <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
-                    <Binding Path="(local:DropDownHelper.ShadowColor)"
+                    <Binding Path="(local:ContextMenuHelper.ShadowColor)"
                              RelativeSource="{RelativeSource TemplatedParent}"
                              Mode="OneWay" />
                     <Binding Path="(local:ShadowHelper.BlurRadius)"
@@ -40,11 +40,11 @@
                              RelativeSource="{RelativeSource TemplatedParent}"
                              Mode="OneWay" />
                 </MultiBinding>
-            </i:ContentControlX.Effect>
+            </local:ContentControlX.Effect>
             <ScrollViewer>
                 <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle" />
             </ScrollViewer>
-        </i:ContentControlX>
+        </local:ContentControlX>
     </ControlTemplate>
 
 
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/DrawerTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/DrawerTemplate.xaml
index e673ff18..1c1c4352 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/DrawerTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/DrawerTemplate.xaml
@@ -12,7 +12,7 @@
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.DrawerTemplate}"
                      TargetType="local:Drawer">
         <Border ClipToBounds="True">
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Background="{TemplateBinding Background}"
                                BorderBrush="{TemplateBinding BorderBrush}"
                                BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/DropDownTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/DropDownTemplate.xaml
index 44c52288..06fee2a3 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/DropDownTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/DropDownTemplate.xaml
@@ -14,20 +14,20 @@
         <Border BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
                 Background="{TemplateBinding Background}">
-            <Grid >
+            <Grid>
                 <ContentPresenter x:Name="CpContent"
-                              Margin="{TemplateBinding Padding}"
+                                  Margin="{TemplateBinding Padding}"
                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                <i:CustomPopup x:Name="PART_Popup"
-                               PlacementTarget="{Binding ElementName=CpContent, Mode=OneWay}"
-                               Placement="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource AncestorType=local:DropDown}, Mode=OneWay}"
-                               IsOpen="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                               AllowsTransparency="True"
-                               StaysOpen="{TemplateBinding StaysOpen}"
-                               Focusable="False"
-                               PopupAnimation="Fade">
-                    <i:CustomPopup.HorizontalOffset>
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                <local:PopupX x:Name="PART_Popup"
+                              PlacementTarget="{Binding ElementName=CpContent, Mode=OneWay}"
+                              Placement="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource AncestorType=local:DropDown}, Mode=OneWay}"
+                              IsOpen="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                              AllowsTransparency="True"
+                              StaysOpen="{TemplateBinding StaysOpen}"
+                              Focusable="False"
+                              PopupAnimation="Fade">
+                    <local:PopupX.HorizontalOffset>
                         <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownHorizontalOffsetConverter}}">
                             <Binding Path="(local:ShadowHelper.BlurRadius)"
                                      RelativeSource="{RelativeSource AncestorType=local:DropDown}"
@@ -42,8 +42,8 @@
                                      RelativeSource="{RelativeSource AncestorType=local:DropDown}"
                                      Mode="OneWay" />
                         </MultiBinding>
-                    </i:CustomPopup.HorizontalOffset>
-                    <i:CustomPopup.VerticalOffset>
+                    </local:PopupX.HorizontalOffset>
+                    <local:PopupX.VerticalOffset>
                         <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownVerticalOffsetConverter}}">
                             <Binding Path="(local:ShadowHelper.BlurRadius)"
                                      RelativeSource="{RelativeSource AncestorType=local:DropDown}"
@@ -58,7 +58,7 @@
                                      RelativeSource="{RelativeSource AncestorType=local:DropDown}"
                                      Mode="OneWay" />
                         </MultiBinding>
-                    </i:CustomPopup.VerticalOffset>
+                    </local:PopupX.VerticalOffset>
                     <Grid x:Name="GrdDropDown"
                           Height="{Binding Path=(local:DropDownHelper.Height), RelativeSource={RelativeSource AncestorType=local:DropDown}, Mode=OneWay}"
                           Width="{Binding Path=(local:DropDownHelper.Width), RelativeSource={RelativeSource AncestorType=local:DropDown}, Mode=OneWay}"
@@ -79,12 +79,12 @@
                                          Mode="OneWay" />
                             </MultiBinding>
                         </Grid.Margin>
-                        <i:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                        <local:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                            Background="{Binding Path=(local:DropDownHelper.Background), RelativeSource={RelativeSource AncestorType=local:DropDown}, Mode=OneWay}"
                                            BorderBrush="{Binding Path=(local:DropDownHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=local:DropDown},Mode=OneWay}"
                                            BorderThickness="{Binding Path=(local:DropDownHelper.BorderThickness), RelativeSource={RelativeSource AncestorType=local:DropDown}, Mode=OneWay}"
                                            CornerRadius="{Binding Path=(local:DropDownHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=local:DropDown}, Mode=OneWay}">
-                            <i:ContentControlX.Effect>
+                            <local:ContentControlX.Effect>
                                 <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
                                     <Binding Path="(local:DropDownHelper.ShadowColor)"
                                              RelativeSource="{RelativeSource AncestorType=local:DropDown}"
@@ -105,12 +105,12 @@
                                              RelativeSource="{RelativeSource AncestorType=local:DropDown}"
                                              Mode="OneWay" />
                                 </MultiBinding>
-                            </i:ContentControlX.Effect>
+                            </local:ContentControlX.Effect>
                             <ContentControl Content="{TemplateBinding Child}"
                                             Margin="{Binding Path=(local:DropDownHelper.Padding), RelativeSource={RelativeSource AncestorType=local:DropDown}, Mode=OneWay}" />
-                        </i:ContentControlX>
+                        </local:ContentControlX>
                     </Grid>
-                </i:CustomPopup>
+                </local:PopupX>
             </Grid>
 
         </Border>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ExpanderTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ExpanderTemplate.xaml
index f0b22f93..9032fa35 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ExpanderTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ExpanderTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ExpanderUpDownTemplate}"
                      TargetType="Expander">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -90,7 +90,7 @@
                     <ContentPresenter Margin="{TemplateBinding Padding}" />
                 </Border>
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <Trigger Property="ExpandDirection"
                      Value="Down">
@@ -202,7 +202,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ExpanderLeftRightTemplate}"
                      TargetType="Expander">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -278,7 +278,7 @@
                     <ContentPresenter Margin="{TemplateBinding Padding}" />
                 </Border>
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <Trigger Property="ExpandDirection"
                      Value="Right">
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/GroupBoxTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/GroupBoxTemplate.xaml
index 3a0e4471..a89641f2 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/GroupBoxTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/GroupBoxTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.GroupBoxTemplate}"
                      TargetType="GroupBox">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -29,29 +29,34 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid x:Name="GrdHeader"
-                      Height="{Binding Path=(local:GroupBoxHelper.HeaderHeight), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                      Background="{Binding Path=(local:GroupBoxHelper.HeaderBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <i:IconPresenter x:Name="IcIcon"
-                                     Content="{Binding Path=(local:GroupBoxHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                     Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-                    <ContentPresenter Grid.Column="1"
-                                      ContentSource="Header"
-                                      TextBlock.FontSize="{Binding Path=(local:GroupBoxHelper.HeaderFontSize), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      TextElement.FontSize="{Binding Path=(local:GroupBoxHelper.HeaderFontSize), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      Margin="{Binding Path=(local:GroupBoxHelper.HeaderPadding), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      VerticalAlignment="{Binding Path=(local:GroupBoxHelper.HeaderVerticalContentAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      HorizontalAlignment="{Binding Path=(local:GroupBoxHelper.HeaderHorizontalContentAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      TextBlock.Foreground="{Binding Path=(local:GroupBoxHelper.HeaderForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      TextElement.Foreground="{Binding Path=(local:GroupBoxHelper.HeaderForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-                    <ContentControl Grid.Column="2"
-                                    Content="{Binding Path=(local:GroupBoxHelper.ExtendControl), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"/>
-                </Grid>
+                <Border x:Name="BdrHeader"
+                        Height="{Binding Path=(local:GroupBoxHelper.HeaderHeight), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                        Background="{Binding Path=(local:GroupBoxHelper.HeaderBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                    <Grid Margin="{Binding Path=(local:GroupBoxHelper.HeaderPadding), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                          VerticalAlignment="{Binding Path=(local:GroupBoxHelper.HeaderVerticalContentAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                          HorizontalAlignment="{Binding Path=(local:GroupBoxHelper.HeaderHorizontalContentAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <i:IconPresenter x:Name="IcIcon"
+                                         VerticalAlignment="{Binding Path=(local:GroupBoxHelper.HeaderVerticalContentAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                         HorizontalAlignment="{Binding Path=(local:GroupBoxHelper.HeaderHorizontalContentAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                         Content="{Binding Path=(local:GroupBoxHelper.Icon), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                         Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                        <ContentPresenter Grid.Column="1"
+                                          ContentSource="Header"
+                                          TextBlock.FontSize="{Binding Path=(local:GroupBoxHelper.HeaderFontSize), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                          TextElement.FontSize="{Binding Path=(local:GroupBoxHelper.HeaderFontSize), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                          VerticalAlignment="{Binding Path=(local:GroupBoxHelper.HeaderVerticalContentAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                          HorizontalAlignment="{Binding Path=(local:GroupBoxHelper.HeaderHorizontalContentAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                          TextBlock.Foreground="{Binding Path=(local:GroupBoxHelper.HeaderForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                          TextElement.Foreground="{Binding Path=(local:GroupBoxHelper.HeaderForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                        <ContentControl Grid.Column="2"
+                                        Content="{Binding Path=(local:GroupBoxHelper.ExtendControl), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                    </Grid>
+                </Border>
                 <local:SeparatorX x:Name="SprtSeparator"
                                   Grid.Row="1"
                                   VerticalAlignment="Center"
@@ -64,11 +69,11 @@
                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <Trigger Property="local:GroupBoxHelper.HeaderVerticalAlignment"
                      Value="Bottom">
-                <Setter TargetName="GrdHeader"
+                <Setter TargetName="BdrHeader"
                         Property="Grid.Row"
                         Value="4" />
                 <Setter TargetName="SprtSeparator"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/LabelTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/LabelTemplate.xaml
index 57b790ff..ab8bcbcc 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/LabelTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/LabelTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.LabelTemplate}"
                      TargetType="Label">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListBoxItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListBoxItemTemplate.xaml
index 3cf61b9a..29e59d59 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListBoxItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListBoxItemTemplate.xaml
@@ -16,7 +16,7 @@
                 <RowDefinition />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Grid.Column="1"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -45,7 +45,7 @@
                             Command="{Binding Path=(local:ListBoxHelper.RemoveCommand), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                             CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 </Grid>
-            </i:ContentControlX>
+            </local:ContentControlX>
             <local:SeparatorX x:Name="SprtSeparator"
                               Grid.Row="1"
                               VerticalAlignment="Center"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListBoxTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListBoxTemplate.xaml
index b716921b..8d280b9d 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListBoxTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListBoxTemplate.xaml
@@ -11,23 +11,37 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ListBoxTemplate}"
                      TargetType="ListBox">
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+        <local:ContentControlX x:Name="CcMain"
+                           Background="{TemplateBinding Background}"
+                           BorderBrush="{TemplateBinding BorderBrush}"
+                           BorderThickness="{TemplateBinding BorderThickness}"
+                           Foreground="{TemplateBinding Foreground}"
+                           Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                           CornerRadius="{Binding Path=(local:ListBoxHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                           Effect="{Binding Path=(i:VisualStateHelper.Effect), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                           VerticalContentAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
             <ScrollViewer Margin="{TemplateBinding Padding}"
                           Focusable="False">
                 <ItemsPresenter />
             </ScrollViewer>
-        </Border>
+        </local:ContentControlX>
     </ControlTemplate>
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ListBoxNonScrollableTemplate}"
                      TargetType="ListBox">
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
+        <local:ContentControlX x:Name="CcMain"
+                           Background="{TemplateBinding Background}"
+                           BorderBrush="{TemplateBinding BorderBrush}"
+                           BorderThickness="{TemplateBinding BorderThickness}"
+                           Foreground="{TemplateBinding Foreground}"
+                           Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                           CornerRadius="{Binding Path=(local:ListBoxHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                           Effect="{Binding Path=(i:VisualStateHelper.Effect), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                           VerticalContentAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
             <ItemsPresenter />
-        </Border>
+        </local:ContentControlX>
     </ControlTemplate>
 
 </ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListViewItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListViewItemTemplate.xaml
index a6e56eae..f37d6383 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListViewItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ListViewItemTemplate.xaml
@@ -16,7 +16,7 @@
                 <RowDefinition />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Grid.Column="1"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -29,7 +29,7 @@
                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                Padding="{TemplateBinding Padding}">
                 <GridViewRowPresenter />
-            </i:ContentControlX>
+            </local:ContentControlX>
             <local:SeparatorX x:Name="SprtSeparator"
                               Grid.Row="1"
                               VerticalAlignment="Center"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/MenuItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/MenuItemTemplate.xaml
index d05a4dc0..a2dc137e 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/MenuItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/MenuItemTemplate.xaml
@@ -17,7 +17,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid>
-                <i:ContentControlX x:Name="CcMain"
+                <local:ContentControlX x:Name="CcMain"
                                    Grid.Column="1"
                                    Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                    Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -54,8 +54,8 @@
                                         Foreground="{Binding Path=(i:VisualStateHelper.Foreground) ,RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
                                         ContentTemplate="{Binding Path=(local:MenuHelper.TopLevelArrowIconTemplate), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                     </Grid>
-                </i:ContentControlX>
-                <i:CustomPopup x:Name="popDropDown"
+                </local:ContentControlX>
+                <local:PopupX x:Name="popDropDown"
                                Placement="{Binding Path=(local:MenuHelper.TopLevelDropDownPlacement), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}"
                                IsOpen="{Binding IsSubmenuOpen,  RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
                                PlacementTarget="{Binding RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
@@ -68,7 +68,7 @@
                                AllowsTransparency="True"
                                Focusable="False"
                                PopupAnimation="Fade">
-                    <i:CustomPopup.HorizontalOffset>
+                    <local:PopupX.HorizontalOffset>
                         <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownHorizontalOffsetConverter}}">
                             <Binding Path="(local:ShadowHelper.BlurRadius)"
                                      RelativeSource="{RelativeSource AncestorType=Menu}"
@@ -83,8 +83,8 @@
                                      RelativeSource="{RelativeSource AncestorType=Menu}"
                                      Mode="OneWay" />
                         </MultiBinding>
-                    </i:CustomPopup.HorizontalOffset>
-                    <i:CustomPopup.VerticalOffset>
+                    </local:PopupX.HorizontalOffset>
+                    <local:PopupX.VerticalOffset>
                         <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownVerticalOffsetConverter}}">
                             <Binding Path="(local:ShadowHelper.BlurRadius)"
                                      RelativeSource="{RelativeSource AncestorType=Menu}"
@@ -99,7 +99,7 @@
                                      RelativeSource="{RelativeSource AncestorType=Menu}"
                                      Mode="OneWay" />
                         </MultiBinding>
-                    </i:CustomPopup.VerticalOffset>
+                    </local:PopupX.VerticalOffset>
                     <Grid x:Name="GrdSubmenu">
                         <Grid.Margin>
                             <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ContextMenuDropDownMarginConverter}}">
@@ -151,12 +151,12 @@
                             </ScrollViewer>
                         </i:ClippingBorder>
                         <Border SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{Binding Path=(local:DropDownHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}"
+                                BorderThickness="{Binding Path=(local:DropDownHelper.BorderThickness), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}"
                                 CornerRadius="{Binding Path=(local:DropDownHelper.CornerRadius),RelativeSource={RelativeSource AncestorType=Menu},Mode=OneWay}"
                                 IsHitTestVisible="False" />
                     </Grid>
-                </i:CustomPopup>
+                </local:PopupX>
             </Grid>
             <local:SeparatorX x:Name="SprtSeparator"
                               Grid.Row="1"
@@ -296,6 +296,51 @@
                         Property="BorderBrush"
                         Value="{Binding Path=(local:MenuItemHelper.ClickBorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedForeground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="cpHeader"
+                        Property="TextBlock.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="cpHeader"
+                        Property="TextElement.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="ccChecked"
+                        Property="TextBlock.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="ccChecked"
+                        Property="TextElement.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="icIcon"
+                        Property="Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedBackground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="CcMain"
+                        Property="Background"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedBorderBrush), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="CcMain"
+                        Property="BorderBrush"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedBorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -307,7 +352,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid>
-                <i:ContentControlX x:Name="CcMain"
+                <local:ContentControlX x:Name="CcMain"
                                    Grid.Column="1"
                                    Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                    BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -343,8 +388,8 @@
                                         Foreground="{Binding Path=(i:VisualStateHelper.Foreground) ,RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
                                         ContentTemplate="{Binding Path=(local:MenuHelper.SubmenuArrowIconTemplate), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}" />
                     </Grid>
-                </i:ContentControlX>
-                <i:CustomPopup x:Name="popDropDown"
+                </local:ContentControlX>
+                <local:PopupX x:Name="popDropDown"
                                Placement="{Binding Path=(local:MenuHelper.SubmenuDropDownPlacement), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}"
                                IsOpen="{Binding IsSubmenuOpen,  RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
                                PlacementTarget="{Binding RelativeSource={RelativeSource AncestorType=MenuItem}, Mode=OneWay}"
@@ -357,7 +402,7 @@
                                AllowsTransparency="True"
                                Focusable="False"
                                PopupAnimation="Fade">
-                    <i:CustomPopup.HorizontalOffset>
+                    <local:PopupX.HorizontalOffset>
                         <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownHorizontalOffsetConverter}}">
                             <Binding Path="(local:ShadowHelper.BlurRadius)"
                                      RelativeSource="{RelativeSource AncestorType=Menu}"
@@ -372,8 +417,8 @@
                                      RelativeSource="{RelativeSource AncestorType=Menu}"
                                      Mode="OneWay" />
                         </MultiBinding>
-                    </i:CustomPopup.HorizontalOffset>
-                    <i:CustomPopup.VerticalOffset>
+                    </local:PopupX.HorizontalOffset>
+                    <local:PopupX.VerticalOffset>
                         <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ComboBoxDropDownVerticalOffsetConverter}}">
                             <Binding Path="(local:ShadowHelper.BlurRadius)"
                                      RelativeSource="{RelativeSource AncestorType=Menu}"
@@ -388,7 +433,7 @@
                                      RelativeSource="{RelativeSource AncestorType=Menu}"
                                      Mode="OneWay" />
                         </MultiBinding>
-                    </i:CustomPopup.VerticalOffset>
+                    </local:PopupX.VerticalOffset>
                     <Grid x:Name="GrdSubmenu">
                         <Grid.Margin>
                             <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.ContextMenuDropDownMarginConverter}}">
@@ -440,12 +485,12 @@
                             </ScrollViewer>
                         </i:ClippingBorder>
                         <Border SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{Binding Path=(local:DropDownHelper.BorderBrush), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}"
+                                BorderThickness="{Binding Path=(local:DropDownHelper.BorderThickness), RelativeSource={RelativeSource AncestorType=Menu}, Mode=OneWay}"
                                 CornerRadius="{Binding Path=(local:DropDownHelper.CornerRadius),RelativeSource={RelativeSource AncestorType=Menu},Mode=OneWay}"
                                 IsHitTestVisible="False" />
                     </Grid>
-                </i:CustomPopup>
+                </local:PopupX>
             </Grid>
             <local:SeparatorX x:Name="SprtSeparator"
                               Grid.Row="1"
@@ -585,6 +630,51 @@
                         Property="BorderBrush"
                         Value="{Binding Path=(local:MenuItemHelper.ClickBorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedForeground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="cpHeader"
+                        Property="TextBlock.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="cpHeader"
+                        Property="TextElement.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="ccChecked"
+                        Property="TextBlock.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="ccChecked"
+                        Property="TextElement.Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                <Setter TargetName="icIcon"
+                        Property="Foreground"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedBackground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="CcMain"
+                        Property="Background"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSubmenuOpen, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(local:MenuItemHelper.OpenedBorderBrush), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="CcMain"
+                        Property="BorderBrush"
+                        Value="{Binding Path=(local:MenuItemHelper.OpenedBorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/MenuTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/MenuTemplate.xaml
index 95fa77a7..94fd69a3 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/MenuTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/MenuTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.MenuTemplate}"
                      TargetType="Menu">
-        <i:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+        <local:ContentControlX Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                            Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -19,7 +19,7 @@
             <ScrollViewer Padding="{TemplateBinding Padding}">
                 <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle" />
             </ScrollViewer>
-        </i:ContentControlX>
+        </local:ContentControlX>
     </ControlTemplate>
 
 </ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/NoticeBoxItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/NoticeBoxItemTemplate.xaml
index 1275d0fd..856be304 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/NoticeBoxItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/NoticeBoxItemTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.NoticeBoxItemTemplate}"
                      TargetType="local:NoticeBoxItem">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -111,7 +111,7 @@
                                TextTrimming="CharacterEllipsis" />
                 </Grid>
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/PaginationItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/PaginationItemTemplate.xaml
index 6df8b62f..6d86620e 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/PaginationItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/PaginationItemTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.PaginationItemTemplate}"
                      TargetType="local:PaginationItem">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -26,7 +26,7 @@
                               RecognizesAccessKey="True"
                               VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                               HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/PasswordBoxTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/PasswordBoxTemplate.xaml
index 2ceec11f..35282809 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/PasswordBoxTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/PasswordBoxTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.PasswordBoxTemplate}"
                      TargetType="PasswordBox">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -26,15 +26,23 @@
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <TextBlock IsHitTestVisible="False"
-                           Focusable="False"
-                           Margin="{TemplateBinding Padding}"
-                           Padding="2,0,0,0"
-                           Visibility="{Binding Path=(local:PasswordBoxHelper.Password), Converter={StaticResource {x:Static rs:ConverterKeys.StringNonnullAndNotEmptyToCollapseConverter}},RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}"
-                           Text="{Binding Path=(local:PasswordBoxHelper.Watermark),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                           Foreground="{Binding Path=(local:PasswordBoxHelper.WatermarkBrush),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+                <Border IsHitTestVisible="False"
+                        Focusable="False"
+                        Margin="{TemplateBinding Padding}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        Visibility="{Binding Path=(local:PasswordBoxHelper.Password), Converter={StaticResource {x:Static rs:ConverterKeys.StringNonnullAndNotEmptyToCollapseConverter}},RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}">
+                    <ContentControl Margin="2,0,0,0"
+                                    Content="{Binding Path=(local:PasswordBoxHelper.Watermark),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                    Foreground="{Binding Path=(local:PasswordBoxHelper.WatermarkBrush),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                        <ContentControl.Resources>
+                            <Style TargetType="{x:Type TextBlock}">
+                                <Setter Property="TextWrapping"
+                                        Value="Wrap" />
+                            </Style>
+                        </ContentControl.Resources>
+                    </ContentControl>
+                </Border>
                 <TextBlock IsHitTestVisible="False"
                            Focusable="False"
                            Margin="{TemplateBinding Padding}"
@@ -58,7 +66,7 @@
                         Visibility="Collapsed"
                         Style="{Binding Path=(local:PasswordBoxHelper.PlainButtonStyle), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <Trigger  Property="local:PasswordBoxHelper.ClearButtonVisibility"
                       Value="Visible">
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/RadioButtonTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/RadioButtonTemplate.xaml
index d932949c..28947b82 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/RadioButtonTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/RadioButtonTemplate.xaml
@@ -19,7 +19,7 @@
                 <ColumnDefinition />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <i:ContentControlX x:Name="CcBox"
+            <local:ContentControlX x:Name="CcBox"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                Height="{Binding Path=(local:RadioButtonHelper.BoxRadius), Converter={StaticResource {x:Static rs:ConverterKeys.DoubleMultiplyByConverter}}, ConverterParameter=2, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                Width="{Binding Path=(local:RadioButtonHelper.BoxRadius), Converter={StaticResource {x:Static rs:ConverterKeys.DoubleMultiplyByConverter}}, ConverterParameter=2, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -39,7 +39,7 @@
                                         ScaleY="{Binding Path=(i:VisualStateHelper.Percent), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                     </Ellipse.RenderTransform>
                 </Ellipse>
-            </i:ContentControlX>
+            </local:ContentControlX>
             <ContentPresenter x:Name="CpContent"
                               Grid.Column="1"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -134,15 +134,26 @@
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding IsChecked, RelativeSource={RelativeSource Self}, Mode=OneWay}"
                                Value="{x:Null}" />
-                    <Condition Binding="{Binding Path=(local:RadioButtonHelper.NullableForeround), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                    <Condition Binding="{Binding Path=(local:v.NullableBorderThickness), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="CcBox"
+                        Property="BorderThickness"
+                        Value="{Binding Path=(local:RadioButtonHelper.NullableBorderThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsChecked, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                               Value="{x:Null}" />
+                    <Condition Binding="{Binding Path=(local:RadioButtonHelper.NullableForeground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
                                Value="True" />
                 </MultiDataTrigger.Conditions>
                 <Setter TargetName="CpContent"
                         Property="TextElement.Foreground"
-                        Value="{Binding Path=(local:RadioButtonHelper.NullableForeround), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                        Value="{Binding Path=(local:RadioButtonHelper.NullableForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 <Setter TargetName="CpContent"
                         Property="TextBlock.Foreground"
-                        Value="{Binding Path=(local:RadioButtonHelper.NullableForeround), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+                        Value="{Binding Path=(local:RadioButtonHelper.NullableForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </MultiDataTrigger>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/RepeatButtonTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/RepeatButtonTemplate.xaml
index efac1aea..c1aa343a 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/RepeatButtonTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/RepeatButtonTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.RepeatButtonTemplate}"
                      TargetType="RepeatButton">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -42,7 +42,7 @@
                                   VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                   HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <Trigger Property="local:RepeatButtonHelper.IsPending"
                      Value="True">
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ScrollViewerTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ScrollViewerTemplate.xaml
index 2c69fc4c..3e86f7a7 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ScrollViewerTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ScrollViewerTemplate.xaml
@@ -14,10 +14,14 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition />
+                <RowDefinition x:Name="RdSpacing"
+                               Height="0" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
+                <ColumnDefinition x:Name="CdSpacing"
+                                  Width="0" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <ScrollContentPresenter x:Name="scpContent"
@@ -26,7 +30,7 @@
                                     CanContentScroll="{TemplateBinding CanContentScroll}"
                                     Margin="{TemplateBinding Padding}" />
             <ScrollBar x:Name="PART_VerticalScrollBar"
-                       Grid.Column="1"
+                       Grid.Column="2"
                        MinWidth="0"
                        Width="{Binding Path=(local:ScrollViewerHelper.ScrollBarThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                        Value="{TemplateBinding VerticalOffset}"
@@ -34,7 +38,7 @@
                        ViewportSize="{TemplateBinding ViewportHeight}"
                        Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" />
             <ScrollBar x:Name="PART_HorizontalScrollBar"
-                       Grid.Row="1"
+                       Grid.Row="2"
                        Orientation="Horizontal"
                        MinHeight="0"
                        Height="{Binding Path=(local:ScrollViewerHelper.ScrollBarThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -44,26 +48,38 @@
                        Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" />
         </Grid>
         <ControlTemplate.Triggers>
+            <Trigger Property="ComputedVerticalScrollBarVisibility"
+                     Value="Visible">
+                <Setter TargetName="CdSpacing"
+                        Property="Width"
+                        Value="{Binding Path=(local:ScrollViewerHelper.ContentSpacing), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </Trigger>
+            <Trigger Property="ComputedHorizontalScrollBarVisibility"
+                     Value="Visible">
+                <Setter TargetName="RdSpacing"
+                        Property="Height"
+                        Value="{Binding Path=(local:ScrollViewerHelper.ContentSpacing), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+            </Trigger>
             <Trigger Property="local:ScrollViewerHelper.ScrollBarPosition"
                      Value="Inside">
                 <Setter TargetName="scpContent"
                         Property="Grid.ColumnSpan"
-                        Value="2" />
+                        Value="3" />
                 <Setter TargetName="scpContent"
                         Property="Grid.RowSpan"
-                        Value="2" />
+                        Value="3" />
             </Trigger>
             <Trigger Property="local:ScrollViewerHelper.ScrollBarPosition"
                      Value="VerticalInside">
                 <Setter TargetName="scpContent"
                         Property="Grid.ColumnSpan"
-                        Value="2" />
+                        Value="3" />
             </Trigger>
             <Trigger Property="local:ScrollViewerHelper.ScrollBarPosition"
                      Value="HorizontalInside">
                 <Setter TargetName="scpContent"
                         Property="Grid.RowSpan"
-                        Value="2" />
+                        Value="3" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/SwitchTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/SwitchTemplate.xaml
index 4ad9f99f..6a6e016a 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/SwitchTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/SwitchTemplate.xaml
@@ -11,91 +11,92 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.SwitchTemplate}"
                      TargetType="local:Switch">
-        <Grid Background="Transparent"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Grid x:Name="GrdBox"
-                  Height="{TemplateBinding BoxHeight}"
-                  Width="{TemplateBinding BoxWidth}">
-                <Border SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Background="{TemplateBinding CheckedBackground}" />
-                <Border SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        RenderTransformOrigin="0.5,0.5"
-                        Background="{TemplateBinding Background}">
-                    <Border.RenderTransform>
-                        <ScaleTransform x:Name="ScaleBoxBack"
-                                        ScaleX="1"
-                                        ScaleY="1" />
-                    </Border.RenderTransform>
-                </Border>
-                <Border x:Name="BdrContainer"
-                        Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}, Mode=OneWay}"
-                        HorizontalAlignment="Right">
-                    <Border.Margin>
-                        <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.SwitchToggleMarginConverter}}">
-                            <Binding Path="BoxWidth"
-                                     RelativeSource="{RelativeSource TemplatedParent}"
-                                     Mode="OneWay" />
-                            <Binding Path="ActualWidth"
-                                     RelativeSource="{RelativeSource Self}"
-                                     Mode="OneWay" />
-                        </MultiBinding>
-                    </Border.Margin>
-                    <Border x:Name="BdrToggle"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"
-                            Height="{TemplateBinding ToggleSize}"
-                            Width="{TemplateBinding ToggleSize}"
+        <Border Background="Transparent">
+            <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid x:Name="GrdBox"
+                      Height="{TemplateBinding BoxHeight}"
+                      Width="{TemplateBinding BoxWidth}">
+                    <Border SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                             CornerRadius="{TemplateBinding CornerRadius}"
-                            Background="{TemplateBinding ToggleBrush}">
-                        <Border.Effect>
-                            <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
-                                <Binding Path="InternalToggleShadowColor"
-                                         RelativeSource="{RelativeSource TemplatedParent}"
-                                         Mode="OneWay" />
-                                <Binding Path="(local:ShadowHelper.BlurRadius)"
-                                         RelativeSource="{RelativeSource TemplatedParent}"
-                                         Mode="OneWay" />
-                                <Binding Path="(local:ShadowHelper.ShadowDepth)"
-                                         RelativeSource="{RelativeSource TemplatedParent}"
-                                         Mode="OneWay" />
-                                <Binding Path="(local:ShadowHelper.Direction)"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding CheckedBackground}" />
+                    <Border SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            RenderTransformOrigin="0.5,0.5"
+                            Background="{TemplateBinding Background}">
+                        <Border.RenderTransform>
+                            <ScaleTransform x:Name="ScaleBoxBack"
+                                            ScaleX="1"
+                                            ScaleY="1" />
+                        </Border.RenderTransform>
+                    </Border>
+                    <Border x:Name="BdrContainer"
+                            Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                            HorizontalAlignment="Right">
+                        <Border.Margin>
+                            <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.SwitchToggleMarginConverter}}">
+                                <Binding Path="BoxWidth"
                                          RelativeSource="{RelativeSource TemplatedParent}"
                                          Mode="OneWay" />
-                                <Binding Path="(local:ShadowHelper.Opacity)"
-                                         RelativeSource="{RelativeSource TemplatedParent}"
-                                         Mode="OneWay" />
-                                <Binding Path="(local:ShadowHelper.RenderingBias)"
-                                         RelativeSource="{RelativeSource TemplatedParent}"
+                                <Binding Path="ActualWidth"
+                                         RelativeSource="{RelativeSource Self}"
                                          Mode="OneWay" />
                             </MultiBinding>
-                        </Border.Effect>
+                        </Border.Margin>
+                        <Border x:Name="BdrToggle"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Height="{TemplateBinding ToggleSize}"
+                                Width="{TemplateBinding ToggleSize}"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                Background="{TemplateBinding ToggleBrush}">
+                            <Border.Effect>
+                                <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
+                                    <Binding Path="InternalToggleShadowColor"
+                                             RelativeSource="{RelativeSource TemplatedParent}"
+                                             Mode="OneWay" />
+                                    <Binding Path="(local:ShadowHelper.BlurRadius)"
+                                             RelativeSource="{RelativeSource TemplatedParent}"
+                                             Mode="OneWay" />
+                                    <Binding Path="(local:ShadowHelper.ShadowDepth)"
+                                             RelativeSource="{RelativeSource TemplatedParent}"
+                                             Mode="OneWay" />
+                                    <Binding Path="(local:ShadowHelper.Direction)"
+                                             RelativeSource="{RelativeSource TemplatedParent}"
+                                             Mode="OneWay" />
+                                    <Binding Path="(local:ShadowHelper.Opacity)"
+                                             RelativeSource="{RelativeSource TemplatedParent}"
+                                             Mode="OneWay" />
+                                    <Binding Path="(local:ShadowHelper.RenderingBias)"
+                                             RelativeSource="{RelativeSource TemplatedParent}"
+                                             Mode="OneWay" />
+                                </MultiBinding>
+                            </Border.Effect>
+                        </Border>
                     </Border>
-                </Border>
-                <Border x:Name="BdrBorder"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}" />
+                    <Border x:Name="BdrBorder"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}" />
+                </Grid>
+                <ContentPresenter x:Name="CpContent"
+                                  Grid.Column="1"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  TextElement.Foreground="{TemplateBinding Foreground}"
+                                  TextBlock.Foreground="{TemplateBinding Foreground}"
+                                  Margin="{TemplateBinding Padding}" />
             </Grid>
-            <ContentPresenter x:Name="CpContent"
-                              Grid.Column="1"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              TextElement.Foreground="{TemplateBinding Foreground}"
-                              TextBlock.Foreground="{TemplateBinding Foreground}"
-                              Margin="{TemplateBinding Padding}" />
-        </Grid>
+        </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="ContentPlacement"
                      Value="Left">
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TabControlTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TabControlTemplate.xaml
index 846b8815..c6ce6907 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TabControlTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TabControlTemplate.xaml
@@ -21,7 +21,7 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Grid x:Name="GrdHeader">
-                    <i:ContentControlX x:Name="CcHeader"
+                    <local:ContentControlX x:Name="CcHeader"
                                        Height="{Binding Path=(local:TabControlHelper.HeaderPanelHeight), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                        Background="{Binding Path=(local:TabControlHelper.HeaderPanelBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                        BorderBrush="{Binding Path=(local:TabControlHelper.HeaderPanelBorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -81,7 +81,7 @@
                                               StrokeThickness="{Binding Path=(local:TabControlHelper.HeaderPanelRibbonLineThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                               Visibility="{Binding Path=(local:TabControlHelper.HeaderPanelRibbonLineVisibility), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                         </Grid>
-                    </i:ContentControlX>
+                    </local:ContentControlX>
                 </Grid>
                 <ContentPresenter x:Name="PART_SelectedContentHost"
                                   Grid.Row="1"
@@ -184,7 +184,7 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <Grid x:Name="GrdHeader">
-                    <i:ContentControlX x:Name="CcHeader"
+                    <local:ContentControlX x:Name="CcHeader"
                                        Height="{Binding Path=(local:TabControlHelper.HeaderPanelHeight), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                        Background="{Binding Path=(local:TabControlHelper.HeaderPanelBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                        BorderBrush="{Binding Path=(local:TabControlHelper.HeaderPanelBorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -243,7 +243,7 @@
                                               StrokeThickness="{Binding Path=(local:TabControlHelper.HeaderPanelRibbonLineThickness), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                               Visibility="{Binding Path=(local:TabControlHelper.HeaderPanelRibbonLineVisibility), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                         </Grid>
-                    </i:ContentControlX>
+                    </local:ContentControlX>
                 </Grid>
                 <ContentPresenter x:Name="PART_SelectedContentHost"
                                   Grid.Column="1"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TabItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TabItemTemplate.xaml
index 7adc3023..06897094 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TabItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TabItemTemplate.xaml
@@ -21,7 +21,7 @@
                 <ColumnDefinition />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                BorderThickness="{TemplateBinding BorderThickness}"
@@ -51,7 +51,7 @@
                             Command="{Binding Path=(local:TabControlHelper.RemoveCommand), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                             CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
                 </Grid>
-            </i:ContentControlX>
+            </local:ContentControlX>
             <Rectangle x:Name="RectRibbon"
                        Fill="{Binding Path=(i:VisualStateHelper.RibbonLineBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                        Margin="{Binding Path=(local:TabItemHelper.RibbonLineMargin), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TextBoxTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TextBoxTemplate.xaml
index 418f90d0..34e4b96a 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TextBoxTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TextBoxTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.TextBoxTemplate}"
                      TargetType="TextBox">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -25,15 +25,23 @@
                     <ColumnDefinition />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <TextBlock IsHitTestVisible="False"
-                           Margin="{TemplateBinding Padding}"
-                           Padding="2,0,0,0"
-                           TextWrapping="{TemplateBinding TextWrapping}"
-                           Visibility="{Binding Text,Converter={StaticResource {x:Static rs:ConverterKeys.StringNonnullAndNotEmptyToCollapseConverter}},RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}"
-                           Text="{Binding Path=(local:TextBoxHelper.Watermark),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                           Foreground="{Binding Path=(local:TextBoxHelper.WatermarkBrush),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                <Border IsHitTestVisible="False"
+                        Focusable="False"
+                        Margin="{TemplateBinding Padding}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        Visibility="{Binding Text,Converter={StaticResource {x:Static rs:ConverterKeys.StringNonnullAndNotEmptyToCollapseConverter}},RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}">
+                    <ContentControl Margin="2,0,0,0"
+                                    Content="{Binding Path=(local:TextBoxHelper.Watermark),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                    Foreground="{Binding Path=(local:TextBoxHelper.WatermarkBrush),RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                        <ContentControl.Resources>
+                            <Style TargetType="{x:Type TextBlock}">
+                                <Setter Property="TextWrapping"
+                                        Value="Wrap" />
+                            </Style>
+                        </ContentControl.Resources>
+                    </ContentControl>
+                </Border>
                 <ScrollViewer x:Name="PART_ContentHost"
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -46,7 +54,7 @@
                         Command="{Binding Path=(local:TextBoxHelper.ClearCommand), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                         CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <Trigger  Property="local:TextBoxHelper.ClearButtonVisibility"
                       Value="Visible">
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ThumbTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ThumbTemplate.xaml
index 7c62c4a9..d80b1267 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ThumbTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ThumbTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ThumbTemplate}"
                      TargetType="Thumb">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ToggleButtonTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ToggleButtonTemplate.xaml
index 0b5ae3fc..ea00f652 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ToggleButtonTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ToggleButtonTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ToggleButtonTemplate}"
                      TargetType="ToggleButton">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Source="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                            Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                            BorderBrush="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -42,7 +42,7 @@
                                   VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                   HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
             </Grid>
-        </i:ContentControlX>
+        </local:ContentControlX>
         <ControlTemplate.Triggers>
             <Trigger Property="local:ToggleButtonHelper.IsPending"
                      Value="True">
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ToolTipTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ToolTipTemplate.xaml
index e82075a0..b49c24f9 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ToolTipTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ToolTipTemplate.xaml
@@ -11,7 +11,7 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.ToolTipTemplate}"
                      TargetType="ToolTip">
-        <i:ContentControlX x:Name="CcMain"
+        <local:ContentControlX x:Name="CcMain"
                            Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
@@ -26,7 +26,7 @@
                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                            ContentStringFormat="{TemplateBinding ContentStringFormat}"
                            Margin="{Binding Path=(local:ShadowHelper.BlurRadius), Converter={StaticResource {x:Static irs:ConverterKeys.DropDownMarginConverter}}, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
-            <i:ContentControlX.Effect>
+            <local:ContentControlX.Effect>
                 <MultiBinding Converter="{StaticResource {x:Static irs:ConverterKeys.DropShadowEffectWithDepthConverter}}">
                     <Binding Path="(local:ToolTipHelper.ShadowColor)"
                              RelativeSource="{RelativeSource TemplatedParent}"
@@ -47,8 +47,8 @@
                              RelativeSource="{RelativeSource TemplatedParent}"
                              Mode="OneWay" />
                 </MultiBinding>
-            </i:ContentControlX.Effect>
-        </i:ContentControlX>
+            </local:ContentControlX.Effect>
+        </local:ContentControlX>
     </ControlTemplate>
     
 </ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TreeViewItemTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TreeViewItemTemplate.xaml
index 1d9de5e0..366e5dd6 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TreeViewItemTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TreeViewItemTemplate.xaml
@@ -12,7 +12,7 @@
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.TreeViewItemTemplate}"
                      TargetType="TreeViewItem">
         <StackPanel>
-            <i:ContentControlX x:Name="CcMain"
+            <local:ContentControlX x:Name="CcMain"
                                Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                Height="{Binding Path=(local:TreeViewItemHelper.Height), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                Background="{Binding Path=(i:VisualStateHelper.Background), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -24,13 +24,13 @@
                                CornerRadius="{Binding Path=(local:TreeViewItemHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                Effect="{Binding Path=(i:VisualStateHelper.Effect), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                                Padding="{Binding Path=(local:TreeViewItemHelper.InternalPadding), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
-                <i:ContentControlX.ExtendControl>
+                <local:ContentControlX.ExtendControl>
                     <ToggleButton x:Name="TgbToggle"
                                   IsChecked="True"
                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                   Style="{Binding Path=(local:TreeViewHelper.ToggleArrowToggleButtonStyle), RelativeSource={RelativeSource AncestorType=TreeView}, Mode=OneWay}"
                                   Visibility="Hidden" />
-                </i:ContentControlX.ExtendControl>
+                </local:ContentControlX.ExtendControl>
                 <Grid>
                     <ContentPresenter x:Name="CpHeader"
                                       ContentSource="Header"
@@ -81,7 +81,7 @@
                         </local:SeparatorX.Margin>
                     </local:SeparatorX>
                 </Grid>
-            </i:ContentControlX>
+            </local:ContentControlX>
             <local:SeparatorX x:Name="SprtSeparator"
                               VerticalAlignment="Center"
                               Stroke="{Binding Path=(local:TreeViewItemHelper.SeparatorBrush), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TreeViewTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TreeViewTemplate.xaml
index 9ac408bd..7c032889 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TreeViewTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/TreeViewTemplate.xaml
@@ -11,23 +11,23 @@
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.TreeViewTemplate}"
                      TargetType="TreeView">
-        <i:ContentControlX BorderBrush="{TemplateBinding BorderBrush}"
+        <local:ContentControlX BorderBrush="{TemplateBinding BorderBrush}"
                            Background="{TemplateBinding Background}"
                            BorderThickness="{TemplateBinding BorderThickness}">
             <ScrollViewer Margin="{TemplateBinding Padding}"
                           Focusable="False">
                 <ItemsPresenter />
             </ScrollViewer>
-        </i:ContentControlX>
+        </local:ContentControlX>
     </ControlTemplate>
 
     <ControlTemplate x:Key="{x:Static irs:TemplateKeys.TreeViewNonScrollableTemplate}"
                      TargetType="TreeView">
-        <i:ContentControlX BorderBrush="{TemplateBinding BorderBrush}"
+        <local:ContentControlX BorderBrush="{TemplateBinding BorderBrush}"
                            Background="{TemplateBinding Background}"
                            BorderThickness="{TemplateBinding BorderThickness}">
             <ItemsPresenter />
-        </i:ContentControlX>
+        </local:ContentControlX>
     </ControlTemplate>
 
 </ResourceDictionary>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/ColorPicker.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/ColorPicker.cs
index 3a17d706..fba97c23 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/ColorPicker.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/ColorPicker.cs
@@ -501,6 +501,7 @@ private static void OnSelectedColorChanged(DependencyObject d, DependencyPropert
             var colorPicker = (ColorPicker)d;
             colorPicker.UpdateColorSelectorSelectedColor();
             colorPicker.UpdateText();
+            colorPicker.RaiseEvent(new SelectedValueChangedEventArgs<Color?>(SelectedColorChangedEvent, (Color?)e.OldValue, (Color?)e.NewValue));
         }
 
         private void EditableTextBox_TextChanged(object sender, TextChangedEventArgs e)
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/ContentControlX.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/ContentControlX.cs
similarity index 97%
rename from DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/ContentControlX.cs
rename to DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/ContentControlX.cs
index 0ea6dabe..ecc47f34 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/ContentControlX.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/ContentControlX.cs
@@ -1,16 +1,16 @@
-using Panuon.UI.Silver.Internal.Utils;
-using System;
+using Panuon.UI.Silver.Internal;
+using Panuon.UI.Silver.Internal.Utils;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Effects;
-using System.Linq;
 
-namespace Panuon.UI.Silver.Internal
+namespace Panuon.UI.Silver
 {
     [TemplatePart(Name = IconPresenterPartName, Type = typeof(IconPresenter))]
-    class ContentControlX : ContentControl
+    public class ContentControlX : ContentControl
     {
         #region Fields
         private const string IconPresenterPartName = "PART_Icon";
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/FormGroup.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/FormGroup.cs
index daa818d0..878fbb3d 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/FormGroup.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/FormGroup.cs
@@ -236,6 +236,17 @@ public string GroupName
             DependencyProperty.Register("GroupName", typeof(string), typeof(FormGroup), new PropertyMetadata(OnGroupNameChanged));
         #endregion
 
+        #region ExtendControl
+        public object ExtendControl
+        {
+            get { return (object)GetValue(ExtendControlProperty); }
+            set { SetValue(ExtendControlProperty, value); }
+        }
+
+        public static readonly DependencyProperty ExtendControlProperty =
+            DependencyProperty.Register("ExtendControl", typeof(object), typeof(FormGroup));
+        #endregion
+
         #endregion
 
         #region Overrides
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/CustomPopup.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/PopupX.cs
similarity index 95%
rename from DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/CustomPopup.cs
rename to DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/PopupX.cs
index 6851f286..691bbe9e 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/CustomPopup.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/PopupX.cs
@@ -6,16 +6,16 @@
 using System.Windows.Interop;
 using System.Windows.Media;
 
-namespace Panuon.UI.Silver.Internal
+namespace Panuon.UI.Silver
 {
-    class CustomPopup : Popup
+   public class PopupX : Popup
     {
         #region Fields
         private WeakReference _parentWindow;
         #endregion
 
         #region Ctor
-        public CustomPopup()
+        public PopupX()
         {
             base.Placement = PlacementMode.Custom;
             CustomPopupPlacementCallback = PopupPlacementCallback;
@@ -32,7 +32,7 @@ public CustomPopup()
         }
 
         public new static readonly DependencyProperty PlacementProperty =
-            DependencyProperty.Register("Placement", typeof(PopupXPlacement), typeof(CustomPopup), new PropertyMetadata(PopupXPlacement.Bottom));
+            DependencyProperty.Register("Placement", typeof(PopupXPlacement), typeof(PopupX), new PropertyMetadata(PopupXPlacement.Bottom));
         #endregion
 
         #region ActualPlacement 
@@ -43,7 +43,7 @@ public PopupXPlacement ActualPlacement
         }
 
         public static readonly DependencyProperty ActualPlacementProperty =
-            DependencyProperty.Register("ActualPlacement", typeof(PopupXPlacement), typeof(CustomPopup));
+            DependencyProperty.Register("ActualPlacement", typeof(PopupXPlacement), typeof(PopupX));
         #endregion
 
         #region RelativePosition
@@ -54,7 +54,7 @@ public Point RelativePosition
         }
 
         public static readonly DependencyProperty RelativePositionProperty =
-            DependencyProperty.Register("RelativePosition", typeof(Point), typeof(CustomPopup));
+            DependencyProperty.Register("RelativePosition", typeof(Point), typeof(PopupX));
         #endregion
 
         #endregion
@@ -64,10 +64,10 @@ protected override void OnOpened(EventArgs e)
         {
             var hwnd = ((HwndSource)PresentationSource.FromVisual(Child)).Handle;
 
-            if (Win32Util.GetWindowRect(hwnd, out Win32Util.RECT rect))
-            {
-                Win32Util.SetWindowPos(hwnd, -2, rect.Left, rect.Top, (int)this.Width, (int)this.Height, 0);
-            }
+            //if (Win32Util.GetWindowRect(hwnd, out Win32Util.RECT rect))
+            //{
+            //    Win32Util.SetWindowPos(hwnd, -2, rect.Left, rect.Top, (int)this.Width, (int)this.Height, 0);
+            //}
 
             var parentWindow = Window.GetWindow(this);
             if (parentWindow != null)
@@ -80,8 +80,8 @@ protected override void OnOpened(EventArgs e)
                 parentWindow.MouseDown -= Window_MouseDown;
                 parentWindow.MouseDown += Window_MouseDown;
             }
-            base.OnOpened(e);
             UpdateActualPlacement();
+            base.OnOpened(e);
         }
 
         protected override void OnClosed(EventArgs e)
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/WIndowX.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/WIndowX.cs
index cda077c8..c685b849 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/WIndowX.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Controls/WIndowX.cs
@@ -44,6 +44,8 @@ public class WindowX : Window, INotifyPropertyChanged
 
         private WindowState _lastWindowState;
 
+        private WindowStyle _lastWindowStyle;
+
         private bool _isLoaded;
         #endregion
 
@@ -64,6 +66,8 @@ public WindowX()
 
         #region Events
         public event PropertyChangedEventHandler PropertyChanged;
+
+        public event EventHandler FullScreenChanged;
         #endregion
 
         #region Overrides
@@ -89,10 +93,14 @@ public override void OnApplyTemplate()
         #region OnPreviewKeyUp
         protected override void OnPreviewKeyUp(KeyEventArgs e)
         {
-            if (e.Key == Key.Escape && IsEscEnabled)
+            if (IsEscEnabled && e.Key == Key.Escape)
             {
                 Close();
             }
+            else if(IsF11Enabled && e.Key == Key.F11)
+            {
+                SetCurrentValue(IsFullScreenProperty, !IsFullScreen);
+            }
             base.OnPreviewKeyUp(e);
         }
         #endregion
@@ -144,6 +152,17 @@ public bool IsEscEnabled
             DependencyProperty.Register("IsEscEnabled", typeof(bool), typeof(WindowX));
         #endregion
 
+        #region IsF11Enabled
+        public bool IsF11Enabled
+        {
+            get { return (bool)GetValue(IsF11EnabledProperty); }
+            set { SetValue(IsF11EnabledProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsF11EnabledProperty =
+            DependencyProperty.Register("IsF11Enabled", typeof(bool), typeof(WindowX));
+        #endregion
+
         #region CanClose
         public bool CanClose
         {
@@ -254,6 +273,17 @@ public bool InteropOwnersMask
             DependencyProperty.Register("Effect", typeof(WindowXEffect), typeof(WindowX), new PropertyMetadata(null, OnWindowXEffectChanged));
         #endregion
 
+        #region IsFullScreen
+        public bool IsFullScreen
+        {
+            get { return (bool)GetValue(IsFullScreenProperty); }
+            set { SetValue(IsFullScreenProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsFullScreenProperty =
+            DependencyProperty.Register("IsFullScreen", typeof(bool), typeof(WindowX), new PropertyMetadata(false, OnIsFullScreenChanged));
+        #endregion
+
         #region IsClosed
         public bool IsClosed { get; private set; }
         #endregion
@@ -315,7 +345,7 @@ internal static void SetLastPosition(DependencyObject obj, Point? value)
         #region Close
         public new void Close()
         {
-            CanClose = true;
+            SetCurrentValue(CanCloseProperty, true);
             base.Close();
         }
         #endregion
@@ -324,7 +354,7 @@ internal static void SetLastPosition(DependencyObject obj, Point? value)
         public void Minimize()
         {
             _lastWindowState = WindowState;
-            WindowState = WindowState.Minimized;
+            SetCurrentValue(WindowStateProperty, WindowState.Minimized);
         }
         #endregion
 
@@ -332,7 +362,7 @@ public void Minimize()
         public void Maximize()
         {
             _lastWindowState = WindowState;
-            WindowState = WindowState.Maximized;
+            SetCurrentValue(WindowStateProperty, WindowState.Maximized);
         }
         #endregion
 
@@ -340,7 +370,7 @@ public void Maximize()
         public void Normalmize()
         {
             _lastWindowState = WindowState;
-            WindowState = WindowState.Normal;
+            SetCurrentValue(WindowStateProperty, WindowState.Normal);
         }
         #endregion
 
@@ -350,7 +380,7 @@ public void MaximizeOrRestore()
             _lastWindowState = WindowState;
             if (WindowState == WindowState.Maximized)
             {
-                WindowState = _lastWindowState;
+                SetCurrentValue(WindowStateProperty, _lastWindowState);
             }
             else
             {
@@ -365,7 +395,7 @@ public void MinimizeOrRestore()
             _lastWindowState = WindowState;
             if (WindowState == WindowState.Minimized)
             {
-                WindowState = _lastWindowState;
+                SetCurrentValue(WindowStateProperty, _lastWindowState);
             }
             else
             {
@@ -409,6 +439,29 @@ public void Set<T>(ref T identifer, T value, [CallerMemberName] string propertyN
         #endregion
 
         #region Event Handlers
+        private static void OnIsFullScreenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var windowX = (WindowX)d;
+            windowX.OnFullScreenChanged();
+        }
+
+        private void OnFullScreenChanged()
+        {
+            if (IsFullScreen)
+            {
+                _lastWindowState = WindowState;
+                _lastWindowStyle = WindowStyle;
+                SetCurrentValue(WindowStyleProperty, WindowStyle.None);
+                SetCurrentValue(WindowStateProperty, WindowState.Maximized);
+            }
+            else
+            {
+                SetCurrentValue(WindowStyleProperty, _lastWindowStyle);
+                SetCurrentValue(WindowStateProperty, _lastWindowState);
+            }
+            FullScreenChanged?.Invoke(this, EventArgs.Empty);
+        }
+
         private static void OnWindowXEffectChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var windowX = (WindowX)d;
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/CheckBoxHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/CheckBoxHelper.cs
index 5cf58d0f..6fb5b2c7 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/CheckBoxHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/CheckBoxHelper.cs
@@ -262,19 +262,19 @@ public static void SetNullableBackground(CheckBox checkBox, Brush value)
             DependencyProperty.RegisterAttached("NullableBackground", typeof(Brush), typeof(CheckBoxHelper));
         #endregion
 
-        #region NullableForeround
-        public static Brush GetNullableForeround(CheckBox checkBox)
+        #region NullableForeground
+        public static Brush GetNullableForeground(CheckBox checkBox)
         {
-            return (Brush)checkBox.GetValue(NullableForeroundProperty);
+            return (Brush)checkBox.GetValue(NullableForegroundProperty);
         }
 
-        public static void SetNullableForeround(CheckBox checkBox, Brush value)
+        public static void SetNullableForeground(CheckBox checkBox, Brush value)
         {
-            checkBox.SetValue(NullableForeroundProperty, value);
+            checkBox.SetValue(NullableForegroundProperty, value);
         }
 
-        public static readonly DependencyProperty NullableForeroundProperty =
-            DependencyProperty.RegisterAttached("NullableForeround", typeof(Brush), typeof(CheckBoxHelper));
+        public static readonly DependencyProperty NullableForegroundProperty =
+            DependencyProperty.RegisterAttached("NullableForeground", typeof(Brush), typeof(CheckBoxHelper));
         #endregion
 
         #region NullableBorderBrush
@@ -293,18 +293,18 @@ public static void SetNullableBorderBrush(CheckBox checkBox, Brush value)
         #endregion
 
         #region NullableBorderThickness
-        public static Thickness GetNullableBorderThickness(CheckBox checkBox)
+        public static Thickness? GetNullableBorderThickness(CheckBox checkBox)
         {
             return (Thickness)checkBox.GetValue(NullableBorderThicknessProperty);
         }
 
-        public static void SetNullableBorderThickness(CheckBox checkBox, Thickness value)
+        public static void SetNullableBorderThickness(CheckBox checkBox, Thickness? value)
         {
             checkBox.SetValue(NullableBorderThicknessProperty, value);
         }
 
         public static readonly DependencyProperty NullableBorderThicknessProperty =
-            DependencyProperty.RegisterAttached("NullableBorderThickness", typeof(Thickness), typeof(CheckBoxHelper));
+            DependencyProperty.RegisterAttached("NullableBorderThickness", typeof(Thickness?), typeof(CheckBoxHelper));
         #endregion
 
         #region NullableGlyphBrush
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ComboBoxHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ComboBoxHelper.cs
index 322cc38e..6c907543 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ComboBoxHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ComboBoxHelper.cs
@@ -80,18 +80,18 @@ public static void SetIcon(ComboBox comboBox, object value)
         #endregion
 
         #region Watermark
-        public static string GetWatermark(ComboBox comboBox)
+        public static object GetWatermark(ComboBox comboBox)
         {
-            return (string)comboBox.GetValue(WatermarkProperty);
+            return (object)comboBox.GetValue(WatermarkProperty);
         }
 
-        public static void SetWatermark(ComboBox comboBox, string value)
+        public static void SetWatermark(ComboBox comboBox, object value)
         {
             comboBox.SetValue(WatermarkProperty, value);
         }
 
         public static readonly DependencyProperty WatermarkProperty =
-            DependencyProperty.RegisterAttached("Watermark", typeof(string), typeof(ComboBoxHelper));
+            DependencyProperty.RegisterAttached("Watermark", typeof(object), typeof(ComboBoxHelper));
         #endregion
 
         #region WatermarkBrush
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ContextMenuHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ContextMenuHelper.cs
index 532722d3..e95fb58f 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ContextMenuHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ContextMenuHelper.cs
@@ -101,6 +101,36 @@ public static void SetBorderThickness(ContextMenu contextMenu, Thickness value)
 
         #endregion
 
+        #region CornerRadius
+        public static CornerRadius GetCornerRadius(ContextMenu contextMenu)
+        {
+            return (CornerRadius)contextMenu.GetValue(CornerRadiusProperty);
+        }
+
+        public static void SetCornerRadius(ContextMenu contextMenu, CornerRadius value)
+        {
+            contextMenu.SetValue(CornerRadiusProperty, value);
+        }
+
+        public static readonly DependencyProperty CornerRadiusProperty =
+            DependencyProperty.RegisterAttached("CornerRadius", typeof(CornerRadius), typeof(ContextMenuHelper));
+        #endregion
+
+        #region ShadowColor
+        public static Color? GetShadowColor(ContextMenu contextMenu)
+        {
+            return (Color?)contextMenu.GetValue(ShadowColorProperty);
+        }
+
+        public static void SetShadowColor(ContextMenu contextMenu, Color? value)
+        {
+            contextMenu.SetValue(ShadowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty ShadowColorProperty =
+            DependencyProperty.RegisterAttached("ShadowColor", typeof(Color?), typeof(ContextMenuHelper));
+        #endregion
+
         #region Padding
         public static Thickness GetPadding(ContextMenu contextMenu)
         {
@@ -359,6 +389,51 @@ public static void SetItemsClickBorderBrush(ContextMenu contextMenu, Brush value
             DependencyProperty.RegisterAttached("ItemsClickBorderBrush", typeof(Brush), typeof(ContextMenuHelper));
         #endregion
 
+        #region ItemsOpenedBackground
+        public static Brush GetItemsOpenedBackground(ContextMenu contextMenu)
+        {
+            return (Brush)contextMenu.GetValue(ItemsOpenedBackgroundProperty);
+        }
+
+        public static void SetItemsOpenedBackground(ContextMenu contextMenu, Brush value)
+        {
+            contextMenu.SetValue(ItemsOpenedBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemsOpenedBackgroundProperty =
+            DependencyProperty.RegisterAttached("ItemsOpenedBackground", typeof(Brush), typeof(ContextMenuHelper));
+        #endregion
+
+        #region ItemsOpenedForeground
+        public static Brush GetItemsOpenedForeground(ContextMenu contextMenu)
+        {
+            return (Brush)contextMenu.GetValue(ItemsOpenedForegroundProperty);
+        }
+
+        public static void SetItemsOpenedForeground(ContextMenu contextMenu, Brush value)
+        {
+            contextMenu.SetValue(ItemsOpenedForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemsOpenedForegroundProperty =
+            DependencyProperty.RegisterAttached("ItemsOpenedForeground", typeof(Brush), typeof(ContextMenuHelper));
+        #endregion
+
+        #region ItemsOpenedBorderBrush
+        public static Brush GetItemsOpenedBorderBrush(ContextMenu contextMenu)
+        {
+            return (Brush)contextMenu.GetValue(ItemsOpenedBorderBrushProperty);
+        }
+
+        public static void SetItemsOpenedBorderBrush(ContextMenu contextMenu, Brush value)
+        {
+            contextMenu.SetValue(ItemsOpenedBorderBrushProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemsOpenedBorderBrushProperty =
+            DependencyProperty.RegisterAttached("ItemsOpenedBorderBrush", typeof(Brush), typeof(ContextMenuHelper));
+        #endregion
+
         #region ItemsCheckedBackground
         public static Brush GetItemsCheckedBackground(ContextMenu contextMenu)
         {
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ListBoxHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ListBoxHelper.cs
index f9e5be84..72a1b361 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ListBoxHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ListBoxHelper.cs
@@ -1,4 +1,5 @@
 using Panuon.UI.Core;
+using Panuon.UI.Silver.Internal;
 using Panuon.UI.Silver.Internal.Utils;
 using System;
 using System.ComponentModel;
@@ -47,6 +48,36 @@ public static readonly RoutedEvent ItemRemovedEvent
 
         #region Properties
 
+        #region CornerRadius
+        public static CornerRadius GetCornerRadius(ListBox listBox)
+        {
+            return (CornerRadius)listBox.GetValue(CornerRadiusProperty);
+        }
+
+        public static void SetCornerRadius(ListBox listBox, CornerRadius value)
+        {
+            listBox.SetValue(CornerRadiusProperty, value);
+        }
+
+        public static readonly DependencyProperty CornerRadiusProperty =
+            DependencyProperty.RegisterAttached("CornerRadius", typeof(CornerRadius), typeof(ListBoxHelper));
+        #endregion
+
+        #region ShadowColor
+        public static Color? GetShadowColor(ListBox listBox)
+        {
+            return (Color?)listBox.GetValue(ShadowColorProperty);
+        }
+
+        public static void SetShadowColor(ListBox listBox, Color? value)
+        {
+            listBox.SetValue(ShadowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty ShadowColorProperty =
+            VisualStateHelper.ShadowColorProperty.AddOwner(typeof(ListBoxHelper));
+        #endregion
+
         #region RemoveButtonStyle
         public static Style GetRemoveButtonStyle(ListBox listBox)
         {
@@ -259,6 +290,21 @@ public static void SetItemsPadding(ListBox listBox, Thickness value)
             DependencyProperty.RegisterAttached("ItemsPadding", typeof(Thickness), typeof(ListBoxHelper));
         #endregion
 
+        #region ItemsShadowColor
+        public static Color? GetItemsShadowColor(ListBox listBox)
+        {
+            return (Color?)listBox.GetValue(ItemsShadowColorProperty);
+        }
+
+        public static void SetItemsShadowColor(ListBox listBox, Color? value)
+        {
+            listBox.SetValue(ItemsShadowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemsShadowColorProperty =
+            DependencyProperty.RegisterAttached("ItemsShadowColor", typeof(Color?), typeof(ListBoxHelper));
+        #endregion
+
         #region ItemsCornerRadius
         public static CornerRadius GetItemsCornerRadius(ListBox listBox)
         {
@@ -366,6 +412,21 @@ public static void SetItemsHoverBorderBrush(ListBox listBox, Brush value)
             DependencyProperty.RegisterAttached("ItemsHoverBorderBrush", typeof(Brush), typeof(ListBoxHelper));
         #endregion
 
+        #region ItemsHoverShadowColor
+        public static Color? GetItemsHoverShadowColor(ListBox listBox)
+        {
+            return (Color?)listBox.GetValue(ItemsHoverShadowColorProperty);
+        }
+
+        public static void SetItemsHoverShadowColor(ListBox listBox, Color? value)
+        {
+            listBox.SetValue(ItemsHoverShadowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemsHoverShadowColorProperty =
+            DependencyProperty.RegisterAttached("ItemsHoverShadowColor", typeof(Color?), typeof(ListBoxHelper));
+        #endregion
+
         #region ItemsSelectedBackground
         public static Brush GetItemsSelectedBackground(ListBox listBox)
         {
@@ -411,6 +472,21 @@ public static void SetItemsSelectedBorderBrush(ListBox listBox, Brush value)
             DependencyProperty.RegisterAttached("ItemsSelectedBorderBrush", typeof(Brush), typeof(ListBoxHelper));
         #endregion
 
+        #region ItemsSelectedShadowColor
+        public static Color? GetItemsSelectedShadowColor(ListBox listBox)
+        {
+            return (Color?)listBox.GetValue(ItemsSelectedShadowColorProperty);
+        }
+
+        public static void SetItemsSelectedShadowColor(ListBox listBox, Color? value)
+        {
+            listBox.SetValue(ItemsSelectedShadowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemsSelectedShadowColorProperty =
+            DependencyProperty.RegisterAttached("ItemsSelectedShadowColor", typeof(Color?), typeof(ListBoxHelper));
+        #endregion
+
         #region ItemsSelectedBorderThickness
         public static Thickness? GetItemsSelectedBorderThickness(ListBox listBox)
         {
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ListBoxItemHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ListBoxItemHelper.cs
index 4c5d95cd..097664b4 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ListBoxItemHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ListBoxItemHelper.cs
@@ -52,6 +52,21 @@ public static void SetCornerRadius(ListBoxItem listBoxItem, CornerRadius value)
             DependencyProperty.RegisterAttached("CornerRadius", typeof(CornerRadius), typeof(ListBoxItemHelper));
         #endregion
 
+        #region ShadowColor
+        public static Color? GetShadowColor(ListBoxItem listBoxItem)
+        {
+            return (Color?)listBoxItem.GetValue(ShadowColorProperty);
+        }
+
+        public static void SetShadowColor(ListBoxItem listBoxItem, Color? value)
+        {
+            listBoxItem.SetValue(ShadowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty ShadowColorProperty =
+            VisualStateHelper.ShadowColorProperty.AddOwner(typeof(ListBoxItemHelper));
+        #endregion
+
         #region RemoveButtonVisibility
         public static AuxiliaryButtonVisibility GetRemoveButtonVisibility(ListBoxItem listBoxItem)
         {
@@ -112,6 +127,21 @@ public static void SetHoverBorderBrush(ListBoxItem listBoxItem, Brush value)
             VisualStateHelper.HoverBorderBrushProperty.AddOwner(typeof(ListBoxItemHelper));
         #endregion
 
+        #region HoverShadowColor
+        public static Color? GetHoverShadowColor(ListBoxItem listBoxItem)
+        {
+            return (Color?)listBoxItem.GetValue(HoverShadowColorProperty);
+        }
+
+        public static void SetHoverShadowColor(ListBoxItem listBoxItem, Color? value)
+        {
+            listBoxItem.SetValue(HoverShadowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty HoverShadowColorProperty =
+            VisualStateHelper.HoverShadowColorProperty.AddOwner(typeof(ListBoxItemHelper));
+        #endregion
+
         #region SelectedBackground
         public static Brush GetSelectedBackground(ListBoxItem listBoxItem)
         {
@@ -157,6 +187,21 @@ public static void SetSelectedBorderBrush(ListBoxItem listBoxItem, Brush value)
             DependencyProperty.RegisterAttached("SelectedBorderBrush", typeof(Brush), typeof(ListBoxItemHelper));
         #endregion
 
+        #region SelectedShadowColor
+        public static Color? GetSelectedShadowColor(ListBoxItem listBoxItem)
+        {
+            return (Color?)listBoxItem.GetValue(SelectedShadowColorProperty);
+        }
+
+        public static void SetSelectedShadowColor(ListBoxItem listBoxItem, Color? value)
+        {
+            listBoxItem.SetValue(SelectedShadowColorProperty, value);
+        }
+
+        public static readonly DependencyProperty SelectedShadowColorProperty =
+            VisualStateHelper.SelectedShadowColorProperty.AddOwner(typeof(ListBoxItemHelper));
+        #endregion
+
         #region SelectedBorderThickness
         public static Thickness? GetSelectedBorderThickness(ListBoxItem listBoxItem)
         {
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/MenuHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/MenuHelper.cs
index db28208b..f093bd72 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/MenuHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/MenuHelper.cs
@@ -341,6 +341,51 @@ public static void SetTopLevelItemsClickBorderBrush(Menu menu, Brush value)
             DependencyProperty.RegisterAttached("TopLevelItemsClickBorderBrush", typeof(Brush), typeof(MenuHelper));
         #endregion
 
+        #region TopLevelItemsOpenedBackground
+        public static Brush GetTopLevelItemsOpenedBackground(Menu menu)
+        {
+            return (Brush)menu.GetValue(TopLevelItemsOpenedBackgroundProperty);
+        }
+
+        public static void SetTopLevelItemsOpenedBackground(Menu menu, Brush value)
+        {
+            menu.SetValue(TopLevelItemsOpenedBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty TopLevelItemsOpenedBackgroundProperty =
+            DependencyProperty.RegisterAttached("TopLevelItemsOpenedBackground", typeof(Brush), typeof(MenuHelper));
+        #endregion
+
+        #region TopLevelItemsOpenedForeground
+        public static Brush GetTopLevelItemsOpenedForeground(Menu menu)
+        {
+            return (Brush)menu.GetValue(TopLevelItemsOpenedForegroundProperty);
+        }
+
+        public static void SetTopLevelItemsOpenedForeground(Menu menu, Brush value)
+        {
+            menu.SetValue(TopLevelItemsOpenedForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty TopLevelItemsOpenedForegroundProperty =
+            DependencyProperty.RegisterAttached("TopLevelItemsOpenedForeground", typeof(Brush), typeof(MenuHelper));
+        #endregion
+
+        #region TopLevelItemsOpenedBorderBrush
+        public static Brush GetTopLevelItemsOpenedBorderBrush(Menu menu)
+        {
+            return (Brush)menu.GetValue(TopLevelItemsOpenedBorderBrushProperty);
+        }
+
+        public static void SetTopLevelItemsOpenedBorderBrush(Menu menu, Brush value)
+        {
+            menu.SetValue(TopLevelItemsOpenedBorderBrushProperty, value);
+        }
+
+        public static readonly DependencyProperty TopLevelItemsOpenedBorderBrushProperty =
+            DependencyProperty.RegisterAttached("TopLevelItemsOpenedBorderBrush", typeof(Brush), typeof(MenuHelper));
+        #endregion
+
         #region TopLevelItemsCheckedBackground
         public static Brush GetTopLevelItemsCheckedBackground(Menu menu)
         {
@@ -708,6 +753,51 @@ public static void SetSubmenuItemsClickBorderBrush(Menu menu, Brush value)
             DependencyProperty.RegisterAttached("SubmenuItemsClickBorderBrush", typeof(Brush), typeof(MenuHelper));
         #endregion
 
+        #region SubmenuItemsOpenedBackground
+        public static Brush GetSubmenuItemsOpenedBackground(Menu menu)
+        {
+            return (Brush)menu.GetValue(SubmenuItemsOpenedBackgroundProperty);
+        }
+
+        public static void SetSubmenuItemsOpenedBackground(Menu menu, Brush value)
+        {
+            menu.SetValue(SubmenuItemsOpenedBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty SubmenuItemsOpenedBackgroundProperty =
+            DependencyProperty.RegisterAttached("SubmenuItemsOpenedBackground", typeof(Brush), typeof(MenuHelper));
+        #endregion
+
+        #region SubmenuItemsOpenedForeground
+        public static Brush GetSubmenuItemsOpenedForeground(Menu menu)
+        {
+            return (Brush)menu.GetValue(SubmenuItemsOpenedForegroundProperty);
+        }
+
+        public static void SetSubmenuItemsOpenedForeground(Menu menu, Brush value)
+        {
+            menu.SetValue(SubmenuItemsOpenedForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty SubmenuItemsOpenedForegroundProperty =
+            DependencyProperty.RegisterAttached("SubmenuItemsOpenedForeground", typeof(Brush), typeof(MenuHelper));
+        #endregion
+
+        #region SubmenuItemsOpenedBorderBrush
+        public static Brush GetSubmenuItemsOpenedBorderBrush(Menu menu)
+        {
+            return (Brush)menu.GetValue(SubmenuItemsOpenedBorderBrushProperty);
+        }
+
+        public static void SetSubmenuItemsOpenedBorderBrush(Menu menu, Brush value)
+        {
+            menu.SetValue(SubmenuItemsOpenedBorderBrushProperty, value);
+        }
+
+        public static readonly DependencyProperty SubmenuItemsOpenedBorderBrushProperty =
+            DependencyProperty.RegisterAttached("SubmenuItemsOpenedBorderBrush", typeof(Brush), typeof(MenuHelper));
+        #endregion
+
         #region SubmenuItemsCheckedBackground
         public static Brush GetSubmenuItemsCheckedBackground(Menu menu)
         {
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/MenuItemHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/MenuItemHelper.cs
index cad55e3e..c970d563 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/MenuItemHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/MenuItemHelper.cs
@@ -127,6 +127,51 @@ public static void SetClickBorderBrush(MenuItem menuItem, Brush value)
             DependencyProperty.RegisterAttached("ClickBorderBrush", typeof(Brush), typeof(MenuItemHelper));
         #endregion
 
+        #region OpenedBackground
+        public static Brush GetOpenedBackground(MenuItem menuItem)
+        {
+            return (Brush)menuItem.GetValue(OpenedBackgroundProperty);
+        }
+
+        public static void SetOpenedBackground(MenuItem menuItem, Brush value)
+        {
+            menuItem.SetValue(OpenedBackgroundProperty, value);
+        }
+
+        public static readonly DependencyProperty OpenedBackgroundProperty =
+            DependencyProperty.RegisterAttached("OpenedBackground", typeof(Brush), typeof(MenuItemHelper));
+        #endregion
+
+        #region OpenedForeground
+        public static Brush GetOpenedForeground(MenuItem menuItem)
+        {
+            return (Brush)menuItem.GetValue(OpenedForegroundProperty);
+        }
+
+        public static void SetOpenedForeground(MenuItem menuItem, Brush value)
+        {
+            menuItem.SetValue(OpenedForegroundProperty, value);
+        }
+
+        public static readonly DependencyProperty OpenedForegroundProperty =
+            DependencyProperty.RegisterAttached("OpenedForeground", typeof(Brush), typeof(MenuItemHelper));
+        #endregion
+
+        #region OpenedBorderBrush
+        public static Brush GetOpenedBorderBrush(MenuItem menuItem)
+        {
+            return (Brush)menuItem.GetValue(OpenedBorderBrushProperty);
+        }
+
+        public static void SetOpenedBorderBrush(MenuItem menuItem, Brush value)
+        {
+            menuItem.SetValue(OpenedBorderBrushProperty, value);
+        }
+
+        public static readonly DependencyProperty OpenedBorderBrushProperty =
+            DependencyProperty.RegisterAttached("OpenedBorderBrush", typeof(Brush), typeof(MenuItemHelper));
+        #endregion
+
         #region CheckedBackground
         public static Brush GetCheckedBackground(MenuItem menuItem)
         {
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/PasswordBoxHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/PasswordBoxHelper.cs
index 58efd3a6..3a2c85f3 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/PasswordBoxHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/PasswordBoxHelper.cs
@@ -57,18 +57,18 @@ public static void SetIcon(PasswordBox passwordBox, object value)
         #endregion
 
         #region Watermark
-        public static string GetWatermark(PasswordBox passwordBox)
+        public static object GetWatermark(PasswordBox passwordBox)
         {
-            return (string)passwordBox.GetValue(WatermarkProperty);
+            return (object)passwordBox.GetValue(WatermarkProperty);
         }
 
-        public static void SetWatermark(PasswordBox passwordBox, string value)
+        public static void SetWatermark(PasswordBox passwordBox, object value)
         {
             passwordBox.SetValue(WatermarkProperty, value);
         }
 
         public static readonly DependencyProperty WatermarkProperty =
-            DependencyProperty.RegisterAttached("Watermark", typeof(string), typeof(PasswordBoxHelper));
+            DependencyProperty.RegisterAttached("Watermark", typeof(object), typeof(PasswordBoxHelper));
         #endregion
 
         #region WatermarkBrush
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/RadioButtonHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/RadioButtonHelper.cs
index bdc3a857..3928cc2d 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/RadioButtonHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/RadioButtonHelper.cs
@@ -232,19 +232,19 @@ public static void SetNullableBackground(RadioButton radioButton, Brush value)
             DependencyProperty.RegisterAttached("NullableBackground", typeof(Brush), typeof(RadioButtonHelper));
         #endregion
 
-        #region NullableForeround
-        public static Brush GetNullableForeround(RadioButton radioButton)
+        #region NullableForeground
+        public static Brush GetNullableForeground(RadioButton radioButton)
         {
-            return (Brush)radioButton.GetValue(NullableForeroundProperty);
+            return (Brush)radioButton.GetValue(NullableForegroundProperty);
         }
 
-        public static void SetNullableForeround(RadioButton radioButton, Brush value)
+        public static void SetNullableForeground(RadioButton radioButton, Brush value)
         {
-            radioButton.SetValue(NullableForeroundProperty, value);
+            radioButton.SetValue(NullableForegroundProperty, value);
         }
 
-        public static readonly DependencyProperty NullableForeroundProperty =
-            DependencyProperty.RegisterAttached("NullableForeround", typeof(Brush), typeof(RadioButtonHelper));
+        public static readonly DependencyProperty NullableForegroundProperty =
+            DependencyProperty.RegisterAttached("NullableForeground", typeof(Brush), typeof(RadioButtonHelper));
         #endregion
 
         #region NullableBorderBrush
@@ -263,18 +263,18 @@ public static void SetNullableBorderBrush(RadioButton radioButton, Brush value)
         #endregion
 
         #region NullableBorderThickness
-        public static Thickness GetNullableBorderThickness(RadioButton radioButton)
+        public static Thickness? GetNullableBorderThickness(RadioButton radioButton)
         {
-            return (Thickness)radioButton.GetValue(NullableBorderThicknessProperty);
+            return (Thickness?)radioButton.GetValue(NullableBorderThicknessProperty);
         }
 
-        public static void SetNullableBorderThickness(RadioButton radioButton, Thickness value)
+        public static void SetNullableBorderThickness(RadioButton radioButton, Thickness? value)
         {
             radioButton.SetValue(NullableBorderThicknessProperty, value);
         }
 
         public static readonly DependencyProperty NullableBorderThicknessProperty =
-            DependencyProperty.RegisterAttached("NullableBorderThickness", typeof(Thickness), typeof(RadioButtonHelper));
+            DependencyProperty.RegisterAttached("NullableBorderThickness", typeof(Thickness?), typeof(RadioButtonHelper));
         #endregion
 
         #region NullableToggleBrush
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ScrollViewerHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ScrollViewerHelper.cs
index 57162b60..876b480a 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ScrollViewerHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/ScrollViewerHelper.cs
@@ -73,6 +73,21 @@ public static void SetHandleMouseWheel(DependencyObject obj, bool value)
             DependencyProperty.RegisterAttached("HandleMouseWheel", typeof(bool), typeof(ScrollViewerHelper), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
         #endregion
 
+        #region ContentSpacing
+        public static double GetContentSpacing(DependencyObject obj)
+        {
+            return (double)obj.GetValue(ContentSpacingProperty);
+        }
+
+        public static void SetContentSpacing(DependencyObject obj, double value)
+        {
+            obj.SetValue(ContentSpacingProperty, value);
+        }
+
+        public static readonly DependencyProperty ContentSpacingProperty =
+            DependencyProperty.RegisterAttached("ContentSpacing", typeof(double), typeof(ScrollViewerHelper), new FrameworkPropertyMetadata(0d, FrameworkPropertyMetadataOptions.Inherits));
+        #endregion
+
         #endregion
 
         #region Internal Properties
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TabControlHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TabControlHelper.cs
index e6fcf1b2..9410a236 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TabControlHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TabControlHelper.cs
@@ -452,7 +452,7 @@ public static void SetItemsFontSize(TabControl tabControl, double value)
         }
 
         public static readonly DependencyProperty ItemsFontSizeProperty =
-            DependencyProperty.RegisterAttached("ItemsFontSize", typeof(double), typeof(TabControlHelper));
+            DependencyProperty.RegisterAttached("ItemsFontSize", typeof(double), typeof(TabControlHelper), new PropertyMetadata(12d));
         #endregion
 
         #region ItemsCornerRadius
@@ -542,7 +542,7 @@ public static void SetItemsFontFamily(TabControl tabControl, FontFamily value)
         }
 
         public static readonly DependencyProperty ItemsFontFamilyProperty =
-            DependencyProperty.RegisterAttached("ItemsFontFamily", typeof(FontFamily), typeof(TabControlHelper));
+            DependencyProperty.RegisterAttached("ItemsFontFamily", typeof(FontFamily), typeof(TabControlHelper), new PropertyMetadata(SystemFonts.MessageFontFamily));
         #endregion
 
         #region ItemsForeground
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TabItemHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TabItemHelper.cs
index d3bcaaee..01ebb091 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TabItemHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TabItemHelper.cs
@@ -66,8 +66,7 @@ public static void SetFontFamily(TabItem tabItem, FontFamily value)
         }
 
         public static readonly DependencyProperty FontFamilyProperty =
-            DependencyProperty.RegisterAttached("FontFamily", typeof(FontFamily), typeof(TabItemHelper));
-
+            DependencyProperty.RegisterAttached("FontFamily", typeof(FontFamily), typeof(TabItemHelper), new PropertyMetadata(SystemFonts.MessageFontFamily));
         #endregion
 
         #region Foreground
@@ -98,7 +97,7 @@ public static void SetFontSize(TabItem tabItem, double value)
         }
 
         public static readonly DependencyProperty FontSizeProperty =
-            DependencyProperty.RegisterAttached("FontSize", typeof(double), typeof(TabItemHelper));
+            DependencyProperty.RegisterAttached("FontSize", typeof(double), typeof(TabItemHelper), new PropertyMetadata(12d));
 
         #endregion
 
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TextBoxHelper.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TextBoxHelper.cs
index 373bed2c..2083014a 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TextBoxHelper.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/TextBoxHelper.cs
@@ -27,18 +27,18 @@ public static void SetIcon(TextBox textBox, object value)
         #endregion
 
         #region Watermark
-        public static string GetWatermark(TextBox textBox)
+        public static object GetWatermark(TextBox textBox)
         {
-            return (string)textBox.GetValue(WatermarkProperty);
+            return (object)textBox.GetValue(WatermarkProperty);
         }
 
-        public static void SetWatermark(TextBox textBox, string value)
+        public static void SetWatermark(TextBox textBox, object value)
         {
             textBox.SetValue(WatermarkProperty, value);
         }
 
         public static readonly DependencyProperty WatermarkProperty =
-            DependencyProperty.RegisterAttached("Watermark", typeof(string), typeof(TextBoxHelper));
+            DependencyProperty.RegisterAttached("Watermark", typeof(object), typeof(TextBoxHelper));
         #endregion
 
         #region WatermarkBrush
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Panuon.UI.Silver.projitems b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Panuon.UI.Silver.projitems
index eeadf910..a7f36bd4 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Panuon.UI.Silver.projitems
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Panuon.UI.Silver.projitems
@@ -33,6 +33,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Card.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorSelector.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ContentControlX.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\PopupX.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Drawer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DropDown.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\FormGroup.cs" />
@@ -129,6 +131,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Models\WindowEffect\WindowXEffect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Models\SelectedDatesCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Resources\ComponentKeys.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Resources\ConverterKeys.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Resources\StyleKeys.cs" />
   </ItemGroup>
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Properties/AssemblyInfo.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Properties/AssemblyInfo.cs
index 6ecfa459..0d95477c 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Properties/AssemblyInfo.cs
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.15.1")]
-[assembly: AssemblyFileVersion("2.2.15.1")]
+[assembly: AssemblyVersion("2.2.16")]
+[assembly: AssemblyFileVersion("2.2.16")]
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Resources/ComponentKeys.cs b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Resources/ComponentKeys.cs
new file mode 100644
index 00000000..dba1bb1c
--- /dev/null
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Resources/ComponentKeys.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Panuon.UI.Silver.Resources
+{
+    public static class ComponentKeys
+    {
+        public const string ButtonHelperPendingSpinnerStyle = nameof(ButtonHelperPendingSpinnerStyle);
+        public const string ColorPickerClearButtonStyle = nameof(ColorPickerClearButtonStyle);
+        public const string ColorPickerToggleArrowTransformControlStyle = nameof(ColorPickerToggleArrowTransformControlStyle);
+        public const string ColorPickerColorSelectorStyle = nameof(ColorPickerColorSelectorStyle);
+        public const string ColorSelectorDropperThumbStyle = nameof(ColorSelectorDropperThumbStyle);
+        public const string ColorSelectorInputTextBoxStyle = nameof(ColorSelectorInputTextBoxStyle);
+        public const string ColorSelectorSliderStyle = nameof(ColorSelectorSliderStyle);
+        public const string ColorSelectorThumbFenceStyle = nameof(ColorSelectorThumbFenceStyle);
+        public const string ComboBoxHelperClearButtonStyle = nameof(ComboBoxHelperClearButtonStyle);
+        public const string ComboBoxHelperRemoveButtonStyle = nameof(ComboBoxHelperRemoveButtonStyle);
+        public const string ComboBoxHelperToggleArrowTransformControlStyle = nameof(ComboBoxHelperToggleArrowTransformControlStyle);
+        public const string ComboBoxHelperSearchTextBoxStyle = nameof(ComboBoxHelperSearchTextBoxStyle);
+        public const string ContextMenuHelperMenuItemStyle = nameof(ContextMenuHelperMenuItemStyle);
+        public const string DataGridHelperSelectAllButtonStyle = nameof(DataGridHelperSelectAllButtonStyle);
+        public const string DataGridHelperSortArrowTransformControlStyle = nameof(DataGridHelperSortArrowTransformControlStyle);
+        public const string DataGridHelperAutoGeneratedTextBoxStyle = nameof(DataGridHelperAutoGeneratedTextBoxStyle);
+        public const string DataGridHelperAutoGeneratedComboBoxStyle = nameof(DataGridHelperAutoGeneratedComboBoxStyle);
+        public const string DataGridHelperAutoGeneratedCheckBoxStyle = nameof(DataGridHelperAutoGeneratedCheckBoxStyle);
+        public const string ExpanderHelperToggleArrowTransformControlStyle = nameof(ExpanderHelperToggleArrowTransformControlStyle);
+        public const string ListBoxHelperRemoveButtonStyle = nameof(ListBoxHelperRemoveButtonStyle);
+        public const string MessageBoxXWindowXStyle = nameof(MessageBoxXWindowXStyle);
+        public const string MessageBoxXButtonStyle = nameof(MessageBoxXButtonStyle);
+        public const string NoticeBoxNoticeBoxItemStyle = nameof(NoticeBoxNoticeBoxItemStyle);
+        public const string PaginationTurnPageButtonStyle = nameof(PaginationTurnPageButtonStyle);
+        public const string PaginationPaginationItemStyle = nameof(PaginationPaginationItemStyle);
+        public const string PaginationOmittingTextBlockStyle = nameof(PaginationOmittingTextBlockStyle);
+        public const string PasswordBoxHelperClearButtonStyle = nameof(PasswordBoxHelperClearButtonStyle);
+        public const string PasswordBoxHelperPlainButtonStyle = nameof(PasswordBoxHelperPlainButtonStyle);
+        public const string PendingBoxCancelButtonStyle = nameof(PendingBoxCancelButtonStyle);
+        public const string PendingBoxSpinnerStyle = nameof(PendingBoxSpinnerStyle);
+        public const string PendingBoxWindowStyle = nameof(PendingBoxWindowStyle);
+        public const string RepeatButtonHelperPendingSpinnerStyle = nameof(RepeatButtonHelperPendingSpinnerStyle);
+        public const string ScrollBarHelperScrollButtonStyle = nameof(ScrollBarHelperScrollButtonStyle);
+        public const string SliderHelperThumbStyle = nameof(SliderHelperThumbStyle);
+        public const string TabControlHelperRemoveButtonStyle = nameof(TabControlHelperRemoveButtonStyle);
+        public const string TextBoxHelperClearButtonStyle = nameof(TextBoxHelperClearButtonStyle);
+        public const string ThumbFenceThumbStyle = nameof(ThumbFenceThumbStyle);
+        public const string ToggleButtonHelperPendingSpinnerStyle = nameof(ToggleButtonHelperPendingSpinnerStyle);
+        public const string TreeViewHelperToggleArrowToggleButtonStyle = nameof(TreeViewHelperToggleArrowToggleButtonStyle);
+        public const string WindowXCaptionMinimizeButtonStyle = nameof(WindowXCaptionMinimizeButtonStyle);
+        public const string WindowXCaptionMaximizeButtonStyle = nameof(WindowXCaptionMaximizeButtonStyle);
+        public const string WindowXCaptionCloseButtonStyle = nameof(WindowXCaptionCloseButtonStyle);
+        public const string WindowXModalButtonStyle = nameof(WindowXModalButtonStyle);
+    }
+}
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Themes/Generic.Core.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Themes/Generic.Core.xaml
index 08a8253a..ba4e4595 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Themes/Generic.Core.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Themes/Generic.Core.xaml
@@ -7,8 +7,6 @@
                     xmlns:irs="clr-namespace:Panuon.UI.Silver.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Styles/CardStyle.xaml" />
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Styles/CalendarXStyle.xaml" />
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Styles/CalendarXItemStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Styles/ColorPickerStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Styles/ColorSelectorStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.UI.Silver;component/Styles/ContentControlXStyle.xaml" />