From b41c3fd80b4f1bf687967126ee978c74c54b4b37 Mon Sep 17 00:00:00 2001
From: Dino Chan <dino.chan@live.com>
Date: Sat, 4 May 2019 15:46:49 +0800
Subject: [PATCH 1/5] ..

---
 .../Kino.Toolkit.Wpf.Samples/HomePage.xaml    |   2 +-
 .../Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec  |   4 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../SkeletonScreen/DispatcherContainer.cs     |  12 ++
 .../SkeletonScreen/InteractiveHostVisual.cs   |   8 +
 .../VisualTargetPresentationSource.cs         | 167 ++++++++++++++++++
 .../TextBlock/TextBlockService.cs             |   4 +-
 7 files changed, 194 insertions(+), 7 deletions(-)
 create mode 100644 Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/DispatcherContainer.cs
 create mode 100644 Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/InteractiveHostVisual.cs
 create mode 100644 Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/VisualTargetPresentationSource.cs

diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml
index f642e48..f456c4b 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml
@@ -197,7 +197,7 @@
                 <TextBlock Text="About"
                            FontSize="20"
                            Foreground="#FF333333" />
-                <TextBlock Text="Version 1.3.0"
+                <TextBlock Text="Version 1.3.1"
                            Margin="0,10" />
                 <kino:KinoHyperlinkButton Content="Github"
                                           NavigateUri="https://github.com/DinoChan/Kino.Toolkit.Wpf" />
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
index d6ff561..12f4421 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <title>Kino.Toolkit.Wpf</title>
     <authors>dino.c</authors>
     <owners>dino.c</owners>
@@ -11,7 +11,7 @@
     <iconUrl>https://github.com/DinoChan/Kino.Toolkit.Wpf/blob/master/Logo.png?raw=true</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A set of wpf toolkit.</description>
-    <releaseNotes>1.3.0</releaseNotes>
+    <releaseNotes>1.3.1</releaseNotes>
     <copyright>Copyright 2019 dino.c</copyright>
     <tags>WPF Control Toolkit Xaml</tags>
     <dependencies>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
index a32e1a6..9d4f096 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
@@ -45,8 +45,8 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
 
 [assembly: XmlnsPrefix("https://github.com/DinoChan/Kino.Toolkit.Wpf", "kino")]
 [assembly: XmlnsDefinition("https://github.com/DinoChan/Kino.Toolkit.Wpf", "Kino.Toolkit.Wpf")]
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/DispatcherContainer.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/DispatcherContainer.cs
new file mode 100644
index 0000000..84558e8
--- /dev/null
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/DispatcherContainer.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Kino.Toolkit.Wpf.SkeletonScreen
+{
+    class DispatcherContainer
+    {
+    }
+}
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/InteractiveHostVisual.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/InteractiveHostVisual.cs
new file mode 100644
index 0000000..f0a7e13
--- /dev/null
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/InteractiveHostVisual.cs
@@ -0,0 +1,8 @@
+using System.Windows.Media;
+
+namespace Kino.Toolkit.Wpf.Primitives
+{
+    public class InteractiveHostVisual : HostVisual
+    {
+    }
+}
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/VisualTargetPresentationSource.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/VisualTargetPresentationSource.cs
new file mode 100644
index 0000000..d34f3bc
--- /dev/null
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/VisualTargetPresentationSource.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Kino.Toolkit.Wpf.Primitives
+{
+    /// <summary>
+    ///     The VisualTargetPresentationSource represents the root
+    ///     of a visual subtree owned by a different thread that the
+    ///     visual tree in which is is displayed.
+    /// </summary>
+    /// <remarks>
+    ///     A HostVisual belongs to the same UI thread that owns the
+    ///     visual tree in which it resides.
+    ///     
+    ///     A HostVisual can reference a VisualTarget owned by another
+    ///     thread.
+    ///     
+    ///     A VisualTarget has a root visual.
+    ///     
+    ///     VisualTargetPresentationSource wraps the VisualTarget and
+    ///     enables basic functionality like Loaded, which depends on
+    ///     a PresentationSource being available.
+    /// </remarks>
+    public class VisualTargetPresentationSource : PresentationSource, IDisposable
+    {
+        public VisualTargetPresentationSource(HostVisual hostVisual)
+        {
+            _visualTarget = new VisualTarget(hostVisual);
+        }
+
+        public override Visual RootVisual
+        {
+            get => _visualTarget.RootVisual;
+            set
+            {
+                if (IsDisposed)
+                {
+                    throw new ObjectDisposedException("VisualTarget");
+                }
+
+                var oldRoot = _visualTarget.RootVisual;
+
+                // Set the root visual of the VisualTarget.  This visual will
+                // now be used to visually compose the scene.
+                _visualTarget.RootVisual = value;
+
+                // Hook the SizeChanged event on framework elements for all
+                // future changed to the layout size of our root, and manually
+                // trigger a size change.
+                if (oldRoot is FrameworkElement oldRootFe)
+                {
+                    oldRootFe.SizeChanged -= root_SizeChanged;
+                }
+                if (value is FrameworkElement rootFe)
+                {
+                    rootFe.SizeChanged += root_SizeChanged;
+                    rootFe.DataContext = _dataContext;
+
+                    if (_propertyName != null)
+                    {
+                        var myBinding = new Binding(_propertyName)
+                        {
+                            Source = _dataContext
+                        };
+                        rootFe.SetBinding(TextBlock.TextProperty, myBinding);
+                    }
+                }
+
+                // Tell the PresentationSource that the root visual has
+                // changed.  This kicks off a bunch of stuff like the
+                // Loaded event.
+                RootChanged(oldRoot, value);
+
+                // Kickoff layout...
+                if (value is UIElement rootElement)
+                {
+                    rootElement.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                    rootElement.Arrange(new Rect(rootElement.DesiredSize));
+                }
+            }
+        }
+
+        public object DataContext
+        {
+            get => _dataContext;
+            set
+            {
+                if (IsDisposed)
+                {
+                    throw new ObjectDisposedException("VisualTarget");
+                }
+
+                if (_dataContext == value)
+                {
+                    return;
+                }
+
+                _dataContext = value;
+                if (_visualTarget.RootVisual is FrameworkElement rootElement)
+                {
+                    rootElement.DataContext = _dataContext;
+                }
+            }
+        }
+
+        public string PropertyName
+        {
+            get => _propertyName;
+            set
+            {
+                if (IsDisposed)
+                {
+                    throw new ObjectDisposedException("VisualTarget");
+                }
+
+                _propertyName = value;
+
+                if (_visualTarget.RootVisual is TextBlock rootElement)
+                {
+                    if (!rootElement.CheckAccess())
+                    {
+                        throw new InvalidOperationException("What?");
+                    }
+
+                    var myBinding = new Binding(_propertyName)
+                    {
+                        Source = _dataContext
+                    };
+                    rootElement.SetBinding(TextBlock.TextProperty, myBinding);
+                }
+            }
+        }
+
+        public event SizeChangedEventHandler SizeChanged;
+
+        public override bool IsDisposed => _isDisposed;
+
+        protected override CompositionTarget GetCompositionTargetCore()
+        {
+            return _visualTarget;
+        }
+
+        private void root_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (IsDisposed)
+            {
+                return;
+            }
+
+            SizeChanged?.Invoke(this, e);
+        }
+
+        private readonly VisualTarget _visualTarget;
+        private object _dataContext;
+        private string _propertyName;
+        private bool _isDisposed;
+
+        public void Dispose()
+        {
+            _visualTarget?.Dispose();
+            _isDisposed = true;
+        }
+    }
+}
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TextBlock/TextBlockService.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TextBlock/TextBlockService.cs
index 111ee16..a24f3a7 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TextBlock/TextBlockService.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TextBlock/TextBlockService.cs
@@ -20,14 +20,14 @@ public class TextBlockService
         /// </summary>
         /// <param name="obj">从中读取属性值的元素。</param>
         /// <returns>从属性存储获取的属性值。</returns>
-        public static TextBlockHighlightSource GetHighlightText(DependencyObject obj) => (TextBlockHighlightSource)obj.GetValue(HighlightTextProperty);
+        public static TextBlockHighlightSource GetHighlightText(TextBlock textBlock) => (TextBlockHighlightSource)textBlock.GetValue(HighlightTextProperty);
 
         /// <summary>
         /// 将 HighlightText 依赖项属性的值设置为指定元素。
         /// </summary>
         /// <param name="obj">对其设置属性值的元素。</param>
         /// <param name="value">要设置的值。</param>
-        public static void SetHighlightText(DependencyObject obj, TextBlockHighlightSource value) => obj.SetValue(HighlightTextProperty, value);
+        public static void SetHighlightText(TextBlock textBlock, TextBlockHighlightSource value) => textBlock.SetValue(HighlightTextProperty, value);
 
         /// <summary>
         /// 标识 HighlightText 依赖项属性。

From b06550018c34919e3ab138a412fe4076e95640f6 Mon Sep 17 00:00:00 2001
From: Jinhua Chen <Jinhua.Chen@omec-instruments.com>
Date: Sun, 5 May 2019 11:11:26 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=96=E6=B6=88kino=E5=89=8D=E7=BC=80?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=BA?=
 =?UTF-8?q?1.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Kino.Toolkit.Wpf.Samples/App.xaml         |  10 +-
 .../ButtonSample.Section1.txt                 |  16 +-
 .../FormSample.Section2.txt                   |   8 +-
 .../Kino.Toolkit.Wpf.Samples/HomePage.xaml    |  39 +++--
 .../Kino.Toolkit.Wpf.Samples/HomePage.xaml.cs |   5 +-
 .../Patterns/Curd/CurdSample.xaml             |   6 +-
 .../Patterns/Curd/TestModelWindow.xaml        |  22 +--
 .../Patterns/SignIn/SignInView.xaml           |  24 +--
 .../Patterns/SignIn/SignUpView.xaml           |  40 ++---
 .../Patterns/SignIn/SimpleShell.xaml          |  12 +-
 .../Patterns/SignIn/UserinfoDialog.xaml       |  18 +-
 .../Samples/Button/ButtonSample.xaml          |  36 ++--
 .../Samples/Button/ButtonSample.xaml.cs       |   2 +-
 .../Samples/DataGrid/DataGridSample.xaml      |   8 +-
 .../Samples/DataPager/DataPagerSample.xaml    |  44 ++---
 .../Samples/Expander/ExpanderSample.xaml      |  16 +-
 .../Samples/Expander/ExpanderSample.xaml.cs   |   4 +-
 .../Samples/Form/FormItemSample.xaml          | 120 ++++++-------
 .../Samples/Form/FormItemSample.xaml.cs       |   6 +-
 .../Samples/Form/FormSample.xaml              | 162 +++++++++---------
 .../Samples/Form/FormSampleWindow.xaml        |  50 +++---
 .../Samples/Form/FormSampleWindow.xaml.cs     |   4 +-
 .../Samples/ListBox/ListBoxSample.xaml        |  26 +--
 .../Samples/Paging/PagingSample.xaml          |   4 +-
 .../ProgressRing/ProgressRingSample.xaml      |   4 +-
 .../RadioButtonMenuItemSample.xaml            |  32 ++--
 .../Samples/Resizer/ResizerSample.xaml        |  44 ++---
 .../Samples/SquareBox/SquareBoxSample.xaml    |  24 +--
 .../StateIndicator/StateIndicatorSample.xaml  |  10 +-
 .../TransitioningContentControlSample.xaml    |  12 +-
 .../TransitioningContentControlSample.xaml.cs |  10 +-
 .../Samples/Window/TestRibbonWindow.xaml      |  12 +-
 .../Samples/Window/TestWindow.xaml            |  12 +-
 .../Samples/Window/WindowSample.xaml          |  11 +-
 .../SourceFiles/ButtonSample.Section1.txt     |  16 +-
 .../SourceFiles/ButtonSample.Section3.txt     |   8 +-
 .../SourceFiles/ButtonSample.Section4.txt     |   2 +-
 .../SourceFiles/DataGridSample.Section1.txt   |   4 +-
 .../SourceFiles/DataPagerSample.Section1.txt  |  44 ++---
 .../SourceFiles/ExpanderSample.Section1.txt   |  12 +-
 .../SourceFiles/ExpanderSample.Section2.txt   |   4 +-
 .../SourceFiles/FormItemSample.Section1.txt   |  38 ++--
 .../SourceFiles/FormItemSample.Section2.txt   |  34 ++--
 .../SourceFiles/FormItemSample.Section3.txt   |   4 +-
 .../SourceFiles/FormItemSample.Section4.txt   |   4 +-
 .../SourceFiles/FormSample.Section1.txt       |  52 +++---
 .../SourceFiles/FormSample.Section2.txt       |  24 +--
 .../SourceFiles/FormSample.Section3.txt       |  34 ++--
 .../SourceFiles/FormSample.Section4.txt       |  48 +++---
 .../SourceFiles/FormSample.Section5.txt       |   2 +-
 ...e.Section1 - \345\244\215\345\210\266.txt" |   8 +-
 .../SourceFiles/ListBoxSample.Section1.txt    |  12 +-
 .../SourceFiles/PagingSample.Section1.txt     |   2 +-
 .../SourceFiles/PagingSample.Section3.txt     |   2 +-
 .../ProgressRingSample.Section1.txt           |   4 +-
 .../RadioButtonMenuItemSample.Section1.txt    |  22 +--
 .../SourceFiles/ResizerSample.Section1.txt    |   8 +-
 .../SourceFiles/ResizerSample.Section2.txt    |   4 +-
 .../SourceFiles/ResizerSample.Section3.txt    |   8 +-
 .../SourceFiles/ResizerSample.Section4.txt    |   4 +-
 ...e.Section5 - \345\244\215\345\210\266.txt" |   8 +-
 .../SourceFiles/ResizerSample.Section5.txt    |   8 +-
 .../SourceFiles/SquareBoxSample.Section1.txt  |  24 +--
 .../StateIndicatorSample.Section1.txt         |  10 +-
 ...sitioningContentControlSample.Section1.txt |   2 +-
 ...sitioningContentControlSample.Section3.txt |   2 +-
 ...sitioningContentControlSample.Section5.txt |   6 +-
 .../SourceFiles/WindowSample.Section1.txt     |   6 +-
 .../Themes/Generic.xaml                       |   6 +-
 .../Button/{KinoButton.xaml => Button.xaml}   |  16 +-
 .../{KinoButton.cs => ExtendedButton.cs}      |  14 +-
 ...oHyperlinkButton.cs => HyperlinkButton.cs} |  12 +-
 Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Class1.cs   |  30 ++++
 .../{KinoDataGrid.xaml => DataGrid.xaml}      |   6 +-
 .../{KinoDataGrid.cs => ExtendedDataGrid.cs}  |   8 +-
 .../{KinoDataPager.cs => DataPager.cs}        | 126 +++++++-------
 .../{KinoDataPager.xaml => DataPager.xaml}    |   6 +-
 .../{KinoExpander.xaml => Expander.xaml}      |   4 +-
 .../{KinoExpander.cs => ExtendedExpander.cs}  |   6 +-
 ...oForm.Properties.cs => Form.Properties.cs} |  22 +--
 .../Form/{KinoForm.cs => Form.cs}             |  36 ++--
 .../Form/{KinoForm.xaml => Form.xaml}         |  22 +--
 .../Form/{KinoFormItem.cs => FormItem.cs}     |  18 +-
 ...{KinoFormSeparator.cs => FormSeparator.cs} |   8 +-
 .../Form/{KinoFormTitle.cs => FormTitle.cs}   |  12 +-
 ...oFormFunctionBar.cs => FormFunctionBar.cs} |   6 +-
 ...mFunctionBar.xaml => FormFunctionBar.xaml} |  12 +-
 .../{KinoFunctionBar.cs => FunctionBar.cs}    |   4 +-
 ...{KinoFunctionBar.xaml => FunctionBar.xaml} |   4 +-
 ...dowFunctionBar.cs => WindowFunctionBar.cs} |   6 +-
 ...unctionBar.xaml => WindowFunctionBar.xaml} |   4 +-
 .../Kino.Toolkit.Wpf/GlobalSuppressions.cs    |  50 +++---
 ...l.cs => ExtendedHeaderedContentControl.cs} |   8 +-
 ...ntrol.xaml => HeaderedContentControl.xaml} |   8 +-
 .../Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj  | 100 +++++------
 .../Layout/{KinoPageTitle.cs => PageTitle.cs} |   8 +-
 .../{KinoPageTitle.xaml => PageTitle.xaml}    |   4 +-
 .../{KinoListBox.cs => ExtendedListBox.cs}    |   4 +-
 .../{KinoListBox.xaml => ListBox.xaml}        |   4 +-
 .../{KinoListBoxItem.cs => ListBoxItem.cs}    |  20 +--
 .../{KinoProgressRing.cs => ProgressRing.cs}  |  12 +-
 ...inoProgressRing.xaml => ProgressRing.xaml} |   4 +-
 .../ProgressRing/TemplateSettingValues.cs     |   2 +-
 .../Properties/AssemblyInfo.cs                |   6 +-
 ...ttonMenuItem.cs => RadioButtonMenuItem.cs} |  12 +-
 ...MenuItem.xaml => RadioButtonMenuItem.xaml} |   4 +-
 .../Resizer/{KinoResizer.cs => Resizer.cs}    |  18 +-
 .../{KinoResizer.xaml => Resizer.xaml}        |   4 +-
 ...crollViewer.cs => ExtendedScrollViewer.cs} |   2 +-
 .../KinoSelectionCheckBox.cs                  |   6 +-
 ...inoSkeletonScreen.cs => SkeletonScreen.cs} |  10 +-
 ...keletonScreen.xaml => SkeletonScreen.xaml} |   4 +-
 .../{KinoSquareBox.cs => SquareBox.cs}        |  16 +-
 .../{KinoSquareBox.xaml => SquareBox.xaml}    |   4 +-
 ...ttings.cs => SquareBoxTemplateSettings.cs} |   6 +-
 ...inoStateIndicator.cs => StateIndicator.cs} |  10 +-
 ...tateIndicator.xaml => StateIndicator.xaml} |  20 +--
 .../Kino.Toolkit.Wpf/Themes/Generic.xaml      |  36 ++--
 ...ansitioningContentControl.VisualStates.cs} |   2 +-
 ...trol.cs => TransitioningContentControl.cs} |  28 +--
 ....xaml => TransitioningContentControl.xaml} |   4 +-
 ...idationContent.cs => ValidationContent.cs} |   6 +-
 ...ionContent.xaml => ValidationContent.xaml} |   2 +-
 ...ibbonWindow.cs => ExtendedRibbonWindow.cs} |  26 +--
 .../{KinoWindow.cs => ExtendedWindow.cs}      |  22 +--
 .../Window/{KinoWindow.xaml => Window.xaml}   |   8 +-
 126 files changed, 1113 insertions(+), 1078 deletions(-)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/{KinoButton.xaml => Button.xaml} (96%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/{KinoButton.cs => ExtendedButton.cs} (85%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/{KinoHyperlinkButton.cs => HyperlinkButton.cs} (91%)
 create mode 100644 Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Class1.cs
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/{KinoDataGrid.xaml => DataGrid.xaml} (97%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/{KinoDataGrid.cs => ExtendedDataGrid.cs} (77%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/{KinoDataPager.cs => DataPager.cs} (95%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/{KinoDataPager.xaml => DataPager.xaml} (99%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/{KinoExpander.xaml => Expander.xaml} (99%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/{KinoExpander.cs => ExtendedExpander.cs} (61%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/{KinoForm.Properties.cs => Form.Properties.cs} (88%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/{KinoForm.cs => Form.cs} (84%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/{KinoForm.xaml => Form.xaml} (91%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/{KinoFormItem.cs => FormItem.cs} (86%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/{KinoFormSeparator.cs => FormSeparator.cs} (51%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/{KinoFormTitle.cs => FormTitle.cs} (81%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/{KinoFormFunctionBar.cs => FormFunctionBar.cs} (54%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/{KinoFormFunctionBar.xaml => FormFunctionBar.xaml} (88%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/{KinoFunctionBar.cs => FunctionBar.cs} (72%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/{KinoFunctionBar.xaml => FunctionBar.xaml} (84%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/{KinoWindowFunctionBar.cs => WindowFunctionBar.cs} (53%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/{KinoWindowFunctionBar.xaml => WindowFunctionBar.xaml} (99%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/{KinoHeaderedContentControl.cs => ExtendedHeaderedContentControl.cs} (87%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/{KinoHeaderedContentControl.xaml => HeaderedContentControl.xaml} (93%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/{KinoPageTitle.cs => PageTitle.cs} (86%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/{KinoPageTitle.xaml => PageTitle.xaml} (93%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/{KinoListBox.cs => ExtendedListBox.cs} (89%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/{KinoListBox.xaml => ListBox.xaml} (98%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/{KinoListBoxItem.cs => ListBoxItem.cs} (80%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/{KinoProgressRing.cs => ProgressRing.cs} (88%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/{KinoProgressRing.xaml => ProgressRing.xaml} (99%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/{KinoRadioButtonMenuItem.cs => RadioButtonMenuItem.cs} (80%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/{KinoRadioButtonMenuItem.xaml => RadioButtonMenuItem.xaml} (99%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/{KinoResizer.cs => Resizer.cs} (93%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/{KinoResizer.xaml => Resizer.xaml} (93%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ScrollViewer/{KinoScrollViewer.cs => ExtendedScrollViewer.cs} (92%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/{KinoSkeletonScreen.cs => SkeletonScreen.cs} (85%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/{KinoSkeletonScreen.xaml => SkeletonScreen.xaml} (98%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/{KinoSquareBox.cs => SquareBox.cs} (68%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/{KinoSquareBox.xaml => SquareBox.xaml} (87%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/{KinoSquareBoxTemplateSettings.cs => SquareBoxTemplateSettings.cs} (72%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/{KinoStateIndicator.cs => StateIndicator.cs} (92%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/{KinoStateIndicator.xaml => StateIndicator.xaml} (93%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/{KinoTransitioningContentControl.VisualStates.cs => TransitioningContentControl.VisualStates.cs} (88%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/{KinoTransitioningContentControl.cs => TransitioningContentControl.cs} (92%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/{KinoTransitioningContentControl.xaml => TransitioningContentControl.xaml} (99%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/{KinoValidationContent.cs => ValidationContent.cs} (63%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/{KinoValidationContent.xaml => ValidationContent.xaml} (99%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/{KinoRibbonWindow.cs => ExtendedRibbonWindow.cs} (83%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/{KinoWindow.cs => ExtendedWindow.cs} (80%)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/{KinoWindow.xaml => Window.xaml} (99%)

diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/App.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/App.xaml
index 9f2d926..9ceb8b2 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/App.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/App.xaml
@@ -14,7 +14,7 @@
                         Value="/Kino.Toolkit.Wpf.Samples;component/Assets/#Font Awesome 5 Free Regular" />
             </Style>
 
-            <Style TargetType="kino:KinoFormItem"
+            <Style TargetType="kino:FormItem"
                    x:Key="ControlPanelFromItemStyle">
                 <Setter Property="IsTabStop"
                         Value="False" />
@@ -36,7 +36,7 @@
                 </Setter>
                 <Setter Property="Template">
                     <Setter.Value>
-                        <ControlTemplate TargetType="kino:KinoFormItem">
+                        <ControlTemplate TargetType="kino:FormItem">
                             <StackPanel x:Name="Root">
                                 <ContentPresenter Content="{TemplateBinding Label}"
                                                   ContentTemplate="{TemplateBinding LabelTemplate}" />
@@ -53,13 +53,13 @@
             </Style>
 
 
-            <Style TargetType="kino:KinoForm"
+            <Style TargetType="kino:Form"
                    x:Key="ControlPanelFromStyle">
                 <Setter Property="kino:FocusService.IsAutoFocus" Value="False"/>
                 <Style.Resources>
                     <ResourceDictionary>
                         <Style BasedOn="{StaticResource ControlPanelFromItemStyle}"
-                               TargetType="{x:Type kino:KinoFormItem}" />
+                               TargetType="{x:Type kino:FormItem}" />
                     </ResourceDictionary>
                 </Style.Resources>
             </Style>
@@ -75,7 +75,7 @@
 
             <ControlTemplate x:Key="ErrorTemplate">
                 <AdornedElementPlaceholder>
-                    <kino:KinoValidationContent  />
+                    <kino:ValidationContent  />
                 </AdornedElementPlaceholder>
             </ControlTemplate>
         </ResourceDictionary>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/ButtonSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/ButtonSample.Section1.txt
index 2a310a6..7ed4ebf 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/ButtonSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/ButtonSample.Section1.txt
@@ -1,18 +1,18 @@
-<kino:KinoButton Content="bookmark"
+<kino:ExtendedButton Content="bookmark"
                  MinWidth="18"
                  x:Name="BookmarkButton"
                  HorizontalAlignment="Left"
                  State="{Binding SelectedItem,ElementName=StatesListBox}">
-    <kino:KinoButton.Icon>
+    <kino:ExtendedButton.Icon>
         <TextBlock Style="{StaticResource FontAwesome}"
                    Text="&#xf02e;" />
-    </kino:KinoButton.Icon>
-</kino:KinoButton>
+    </kino:ExtendedButton.Icon>
+</kino:ExtendedButton>
 
 <local:SampleSection.ControlPanel>
-    <kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
+    <kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
         <StackPanel Orientation="Horizontal"
-                    kino:KinoForm.Label="Content And Icon">
+                    kino:Form.Label="Content And Icon">
             <RadioButton Content="Content Only"
                          Checked="OnContentOnlyCheck" />
             <RadioButton Content="Icon Only"
@@ -26,6 +26,6 @@
         <ListBox x:Name="StatesListBox"
                  HorizontalAlignment="Left"
                  Width="250"
-                 kino:KinoForm.Label="State" />
-    </kino:KinoForm>
+                 kino:Form.Label="State" />
+    </kino:Form>
 </local:SampleSection.ControlPanel>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/FormSample.Section2.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/FormSample.Section2.txt
index 490ab7f..b039abb 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/FormSample.Section2.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/FormSample.Section2.txt
@@ -1,4 +1,4 @@
-<Style TargetType="kino:KinoFormItem">
+<Style TargetType="kino:FormItem">
     <Setter Property="Margin"
             Value="0,4,0,8" />
     <Setter Property="Padding"
@@ -15,7 +15,7 @@
     </Setter>
     <Setter Property="Template">
         <Setter.Value>
-            <ControlTemplate TargetType="kino:KinoFormItem">
+            <ControlTemplate TargetType="kino:FormItem">
                 <StackPanel x:Name="Root">
                     <StackPanel Orientation="Horizontal">
                         <ContentPresenter Content="{TemplateBinding Header}"
@@ -39,12 +39,12 @@
     </Setter>
 </Style>
 
-<Style TargetType="kino:KinoFormTitle">
+<Style TargetType="kino:FormTitle">
     <Setter Property="Margin"
             Value="0,4,4,8" />
 </Style>
 
-<Style TargetType="kino:KinoFormSeparator">
+<Style TargetType="kino:FormSeparator">
     <Setter Property="Margin"
             Value="0,4,0,8" />
 </Style>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml
index f456c4b..9d386ee 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml
@@ -10,7 +10,7 @@
              d:DesignHeight="450"
              d:DesignWidth="800">
     <FrameworkElement.Resources>
-        <Style TargetType="kino:KinoHyperlinkButton">
+        <Style TargetType="kino:HyperlinkButton">
             <Setter Property="Margin"
                     Value="0,10,20,10" />
             <Setter Property="MinWidth"
@@ -157,37 +157,37 @@
                            FontSize="20"
                            Foreground="#FF333333" />
                 <WrapPanel x:Name="ControlsPanel">
-                    <kino:KinoHyperlinkButton Content="Button"
+                    <kino:HyperlinkButton Content="Button"
                                               Tag="{x:Type local:ButtonSample}" />
-                    <kino:KinoHyperlinkButton Content="TransitioningContentControl"
+                    <kino:HyperlinkButton Content="TransitioningContentControl"
                                               Tag="{x:Type local:TransitioningContentControlSample}" />
-                    <kino:KinoHyperlinkButton Content="ProgressRing"
+                    <kino:HyperlinkButton Content="ProgressRing"
                                               Tag="{x:Type local:ProgressRingSample}" />
-                    <kino:KinoHyperlinkButton Content="StateIndicator"
+                    <kino:HyperlinkButton Content="StateIndicator"
                                               Tag="{x:Type local:StateIndicatorSample}" />
-                    <kino:KinoHyperlinkButton Content="Window"
+                    <kino:HyperlinkButton Content="Window"
                                               Tag="{x:Type local:WindowSample}" />
-                    <kino:KinoHyperlinkButton Content="Resizer"
+                    <kino:HyperlinkButton Content="Resizer"
                                               Tag="{x:Type local:ResizerSample}" />
-                    <kino:KinoHyperlinkButton Content="Expander"
+                    <kino:HyperlinkButton Content="Expander"
                                               Tag="{x:Type local:ExpanderSample}" />
-                    <kino:KinoHyperlinkButton Content="SquareBox"
+                    <kino:HyperlinkButton Content="SquareBox"
                                               Tag="{x:Type local:SquareBoxSample}" />
-                    <kino:KinoHyperlinkButton Content="FormItem"
+                    <kino:HyperlinkButton Content="FormItem"
                                               Tag="{x:Type local:FormItemSample}" />
-                    <kino:KinoHyperlinkButton Content="Form"
+                    <kino:HyperlinkButton Content="Form"
                                               Tag="{x:Type local:FormSample}" />
-                    <kino:KinoHyperlinkButton Content="RadioButtonMenuItem"
+                    <kino:HyperlinkButton Content="RadioButtonMenuItem"
                                               Tag="{x:Type local:RadioButtonMenuItemSample}" />
-                    <kino:KinoHyperlinkButton Content="DataPager"
+                    <kino:HyperlinkButton Content="DataPager"
                                               Tag="{x:Type local:DataPagerSample}" />
-                    <kino:KinoHyperlinkButton Content="ListBox"
+                    <kino:HyperlinkButton Content="ListBox"
                                               Tag="{x:Type local:ListBoxSample}" />
-                    <kino:KinoHyperlinkButton Content="DataGrid"
+                    <kino:HyperlinkButton Content="DataGrid"
                                               Tag="{x:Type local:DataGridSample}" />
-                    <kino:KinoHyperlinkButton Content="Paging"
+                    <kino:HyperlinkButton Content="Paging"
                                               Tag="{x:Type local:PagingSample}" />
-                    <kino:KinoHyperlinkButton Content="Highlight"
+                    <kino:HyperlinkButton Content="Highlight"
                                               Tag="{x:Type local:HighlightSample}" />
                 </WrapPanel>
                 <Rectangle Height="1"
@@ -198,8 +198,9 @@
                            FontSize="20"
                            Foreground="#FF333333" />
                 <TextBlock Text="Version 1.3.1"
-                           Margin="0,10" />
-                <kino:KinoHyperlinkButton Content="Github"
+                           Margin="0,10"
+                           x:Name="VersionElement"/>
+                <kino:HyperlinkButton Content="Github"
                                           NavigateUri="https://github.com/DinoChan/Kino.Toolkit.Wpf" />
             </StackPanel>
         </ScrollViewer>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml.cs
index ad133a7..1a53b36 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -23,7 +24,9 @@ public partial class HomePage : UserControl
         public HomePage()
         {
             InitializeComponent();
-            foreach (var button in ControlsPanel.Children.OfType<KinoHyperlinkButton>())
+            var version = Assembly.GetAssembly(typeof(ExtendedButton)).GetName().Version;
+            VersionElement.Text = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
+            foreach (var button in ControlsPanel.Children.OfType<HyperlinkButton>())
             {
                 button.Click += (s, e) =>
                 {
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/CurdSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/CurdSample.xaml
index db50573..a6851ce 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/CurdSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/CurdSample.xaml
@@ -55,7 +55,7 @@
                     </Button>
                 </StackPanel>
             </Grid>
-            <kino:KinoDataGrid Grid.Row="1"
+            <kino:ExtendedDataGrid Grid.Row="1"
                                Margin="0,8,0,0"
                                IsReadOnly="True"
                                AutoGenerateColumns="False"
@@ -70,8 +70,8 @@
                                         Binding="{Binding Age}"
                                         SortMemberPath="Age" />
                 </DataGrid.Columns>
-            </kino:KinoDataGrid>
-            <kino:KinoDataPager Source="{Binding}"
+            </kino:ExtendedDataGrid>
+            <kino:DataPager Source="{Binding}"
                                 Grid.Row="2"
                                 DisplayMode="FirstLastPreviousNextNumeric" />
         </Grid>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/TestModelWindow.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/TestModelWindow.xaml
index b4200ba..2864888 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/TestModelWindow.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/TestModelWindow.xaml
@@ -1,4 +1,4 @@
-<kino:KinoWindow x:Class="Kino.Toolkit.Wpf.Samples.TestModelWindow"
+<kino:ExtendedWindow x:Class="Kino.Toolkit.Wpf.Samples.TestModelWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -15,23 +15,23 @@
                  Width="800">
     <Grid Width="400">
         <xctk:BusyIndicator x:Name="BusyIndicator">
-            <kino:KinoForm>
-                <kino:KinoFormTitle Content="TestModel" />
-                <TextBox kino:KinoForm.Label="Name"
+            <kino:Form>
+                <kino:FormTitle Content="TestModel" />
+                <TextBox kino:Form.Label="Name"
                          Text="{Binding Name}" />
-                <xctk:IntegerUpDown kino:KinoForm.Label="Age"
+                <xctk:IntegerUpDown kino:Form.Label="Age"
                                     Value="{Binding Age,Mode=TwoWay}" />
-                <kino:KinoForm.FunctionBar>
-                    <kino:KinoFormFunctionBar>
+                <kino:Form.FunctionBar>
+                    <kino:FormFunctionBar>
                         <Button Content="Save"
                                 IsDefault="True"
                                 Click="OnSave" />
                         <Button Content="Cancel"
                                 IsCancel="True"
                                 Click="OnCancel" />
-                    </kino:KinoFormFunctionBar>
-                </kino:KinoForm.FunctionBar>
-            </kino:KinoForm>
+                    </kino:FormFunctionBar>
+                </kino:Form.FunctionBar>
+            </kino:Form>
         </xctk:BusyIndicator>
     </Grid>
-</kino:KinoWindow>
+</kino:ExtendedWindow>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignInView.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignInView.xaml
index 7e80d47..0c46dfa 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignInView.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignInView.xaml
@@ -11,12 +11,12 @@
     <UserControl.Resources>
         <kino:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter" />
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-        <Style TargetType="kino:KinoFormItem">
+        <Style TargetType="kino:FormItem">
             <Setter Property="Padding"
                     Value="0,4,0,0" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="kino:KinoFormItem">
+                    <ControlTemplate TargetType="kino:FormItem">
                         <StackPanel x:Name="Root">
                             <StackPanel Orientation="Horizontal">
                                 <ContentPresenter Content="{TemplateBinding Label}"
@@ -53,23 +53,23 @@
             <RowDefinition />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <kino:KinoForm Header="登录">
-            <TextBox kino:KinoForm.Label="用户名"
+        <kino:Form Header="登录">
+            <TextBox kino:Form.Label="用户名"
                      x:Name="UsernameElement"
                      Text="{Binding Username,Mode=TwoWay}"
                      Validation.ErrorTemplate="{StaticResource ErrorTemplate}"/>
-            <PasswordBox kino:KinoForm.Label="密码"
+            <PasswordBox kino:Form.Label="密码"
                          local:PasswordBoxHelper.Password="{Binding Password,Mode=TwoWay}"
                          Validation.ErrorTemplate="{StaticResource ErrorTemplate}" />
-            <kino:KinoForm.FunctionBar>
-                <kino:KinoFormFunctionBar>
-                    <kino:KinoButton Content="Sign In"
+            <kino:Form.FunctionBar>
+                <kino:FormFunctionBar>
+                    <kino:ExtendedButton Content="Sign In"
                                      IsDefault="True"
                                      Click="OnSignIn"
                                      x:Name="SignInButton" />
-                </kino:KinoFormFunctionBar>
-            </kino:KinoForm.FunctionBar>
-        </kino:KinoForm>
+                </kino:FormFunctionBar>
+            </kino:Form.FunctionBar>
+        </kino:Form>
         <Grid Grid.Row="1"
               Background="#FFDFDFDF">
             <StackPanel Orientation="Horizontal"
@@ -77,7 +77,7 @@
                         Margin="8">
                 <TextBlock Text="没有账号？"
                            VerticalAlignment="Center" />
-                <kino:KinoHyperlinkButton Content="注册"
+                <kino:HyperlinkButton Content="注册"
                                           Click="OnSignUp" />
             </StackPanel>
         </Grid>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignUpView.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignUpView.xaml
index 5e71bb0..38ca0eb 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignUpView.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignUpView.xaml
@@ -10,12 +10,12 @@
     <UserControl.Resources>
         <kino:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter" />
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-        <Style TargetType="kino:KinoFormItem">
+        <Style TargetType="kino:FormItem">
             <Setter Property="Padding"
                     Value="0,4,0,0" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="kino:KinoFormItem">
+                    <ControlTemplate TargetType="kino:FormItem">
                         <StackPanel x:Name="Root">
                             <StackPanel Orientation="Horizontal">
                                 <ContentPresenter Content="{TemplateBinding Label}"
@@ -46,42 +46,42 @@
             </Setter>
         </Style>
     </UserControl.Resources>
-    <kino:KinoResizer HorizontalContentAlignment="Stretch">
+    <kino:Resizer HorizontalContentAlignment="Stretch">
         <Grid>
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <kino:KinoForm Header="注册">
-                    <TextBox kino:KinoForm.Label="用户名"
+                <kino:Form Header="注册">
+                    <TextBox kino:Form.Label="用户名"
                              Text="{Binding Username,Mode=TwoWay}"
                              Validation.ErrorTemplate="{StaticResource ErrorTemplate}" />
-                    <TextBox kino:KinoForm.Label="昵称"
+                    <TextBox kino:Form.Label="昵称"
                              Validation.ErrorTemplate="{StaticResource ErrorTemplate}" />
-                    <PasswordBox kino:KinoForm.Label="密码"
+                    <PasswordBox kino:Form.Label="密码"
                                  Validation.ErrorTemplate="{StaticResource ErrorTemplate}"
                                   local:PasswordBoxHelper.Password="{Binding Password,Mode=TwoWay}" />
-                    <TextBox kino:KinoForm.Label="邮箱"/>
-                    <TextBox kino:KinoForm.Label="家庭住址"/>
-                    <TextBox kino:KinoForm.Label="邮编"/>
-                    <kino:KinoForm.FunctionBar>
-                        <kino:KinoFormFunctionBar>
-                            <kino:KinoFormFunctionBar.Header>
-                                <kino:KinoHyperlinkButton Content="返回"
+                    <TextBox kino:Form.Label="邮箱"/>
+                    <TextBox kino:Form.Label="家庭住址"/>
+                    <TextBox kino:Form.Label="邮编"/>
+                    <kino:Form.FunctionBar>
+                        <kino:FormFunctionBar>
+                            <kino:FormFunctionBar.Header>
+                                <kino:HyperlinkButton Content="返回"
                                                           Click="OnBack"
                                                           VerticalAlignment="Bottom"
                                                           HorizontalAlignment="Left" />
-                            </kino:KinoFormFunctionBar.Header>
-                            <kino:KinoButton Content="Sign Up"
+                            </kino:FormFunctionBar.Header>
+                            <kino:ExtendedButton Content="Sign Up"
                                              x:Name="SignUpButton"
                                              IsDefault="True"
                                              Click="OnSignUp" />
-                        </kino:KinoFormFunctionBar>
-                    </kino:KinoForm.FunctionBar>
-                </kino:KinoForm>
+                        </kino:FormFunctionBar>
+                    </kino:Form.FunctionBar>
+                </kino:Form>
              
             </Grid>
         </Grid>
-    </kino:KinoResizer>
+    </kino:Resizer>
 </UserControl>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SimpleShell.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SimpleShell.xaml
index 3110cdb..e2dff23 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SimpleShell.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SimpleShell.xaml
@@ -1,4 +1,4 @@
-<kino:KinoWindow x:Class="Kino.Toolkit.Wpf.Samples.SimpleShell"
+<kino:ExtendedWindow x:Class="Kino.Toolkit.Wpf.Samples.SimpleShell"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,16 +10,16 @@
                  Title="SimpleShell"
                  Height="450"
                  Width="800">
-    <kino:KinoWindow.FunctionBar>
-        <kino:KinoWindowFunctionBar>
+    <kino:ExtendedWindow.FunctionBar>
+        <kino:WindowFunctionBar>
             <Menu>
                 <MenuItem x:Name="UsernameItem">
                     <MenuItem Header="Sign Out"
                               Click="OnSignOut" />
                 </MenuItem>
             </Menu>
-        </kino:KinoWindowFunctionBar>
-    </kino:KinoWindow.FunctionBar>
+        </kino:WindowFunctionBar>
+    </kino:ExtendedWindow.FunctionBar>
     <Grid>
         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
             <TextBlock Text="Welcome:"  Foreground="#FF666666" FontSize="16"
@@ -32,4 +32,4 @@
                        x:Name="UsernameElement"/>
         </StackPanel>
     </Grid>
-</kino:KinoWindow>
+</kino:ExtendedWindow>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/UserinfoDialog.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/UserinfoDialog.xaml
index abc52cf..d066ef6 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/UserinfoDialog.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/UserinfoDialog.xaml
@@ -1,4 +1,4 @@
-<kino:KinoWindow x:Class="Kino.Toolkit.Wpf.Samples.UserinfoDialog"
+<kino:ExtendedWindow x:Class="Kino.Toolkit.Wpf.Samples.UserinfoDialog"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -14,7 +14,7 @@
                  Width="300">
     <FrameworkElement.Resources>
         <ControlTemplate x:Key="CustomTemplate"
-                         TargetType="kino:KinoTransitioningContentControl">
+                         TargetType="kino:TransitioningContentControl">
             <Border Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}">
@@ -125,22 +125,22 @@
             </Border>
         </ControlTemplate>
     </FrameworkElement.Resources>
-    <kino:KinoResizer HorizontalContentAlignment="Stretch">
-        <kino:KinoResizer.Animation>
+    <kino:Resizer HorizontalContentAlignment="Stretch">
+        <kino:Resizer.Animation>
             <DoubleAnimation BeginTime="0:0:0"
                              Duration="0:0:0.15">
                 <DoubleAnimation.EasingFunction>
                     <QuinticEase EasingMode="EaseOut" />
                 </DoubleAnimation.EasingFunction>
             </DoubleAnimation>
-        </kino:KinoResizer.Animation>
-        <kino:KinoTransitioningContentControl x:Name="ContentElement"
+        </kino:Resizer.Animation>
+        <kino:TransitioningContentControl x:Name="ContentElement"
                                               HorizontalContentAlignment="Stretch"
                                               VerticalContentAlignment="Stretch"
                                               Template="{StaticResource CustomTemplate}"
                                               Transition="CustomTransition">
             <local:SignInView Finished="OnFinished"
                               SignUp="OnSignUp" />
-        </kino:KinoTransitioningContentControl>
-    </kino:KinoResizer>
-</kino:KinoWindow>
+        </kino:TransitioningContentControl>
+    </kino:Resizer>
+</kino:ExtendedWindow>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Button/ButtonSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Button/ButtonSample.xaml
index 02c856a..1f65e31 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Button/ButtonSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Button/ButtonSample.xaml
@@ -14,29 +14,29 @@
         <StackPanel>
             <local:SampleSection>
                 <StackPanel>
-                    <kino:KinoButton Content="bookmark"
+                    <kino:ExtendedButton Content="bookmark"
                                      MinWidth="18"
                                      x:Name="BookmarkButton"
                                      HorizontalAlignment="Left"
                                      State="{Binding SelectedItem,ElementName=StatesListBox}">
-                        <kino:KinoButton.Icon>
+                        <kino:ExtendedButton.Icon>
                             <TextBlock Style="{StaticResource FontAwesome}"
                                        Text="&#xf02e;" />
-                        </kino:KinoButton.Icon>
-                    </kino:KinoButton>
-                    <!--<kino:KinoHyperlinkButton Content="Bing" IsEnabled="False"
+                        </kino:ExtendedButton.Icon>
+                    </kino:ExtendedButton>
+                    <!--<kino:HyperlinkButton Content="Bing" IsEnabled="False"
                                               NavigateUri="https://cn.bing.com/?FORM=Z9FD1"/>
-                    <kino:KinoHyperlinkButton NavigateUri="https://cn.bing.com/?FORM=Z9FD1">
+                    <kino:HyperlinkButton NavigateUri="https://cn.bing.com/?FORM=Z9FD1">
                         <StackPanel Orientation="Horizontal">
                             <Rectangle Height="20"
                                        Width="20"
                                        Fill="Red" />
                             <TextBlock Text="Bing" Resources="{x:Null}"/>
                         </StackPanel>
-                    </kino:KinoHyperlinkButton>
-                    <kino:KinoHyperlinkButton Content="Bing"
+                    </kino:HyperlinkButton>
+                    <kino:HyperlinkButton Content="Bing"
                                               NavigateUri="https://cn.bing.com/?FORM=Z9FD1" />
-                    <kino:KinoHyperlinkButton Content="Bing"
+                    <kino:HyperlinkButton Content="Bing"
                                               VerticalContentAlignment="Center"
                                               NavigateUri="https://cn.bing.com/?FORM=Z9FD1">
                         <ButtonBase.ContentTemplate>
@@ -50,12 +50,12 @@
                                 </StackPanel>
                             </DataTemplate>
                         </ButtonBase.ContentTemplate>
-                    </kino:KinoHyperlinkButton>-->
+                    </kino:HyperlinkButton>-->
                 </StackPanel>
                 <local:SampleSection.ControlPanel>
-                    <kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
+                    <kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
                         <StackPanel Orientation="Horizontal"
-                                    kino:KinoForm.Label="Content And Icon">
+                                    kino:Form.Label="Content And Icon">
                             <RadioButton Content="Content Only"
                                          Checked="OnContentOnlyCheck" />
                             <RadioButton Content="Icon Only"
@@ -69,8 +69,8 @@
                         <ListBox x:Name="StatesListBox"
                                  HorizontalAlignment="Left"
                                  Width="250"
-                                 kino:KinoForm.Label="State" />
-                    </kino:KinoForm>
+                                 kino:Form.Label="State" />
+                    </kino:Form>
                 </local:SampleSection.ControlPanel>
                 <local:SampleSection.SourceCodes>
                     <local:SourceCodeModel SourceCodeType="Xaml"
@@ -86,19 +86,19 @@
                     <TextBlock Text="Comment" />
                     <TextBox Width="200"
                              HorizontalAlignment="Left" />
-                    <kino:KinoButton Content="Comment"
+                    <kino:ExtendedButton Content="Comment"
                                      x:Name="CommentButton"
                                      HorizontalAlignment="Left"
                                      Margin="0,4,0,0"
                                      Width="100"
                                      Click="OnComment"
                                      IsDefault="True">
-                        <kino:KinoButton.Icon>
+                        <kino:ExtendedButton.Icon>
                             <TextBlock Style="{StaticResource FontAwesome}"
                                        Text="&#xf075;"
                                        Foreground="BlueViolet" />
-                        </kino:KinoButton.Icon>
-                    </kino:KinoButton>
+                        </kino:ExtendedButton.Icon>
+                    </kino:ExtendedButton>
                 </StackPanel>
                 <local:SampleSection.SourceCodes>
                     <local:SourceCodeModel SourceCodeType="Xaml"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Button/ButtonSample.xaml.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Button/ButtonSample.xaml.cs
index 504253d..5916d10 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Button/ButtonSample.xaml.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Button/ButtonSample.xaml.cs
@@ -65,7 +65,7 @@ private object CreateIcon()
 
         private async void OnComment(object sender, RoutedEventArgs e)
         {
-            var button = sender as KinoButton;
+            var button = sender as ExtendedButton;
             button.IsEnabled = false;
             button.State = ProgressState.Busy;
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/DataGrid/DataGridSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/DataGrid/DataGridSample.xaml
index 9de31fb..93df084 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/DataGrid/DataGridSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/DataGrid/DataGridSample.xaml
@@ -13,12 +13,12 @@
     <local:SampleSection>
         <StackPanel>
             <TextBlock Text="Selection Mode"
-                       Margin="8,8,8,0" />
+                       Margin="0,8,0,0" />
             <ComboBox Width="300"
                       HorizontalAlignment="Left"
-                      Margin="8"
+                      Margin="0,0,0,8"
                       x:Name="SelectionComboBox" />
-            <kino:KinoDataGrid ItemsSource="{Binding}" 
+            <kino:ExtendedDataGrid ItemsSource="{Binding}" 
                            AutoGenerateColumns="False"
                            SelectionMode="{Binding ElementName=SelectionComboBox,Path=SelectedItem}"
                            IsReadOnly="True">
@@ -27,7 +27,7 @@
                                     Binding="{Binding Name}"
                                     Width="200" />
                 </DataGrid.Columns>
-            </kino:KinoDataGrid>
+            </kino:ExtendedDataGrid>
         </StackPanel>
         <local:SampleSection.SourceCodes>
             <local:SourceCodeModel SourceCodeType="Xaml"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/DataPager/DataPagerSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/DataPager/DataPagerSample.xaml
index b81da73..e789b86 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/DataPager/DataPagerSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/DataPager/DataPagerSample.xaml
@@ -14,7 +14,7 @@
                   d:DesignWidth="800">
     <local:SamplePage.Resources>
         <extend:ColorToSolidColorBrushConverter x:Key="ColorToSolidBrushConverter" />
-        <Style TargetType="kino:KinoDataPager">
+        <Style TargetType="kino:DataPager">
             <Setter Property="NumericButtonCount"
                     Value="{Binding Value, ElementName=NumericButtonCount}" />
             <Setter Property="AutoEllipsis"
@@ -36,20 +36,20 @@
                                   MinWidth="400" />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <kino:KinoForm>
-                <kino:KinoDataPager DisplayMode="FirstLastNumeric"
-                                    kino:KinoForm.Label="FirstLastNumeric" />
-                <kino:KinoDataPager DisplayMode="FirstLastPreviousNext"
-                                    kino:KinoForm.Label="FirstLastPreviousNext" />
-                <kino:KinoDataPager DisplayMode="FirstLastPreviousNextNumeric"
-                                    kino:KinoForm.Label="FirstLastPreviousNextNumeric" />
-                <kino:KinoDataPager DisplayMode="Numeric"
-                                    kino:KinoForm.Label="Numeric" />
-                <kino:KinoDataPager DisplayMode="PreviousNext"
-                                    kino:KinoForm.Label="PreviousNext" />
-                <kino:KinoDataPager DisplayMode="PreviousNextNumeric"
-                                    kino:KinoForm.Label="PreviousNextNumeric" />
-            </kino:KinoForm>
+            <kino:Form>
+                <kino:DataPager DisplayMode="FirstLastNumeric"
+                                    kino:Form.Label="FirstLastNumeric" />
+                <kino:DataPager DisplayMode="FirstLastPreviousNext"
+                                    kino:Form.Label="FirstLastPreviousNext" />
+                <kino:DataPager DisplayMode="FirstLastPreviousNextNumeric"
+                                    kino:Form.Label="FirstLastPreviousNextNumeric" />
+                <kino:DataPager DisplayMode="Numeric"
+                                    kino:Form.Label="Numeric" />
+                <kino:DataPager DisplayMode="PreviousNext"
+                                    kino:Form.Label="PreviousNext" />
+                <kino:DataPager DisplayMode="PreviousNextNumeric"
+                                    kino:Form.Label="PreviousNextNumeric" />
+            </kino:Form>
             <StackPanel Grid.Column="1">
                 <ListBox ItemsSource="{Binding}"
                          DisplayMemberPath="Name"
@@ -70,25 +70,25 @@
             </StackPanel>
         </Grid>
         <local:SampleSection.ControlPanel>
-            <kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}"
+            <kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}"
                            HorizontalAlignment="Left">
                 <CheckBox x:Name="AutoEllipsis"
-                          kino:KinoForm.Label="AutoEllipsis" />
+                          kino:Form.Label="AutoEllipsis" />
                 <CheckBox x:Name="TotalItemCountFixed"
-                          kino:KinoForm.Label="IsTotalItemCountFixed"
+                          kino:Form.Label="IsTotalItemCountFixed"
                           IsChecked="True" />
                 <extend:IntegerUpDown x:Name="NumericButtonCount"
-                                      kino:KinoForm.Label="NumericButtonCount"
+                                      kino:Form.Label="NumericButtonCount"
                                       Value="5"
                                       Minimum="0"
                                       Maximum="20" />
                 <extend:IntegerUpDown Value="{Binding PageSize, Mode=TwoWay}"
-                                      kino:KinoForm.Label="PageSize"
+                                      kino:Form.Label="PageSize"
                                       Minimum="1" />
                 <extend:ColorPicker SelectedColor="Black"
-                                    kino:KinoForm.Label="Foreground"
+                                    kino:Form.Label="Foreground"
                                     x:Name="ColorPicker" />
-            </kino:KinoForm>
+            </kino:Form>
         </local:SampleSection.ControlPanel>
         <local:SampleSection.SourceCodes>
             <local:SourceCodeModel SourceCodeType="Xaml"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Expander/ExpanderSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Expander/ExpanderSample.xaml
index 23e3b63..03ecab0 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Expander/ExpanderSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Expander/ExpanderSample.xaml
@@ -240,27 +240,27 @@
         <StackPanel>
             <local:SampleSection Header="Expander">
                 <StackPanel>
-                    <kino:KinoExpander Header="我的日历">
+                    <kino:ExtendedExpander Header="我的日历">
                         <StackPanel>
                             <CheckBox Content="Calender"/>
                             <CheckBox Content="中国节假日"/>
                             <CheckBox Content="Birthdays"/>
                         </StackPanel>
-                    </kino:KinoExpander>
-                    <kino:KinoExpander Header="其它日历">
+                    </kino:ExtendedExpander>
+                    <kino:ExtendedExpander Header="其它日历">
                         <StackPanel>
                             <CheckBox Content="Calender"/>
                             <CheckBox Content="中国节假日"/>
                             <CheckBox Content="Birthdays"/>
                         </StackPanel>
-                    </kino:KinoExpander>
-                    <kino:KinoExpander Header="共享日历">
+                    </kino:ExtendedExpander>
+                    <kino:ExtendedExpander Header="共享日历">
                         <StackPanel>
                             <CheckBox Content="Calender"/>
                             <CheckBox Content="中国节假日"/>
                             <CheckBox Content="Birthdays"/>
                         </StackPanel>
-                    </kino:KinoExpander>
+                    </kino:ExtendedExpander>
                 </StackPanel>
                 <local:SampleSection.SourceCodes>
                     <local:SourceCodeModel SourceCodeType="Xaml"
@@ -272,7 +272,7 @@
             <local:SampleSection Header="Simple Accordion">
                 <Grid Height="400" x:Name="MenuRoot">
                     <Grid.Resources>
-                        <Style TargetType="{x:Type kino:KinoExpander}" >
+                        <Style TargetType="{x:Type kino:ExtendedExpander}" >
                             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
                             <Setter Property="Background" Value="Transparent"/>
                             <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -281,7 +281,7 @@
                             <Setter Property="BorderThickness" Value="1"/>
                             <Setter Property="Template">
                                 <Setter.Value>
-                                    <ControlTemplate TargetType="{x:Type kino:KinoExpander}">
+                                    <ControlTemplate TargetType="{x:Type kino:ExtendedExpander}">
                                         <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="3" SnapsToDevicePixels="true">
                                             <VisualStateManager.VisualStateGroups>
                                                 <VisualStateGroup x:Name="ExpansionStates">
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Expander/ExpanderSample.xaml.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Expander/ExpanderSample.xaml.cs
index 50431f7..99dbd39 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Expander/ExpanderSample.xaml.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Expander/ExpanderSample.xaml.cs
@@ -27,11 +27,11 @@ public ExpanderSample()
 
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
-            var expanders = new List<KinoExpander>();
+            var expanders = new List<ExtendedExpander>();
             Expander firstExpander = null;
             for (int i = 0; i < 10; i++)
             {
-                var expander = new KinoExpander() { Header = "This is AccordionItem " + i };
+                var expander = new ExtendedExpander() { Header = "This is AccordionItem " + i };
                 if (i == 0)
                     firstExpander = expander;
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormItemSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormItemSample.xaml
index a62182b..db5768d 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormItemSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormItemSample.xaml
@@ -26,13 +26,13 @@
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
 
-        <Style TargetType="kino:KinoFormItem"
+        <Style TargetType="kino:FormItem"
                x:Key="FormItemStyle">
             <Setter Property="Padding"
                     Value="11,0,3,0" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="kino:KinoFormItem">
+                    <ControlTemplate TargetType="kino:FormItem">
                         <Grid x:Name="Root"
                               Height="25">
                             <Grid.ColumnDefinitions>
@@ -56,11 +56,11 @@
             </Setter>
         </Style>
 
-        <Style TargetType="kino:KinoFormItem"
+        <Style TargetType="kino:FormItem"
                x:Key="EditableFormItemStyle">
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="kino:KinoFormItem">
+                    <ControlTemplate TargetType="kino:FormItem">
                         <Grid x:Name="Root">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"
@@ -85,7 +85,7 @@
             </Setter>
         </Style>
 
-        <Style TargetType="kino:KinoForm">
+        <Style TargetType="kino:Form">
             <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
                     Value="Disabled" />
         </Style>
@@ -95,36 +95,36 @@
             <StackPanel Width="500"
                         HorizontalAlignment="Left"
                         Grid.IsSharedSizeScope="True">
-                <kino:KinoFormTitle Content="用户信息" />
-                <kino:KinoFormItem Label="用户名"
+                <kino:FormTitle Content="用户信息" />
+                <kino:FormItem Label="用户名"
                                    IsRequired="True">
                     <TextBox Text="{Binding Name,Mode=TwoWay}" />
-                </kino:KinoFormItem>
-                <kino:KinoFormItem Label="密码"
+                </kino:FormItem>
+                <kino:FormItem Label="密码"
                                    IsRequired="True">
                     <PasswordBox />
-                </kino:KinoFormItem>
-                <kino:KinoFormItem Label="国家与地区(请选择居住地)">
+                </kino:FormItem>
+                <kino:FormItem Label="国家与地区(请选择居住地)">
                     <ComboBox />
-                </kino:KinoFormItem>
-                <kino:KinoFormSeparator />
+                </kino:FormItem>
+                <kino:FormSeparator />
 
-                <kino:KinoFormTitle Content="家庭信息"
+                <kino:FormTitle Content="家庭信息"
                                     Description="填写家庭信息可以让我们给您提供更好的服务。" />
-                <kino:KinoFormItem Label="父"
+                <kino:FormItem Label="父"
                                    Description="可以不填">
                     <TextBox />
-                </kino:KinoFormItem>
-                <kino:KinoFormItem Label="母"
+                </kino:FormItem>
+                <kino:FormItem Label="母"
                                    Description="可以不填">
                     <TextBox />
-                </kino:KinoFormItem>
-                <kino:KinoFormItem Label="伴侣"
+                </kino:FormItem>
+                <kino:FormItem Label="伴侣"
                                    Description="可以没有"
                                    IsRequired="True">
                     <TextBox />
-                </kino:KinoFormItem>
-                <kino:KinoFormItem Label="性别">
+                </kino:FormItem>
+                <kino:FormItem Label="性别">
                     <StackPanel Orientation="Horizontal">
                         <RadioButton Content="男"
                                      GroupName="Sex" />
@@ -132,13 +132,13 @@
                                      GroupName="Sex"
                                      Margin="8,0,0,0" />
                     </StackPanel>
-                </kino:KinoFormItem>
-                <kino:KinoFormItem Label="备注"
+                </kino:FormItem>
+                <kino:FormItem Label="备注"
                                    LabelTemplate="{StaticResource TopHeaderTemplate}">
                     <TextBox AcceptsReturn="True"
                              VerticalScrollBarVisibility="Auto"
                              Height="100" />
-                </kino:KinoFormItem>
+                </kino:FormItem>
             </StackPanel>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
@@ -149,12 +149,12 @@
 
         <local:SampleSection Header="使用样式">
             <local:SampleSection.Resources>
-                <Style TargetType="kino:KinoFormItem">
+                <Style TargetType="kino:FormItem">
                     <Setter Property="Padding"
                             Value="0,4,0,0" />
                     <Setter Property="Template">
                         <Setter.Value>
-                            <ControlTemplate TargetType="kino:KinoFormItem">
+                            <ControlTemplate TargetType="kino:FormItem">
                                 <StackPanel x:Name="Root">
                                     <StackPanel Orientation="Horizontal">
                                         <ContentPresenter Content="{TemplateBinding Label}"
@@ -185,31 +185,31 @@
                     </Setter>
                 </Style>
             </local:SampleSection.Resources>
-            <kino:KinoForm Width="400"
+            <kino:Form Width="400"
                            HorizontalAlignment="Left"
                            Header="登录">
-                <kino:KinoFormTitle Content="用户信息" />
+                <kino:FormTitle Content="用户信息" />
 
-                <TextBox kino:KinoForm.Label="用户名"
-                         kino:KinoForm.IsRequired="True"
+                <TextBox kino:Form.Label="用户名"
+                         kino:Form.IsRequired="True"
                          Text="{Binding Name,Mode=TwoWay}" />
 
-                <PasswordBox kino:KinoForm.Label="密码"
-                             kino:KinoForm.IsRequired="True" />
-                <ComboBox kino:KinoForm.Label="国家"
-                          kino:KinoForm.Description="请选择先居住地" />
+                <PasswordBox kino:Form.Label="密码"
+                             kino:Form.IsRequired="True" />
+                <ComboBox kino:Form.Label="国家"
+                          kino:Form.Description="请选择先居住地" />
 
-                <kino:KinoForm.FunctionBar>
-                    <kino:KinoFormFunctionBar>
-                        <kino:KinoButton Content="OK"
+                <kino:Form.FunctionBar>
+                    <kino:FormFunctionBar>
+                        <kino:ExtendedButton Content="OK"
                                          Click="OnOK"
                                          IsDefault="True" />
-                        <kino:KinoButton Content="Cancel"
+                        <kino:ExtendedButton Content="Cancel"
                                          IsCancel="True" />
 
-                    </kino:KinoFormFunctionBar>
-                </kino:KinoForm.FunctionBar>
-            </kino:KinoForm>
+                    </kino:FormFunctionBar>
+                </kino:Form.FunctionBar>
+            </kino:Form>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
                                        Haader="FormItemSample.xaml"
@@ -219,13 +219,13 @@
         <local:SampleSection Header="可编辑">
             <StackPanel HorizontalAlignment="Left">
                 <StackPanel.Resources>
-                    <Style TargetType="kino:KinoForm"
-                           BasedOn="{StaticResource {x:Type kino:KinoForm}}">
+                    <Style TargetType="kino:Form"
+                           BasedOn="{StaticResource {x:Type kino:Form}}">
                         <Setter Property="Grid.IsSharedSizeScope"
                                 Value="False" />
                     </Style>
                 </StackPanel.Resources>
-                <kino:KinoPageTitle>
+                <kino:PageTitle>
                     <Grid>
                         <TextBlock Text="Responsive" />
                         <CheckBox HorizontalAlignment="Right"
@@ -235,34 +235,34 @@
                                   Checked="OnCanEditChecked"
                                   Unchecked="OnCanEditUnchecked" />
                     </Grid>
-                </kino:KinoPageTitle>
+                </kino:PageTitle>
                 <WrapPanel x:Name="Root"
                            Grid.IsSharedSizeScope="True">
-                    <kino:KinoForm>
-                        <kino:KinoFormTitle Content="Product" />
+                    <kino:Form>
+                        <kino:FormTitle Content="Product" />
                         <TextBlock Text="1234999"
-                                   kino:KinoForm.Label="Product ID" />
+                                   kino:Form.Label="Product ID" />
                         <TextBlock Text="Power Projector 4713"
-                                   kino:KinoForm.Label="IGNORE" />
+                                   kino:Form.Label="IGNORE" />
                         <TextBlock Text="Projector (PR)"
-                                   kino:KinoForm.Label="Category" />
+                                   kino:Form.Label="Category" />
                         <TextBlock Text="A very powerful projector"
-                                   kino:KinoForm.Label="Description" />
+                                   kino:Form.Label="Description" />
                         <TextBlock Text="856.49 EUR"
-                                   kino:KinoForm.Label="Price" />
-                    </kino:KinoForm>
+                                   kino:Form.Label="Price" />
+                    </kino:Form>
 
-                    <kino:KinoForm>
-                        <kino:KinoFormTitle Content="Specification" />
+                    <kino:Form>
+                        <kino:FormTitle Content="Specification" />
                         <TextBlock Text="51 cm"
-                                   kino:KinoForm.Label="Width" />
+                                   kino:Form.Label="Width" />
                         <TextBlock Text="42 cm"
-                                   kino:KinoForm.Label="Depth" />
+                                   kino:Form.Label="Depth" />
                         <TextBlock Text="18 cm"
-                                   kino:KinoForm.Label="Height" />
+                                   kino:Form.Label="Height" />
                         <TextBlock Text="1,467 g"
-                                   kino:KinoForm.Label="Weight" />
-                    </kino:KinoForm>
+                                   kino:Form.Label="Weight" />
+                    </kino:Form>
 
                 </WrapPanel>
             </StackPanel>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormItemSample.xaml.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormItemSample.xaml.cs
index 8939f6e..9642a9f 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormItemSample.xaml.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormItemSample.xaml.cs
@@ -28,7 +28,7 @@ public FormItemSample()
             this.InitializeComponent();
             this._formItemStyle = this.Resources["FormItemStyle"] as Style;
             this._editableFormItemStyle = this.Resources["EditableFormItemStyle"] as Style;
-            this.Root.Resources.Add(typeof(KinoFormItem), this._formItemStyle);
+            this.Root.Resources.Add(typeof(FormItem), this._formItemStyle);
         }
 
         private void OnOK(object sender, RoutedEventArgs e)
@@ -50,7 +50,7 @@ private void OnShowResponsiveDialog(object sender, RoutedEventArgs e)
         private async void OnCanEditChecked(object sender, RoutedEventArgs e)
         {
             this.Root.Resources.Clear();
-            this.Root.Resources.Add(typeof(KinoFormItem), this._editableFormItemStyle);
+            this.Root.Resources.Add(typeof(FormItem), this._editableFormItemStyle);
             await this.Dispatcher.InvokeAsync(async () =>
             {
                 await Task.Delay(100);
@@ -62,7 +62,7 @@ await this.Dispatcher.InvokeAsync(async () =>
         private void OnCanEditUnchecked(object sender, RoutedEventArgs e)
         {
             this.Root.Resources.Clear();
-            this.Root.Resources.Add(typeof(KinoFormItem), this._formItemStyle);
+            this.Root.Resources.Add(typeof(FormItem), this._formItemStyle);
         }
     }
 }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSample.xaml
index 27eec66..e0ad530 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSample.xaml
@@ -24,7 +24,7 @@
         <kino:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter" />
         <kino:BoolToObjectConverter x:Key="BoolToObjectConverter" />
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-        <Style TargetType="kino:KinoForm">
+        <Style TargetType="kino:Form">
             <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
                     Value="Disabled" />
             <Setter Property="kino:FocusService.IsAutoFocus"
@@ -33,32 +33,32 @@
     </local:SamplePage.Resources>
     <StackPanel Background="White">
         <local:SampleSection Header="使用Form">
-            <kino:KinoForm Width="500"
+            <kino:Form Width="500"
                            kino:FocusService.IsAutoFocus="True"
                            HorizontalAlignment="Left"
                            Header="NormalForm">
-                <kino:KinoFormTitle Content="用户信息" />
-                <TextBox kino:KinoForm.Label="用户名"
-                         kino:KinoForm.IsRequired="True"
+                <kino:FormTitle Content="用户信息" />
+                <TextBox kino:Form.Label="用户名"
+                         kino:Form.IsRequired="True"
                          Text="{Binding Name,Mode=TwoWay}" />
 
-                <PasswordBox kino:KinoForm.Label="密码"
-                             kino:KinoForm.IsRequired="True" />
-                <ComboBox kino:KinoForm.Label="国家与地区(请选择居住地)" />
+                <PasswordBox kino:Form.Label="密码"
+                             kino:Form.IsRequired="True" />
+                <ComboBox kino:Form.Label="国家与地区(请选择居住地)" />
 
-                <kino:KinoFormSeparator />
+                <kino:FormSeparator />
 
-                <kino:KinoFormTitle Content="家庭信息"
+                <kino:FormTitle Content="家庭信息"
                                     Description="填写家庭信息可以让我们给您提供更好的服务。" />
 
-                <TextBox kino:KinoForm.Label="父"
-                         kino:KinoForm.Description="可以不填" />
-                <TextBox kino:KinoForm.Label="母"
-                         kino:KinoForm.Description="可以不填" />
-                <TextBox kino:KinoForm.Label="伴侣"
-                         kino:KinoForm.Description="可以没有"
-                         kino:KinoForm.IsRequired="True" />
-                <StackPanel kino:KinoForm.Label="性别"
+                <TextBox kino:Form.Label="父"
+                         kino:Form.Description="可以不填" />
+                <TextBox kino:Form.Label="母"
+                         kino:Form.Description="可以不填" />
+                <TextBox kino:Form.Label="伴侣"
+                         kino:Form.Description="可以没有"
+                         kino:Form.IsRequired="True" />
+                <StackPanel kino:Form.Label="性别"
                             Orientation="Horizontal">
                     <RadioButton Content="男"
                                  GroupName="Sex" />
@@ -67,22 +67,22 @@
                                  Margin="8,0,0,0" />
                 </StackPanel>
                 <TextBox AcceptsReturn="True"
-                         kino:KinoForm.Label="备注"
-                         kino:KinoForm.LabelTemplate="{StaticResource TopHeaderTemplate}"
+                         kino:Form.Label="备注"
+                         kino:Form.LabelTemplate="{StaticResource TopHeaderTemplate}"
                          VerticalScrollBarVisibility="Auto"
                          Height="100" />
-                <kino:KinoForm.FunctionBar>
-                    <kino:KinoFormFunctionBar>
-                        <kino:KinoButton Content="OK"
+                <kino:Form.FunctionBar>
+                    <kino:FormFunctionBar>
+                        <kino:ExtendedButton Content="OK"
                                          Click="OnOK"
                                          IsDefault="True" />
-                        <kino:KinoButton Content="Cancel"
+                        <kino:ExtendedButton Content="Cancel"
                                          IsCancel="True"
                                          Click="OnCancel" />
 
-                    </kino:KinoFormFunctionBar>
-                </kino:KinoForm.FunctionBar>
-            </kino:KinoForm>
+                    </kino:FormFunctionBar>
+                </kino:Form.FunctionBar>
+            </kino:Form>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
                                        Haader="FormSample.xaml"
@@ -90,24 +90,24 @@
             </local:SampleSection.SourceCodes>
         </local:SampleSection>
         <local:SampleSection Header="显示或隐藏">
-            <kino:KinoForm Width="500"
+            <kino:Form Width="500"
                            HorizontalAlignment="Left">
-                <CheckBox kino:KinoForm.Label="显示额外信息"
+                <CheckBox kino:Form.Label="显示额外信息"
                           x:Name="ExtraInformationCheckBox" />
-                <Grid kino:KinoForm.IsItemItsOwnContainer="True"
+                <Grid kino:Form.IsItemItsOwnContainer="True"
                       Visibility="{Binding IsChecked,ElementName=ExtraInformationCheckBox,Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <kino:KinoForm Grid.IsSharedSizeScope="False"
+                    <kino:Form Grid.IsSharedSizeScope="False"
                                    Padding="0">
-                        <ComboBox kino:KinoForm.Label="国家" />
-                        <TextBox kino:KinoForm.Label="父"
-                                 kino:KinoForm.Description="可以不填" />
-                        <TextBox kino:KinoForm.Label="母"
-                                 kino:KinoForm.Description="可以不填" />
-                    </kino:KinoForm>
+                        <ComboBox kino:Form.Label="国家" />
+                        <TextBox kino:Form.Label="父"
+                                 kino:Form.Description="可以不填" />
+                        <TextBox kino:Form.Label="母"
+                                 kino:Form.Description="可以不填" />
+                    </kino:Form>
                 </Grid>
-                <TextBox kino:KinoForm.Label="地址"
+                <TextBox kino:Form.Label="地址"
                          Visibility="{Binding IsChecked,ElementName=ExtraInformationCheckBox,Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            </kino:KinoForm>
+            </kino:Form>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
                                        Haader="FormSample.xaml"
@@ -115,33 +115,33 @@
             </local:SampleSection.SourceCodes>
         </local:SampleSection>
         <local:SampleSection Header="使用Expander分组">
-            <kino:KinoForm Width="500"
+            <kino:Form Width="500"
                            HorizontalAlignment="Left">
-                <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+                <Expander kino:Form.IsItemItsOwnContainer="True"
                           Header="用户信息"
                           IsExpanded="True">
-                    <kino:KinoForm Grid.IsSharedSizeScope="False"
+                    <kino:Form Grid.IsSharedSizeScope="False"
                                    Padding="0">
-                        <TextBox kino:KinoForm.Label="用户名"
-                                 kino:KinoForm.IsRequired="True"
+                        <TextBox kino:Form.Label="用户名"
+                                 kino:Form.IsRequired="True"
                                  Text="{Binding Name,Mode=TwoWay}" />
-                        <PasswordBox kino:KinoForm.Label="密码"
-                                     kino:KinoForm.IsRequired="True" />
-                    </kino:KinoForm>
+                        <PasswordBox kino:Form.Label="密码"
+                                     kino:Form.IsRequired="True" />
+                    </kino:Form>
                 </Expander>
-                <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+                <Expander kino:Form.IsItemItsOwnContainer="True"
                           Header="其它信息"
                           IsExpanded="True">
-                    <kino:KinoForm Grid.IsSharedSizeScope="False"
+                    <kino:Form Grid.IsSharedSizeScope="False"
                                    Padding="0">
-                        <ComboBox kino:KinoForm.Label="国家" />
-                        <TextBox kino:KinoForm.Label="父"
-                                 kino:KinoForm.Description="可以不填" />
-                        <TextBox kino:KinoForm.Label="母"
-                                 kino:KinoForm.Description="可以不填" />
-                    </kino:KinoForm>
+                        <ComboBox kino:Form.Label="国家" />
+                        <TextBox kino:Form.Label="父"
+                                 kino:Form.Description="可以不填" />
+                        <TextBox kino:Form.Label="母"
+                                 kino:Form.Description="可以不填" />
+                    </kino:Form>
                 </Expander>
-            </kino:KinoForm>
+            </kino:Form>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
                                        Haader="FormSample.xaml"
@@ -149,17 +149,17 @@
             </local:SampleSection.SourceCodes>
         </local:SampleSection>
         <local:SampleSection Header="使用ItemsPanelTemplate">
-            <kino:KinoForm Width="500"
+            <kino:Form Width="500"
                            HorizontalAlignment="Left">
-                <kino:KinoForm.Resources>
-                    <Style TargetType="kino:KinoFormItem"
+                <kino:Form.Resources>
+                    <Style TargetType="kino:FormItem"
                            x:Key="FromItemStyle"
                            BasedOn="{StaticResource ControlPanelFromItemStyle}">
                         <Setter Property="Margin"
                                 Value="8" />
                         <Setter Property="Template">
                             <Setter.Value>
-                                <ControlTemplate TargetType="kino:KinoFormItem">
+                                <ControlTemplate TargetType="kino:FormItem">
                                     <StackPanel x:Name="Root">
                                         <ContentPresenter Content="{TemplateBinding Label}"
                                                           ContentTemplate="{TemplateBinding LabelTemplate}" />
@@ -178,36 +178,36 @@
                     <ItemsPanelTemplate x:Key="ItemsPanelTemplate">
                         <UniformGrid Rows="1" />
                     </ItemsPanelTemplate>
-                </kino:KinoForm.Resources>
-                <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+                </kino:Form.Resources>
+                <Expander kino:Form.IsItemItsOwnContainer="True"
                           Header="用户信息"
                           IsExpanded="True">
-                    <kino:KinoForm Grid.IsSharedSizeScope="False"
+                    <kino:Form Grid.IsSharedSizeScope="False"
                                    Padding="0"
                                    ItemContainerStyle="{StaticResource FromItemStyle}"
                                    ItemsPanel="{StaticResource ItemsPanelTemplate}">
-                        <TextBox kino:KinoForm.Label="用户名" />
-                        <TextBox kino:KinoForm.Label="级别" />
-                        <TextBox kino:KinoForm.Label="备注" />
+                        <TextBox kino:Form.Label="用户名" />
+                        <TextBox kino:Form.Label="级别" />
+                        <TextBox kino:Form.Label="备注" />
 
-                    </kino:KinoForm>
+                    </kino:Form>
                 </Expander>
-                <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+                <Expander kino:Form.IsItemItsOwnContainer="True"
                           Header="其它信息"
                           IsExpanded="True">
-                    <kino:KinoForm Grid.IsSharedSizeScope="False"
+                    <kino:Form Grid.IsSharedSizeScope="False"
                                    Padding="0"
                                    ItemContainerStyle="{StaticResource FromItemStyle}"
                                    ItemsPanel="{StaticResource ItemsPanelTemplate}">
-                        <TextBox kino:KinoForm.Label="学校" />
-                        <TextBox kino:KinoForm.Label="职业" />
-                        <TextBox kino:KinoForm.Label="证书" />
-                    </kino:KinoForm>
+                        <TextBox kino:Form.Label="学校" />
+                        <TextBox kino:Form.Label="职业" />
+                        <TextBox kino:Form.Label="证书" />
+                    </kino:Form>
                 </Expander>
-                <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+                <Expander kino:Form.IsItemItsOwnContainer="True"
                           Header="住址信息"
                           IsExpanded="True">
-                    <kino:KinoForm Grid.IsSharedSizeScope="False"
+                    <kino:Form Grid.IsSharedSizeScope="False"
                                    Padding="0"
                                    ItemContainerStyle="{StaticResource FromItemStyle}">
                         <ItemsControl.ItemsPanel>
@@ -221,15 +221,15 @@
                                 </Grid>
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
-                        <TextBox kino:KinoForm.Label="邮编" />
-                        <kino:KinoFormItem Label="住址"
+                        <TextBox kino:Form.Label="邮编" />
+                        <kino:FormItem Label="住址"
                                            Grid.Column="1"
                                            Grid.ColumnSpan="2">
                             <TextBox />
-                        </kino:KinoFormItem>
-                    </kino:KinoForm>
+                        </kino:FormItem>
+                    </kino:Form>
                 </Expander>
-            </kino:KinoForm>
+            </kino:Form>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
                                        Haader="FormSample.xaml"
@@ -237,7 +237,7 @@
             </local:SampleSection.SourceCodes>
         </local:SampleSection>
         <local:SampleSection Header="使用LabelMemberPath">
-            <kino:KinoForm ItemsSource="{x:Static local:Product.Products}"
+            <kino:Form ItemsSource="{x:Static local:Product.Products}"
                            DisplayMemberPath="Value"
                            LabelMemberPath="Key" />
             <local:SampleSection.SourceCodes>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSampleWindow.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSampleWindow.xaml
index b9650de..77edcb9 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSampleWindow.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSampleWindow.xaml
@@ -11,17 +11,17 @@
         Height="450"
         Width="1200">
     <Window.Resources>
-        <Style TargetType="kino:KinoForm">
+        <Style TargetType="kino:Form">
             <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
                     Value="Disabled" />
             <Setter Property="Grid.IsSharedSizeScope"
                     Value="False" />
         </Style>
-        <Style TargetType="kino:KinoFormItem"
+        <Style TargetType="kino:FormItem"
                x:Key="HorizontalFormItemStyle">
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="kino:KinoFormItem">
+                    <ControlTemplate TargetType="kino:FormItem">
                         <Grid x:Name="Root">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"
@@ -41,11 +41,11 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <Style TargetType="kino:KinoFormItem"
+        <Style TargetType="kino:FormItem"
                x:Key="VerticalFormItemStyle">
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="kino:KinoFormItem">
+                    <ControlTemplate TargetType="kino:FormItem">
                         <StackPanel>
                             <ContentPresenter Content="{TemplateBinding Label}"
                                               TextBlock.Foreground="#FF777777" />
@@ -59,44 +59,44 @@
     </Window.Resources>
     <Grid>
         <StackPanel>
-            <kino:KinoPageTitle Content="Responsive" />
+            <kino:PageTitle Content="Responsive" />
             <WrapPanel x:Name="Root"
                        Grid.IsSharedSizeScope="True">
-                <kino:KinoForm>
-                    <kino:KinoFormTitle Content="Product" />
+                <kino:Form>
+                    <kino:FormTitle Content="Product" />
                     <TextBlock Text="1234999"
-                               kino:KinoForm.Label="Product ID" />
+                               kino:Form.Label="Product ID" />
                     <TextBlock Text="Power Projector 4713"
-                               kino:KinoForm.Label="IGNORE" />
+                               kino:Form.Label="IGNORE" />
                     <TextBlock Text="Projector (PR)"
-                               kino:KinoForm.Label="Category" />
+                               kino:Form.Label="Category" />
                     <TextBlock Text="A very powerful projector with special features for Internet usability, USB"
-                               kino:KinoForm.Label="Description"
+                               kino:Form.Label="Description"
                                TextWrapping="Wrap" />
                     <TextBlock Text="856.49 EUR"
-                               kino:KinoForm.Label="Price" />
-                </kino:KinoForm>
+                               kino:Form.Label="Price" />
+                </kino:Form>
 
-                <kino:KinoForm>
-                    <kino:KinoFormTitle Content="Specification" />
+                <kino:Form>
+                    <kino:FormTitle Content="Specification" />
                     <TextBlock Text="51 cm"
-                               kino:KinoForm.Label="Width" />
+                               kino:Form.Label="Width" />
                     <TextBlock Text="42 cm"
-                               kino:KinoForm.Label="Depth" />
+                               kino:Form.Label="Depth" />
                     <TextBlock Text="18 cm"
-                               kino:KinoForm.Label="Height" />
+                               kino:Form.Label="Height" />
                     <TextBlock Text="1,467 g"
-                               kino:KinoForm.Label="Weight" />
-                </kino:KinoForm>
+                               kino:Form.Label="Weight" />
+                </kino:Form>
 
 
-                <kino:KinoForm ItemsSource="{x:Static local:Product.Products}"
+                <kino:Form ItemsSource="{x:Static local:Product.Products}"
                                DisplayMemberPath="Value">
                     <ItemsControl.ItemContainerStyle>
-                        <Style TargetType="kino:KinoFormItem">
+                        <Style TargetType="kino:FormItem">
                             <Setter Property="Template">
                                 <Setter.Value>
-                                    <ControlTemplate TargetType="kino:KinoFormItem">
+                                    <ControlTemplate TargetType="kino:FormItem">
                                         <Grid x:Name="Root">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto"
@@ -118,7 +118,7 @@
 
                         </Style>
                     </ItemsControl.ItemContainerStyle>
-                </kino:KinoForm>
+                </kino:Form>
             </WrapPanel>
 
         </StackPanel>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSampleWindow.xaml.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSampleWindow.xaml.cs
index 2f44de4..0271dbd 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSampleWindow.xaml.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Form/FormSampleWindow.xaml.cs
@@ -59,9 +59,9 @@ public bool IsLargeSize
                 _isLargeSize = value;
                 Root.Resources.Clear();
                 if (_isLargeSize)
-                    Root.Resources.Add(typeof(KinoFormItem), _horizontalFormItemStyle);
+                    Root.Resources.Add(typeof(FormItem), _horizontalFormItemStyle);
                 else
-                    Root.Resources.Add(typeof(KinoFormItem), _verticalFormItemStyle);
+                    Root.Resources.Add(typeof(FormItem), _verticalFormItemStyle);
             }
         }
     }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/ListBox/ListBoxSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/ListBox/ListBoxSample.xaml
index 2513d42..bd9af09 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/ListBox/ListBoxSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/ListBox/ListBoxSample.xaml
@@ -309,10 +309,10 @@
     <StackPanel>
         <local:SampleSection Header="基本使用">
             <StackPanel>
-                <kino:KinoSelectionCheckBox Selector="{Binding ElementName=ListBox}"
+                <kino:SelectionCheckBox Selector="{Binding ElementName=ListBox}"
                                             Content="全选"
                                             Margin="8,8,8,0" />
-                <kino:KinoListBox DisplayMemberPath="Name"
+                <kino:ExtendedListBox DisplayMemberPath="Name"
                                   ItemsSource="{Binding}"
                                   IsMultiSelectCheckBoxEnabled="{Binding ElementName=IsMultiSelectCheckBoxEnabledElement,Path=IsChecked}"
                                   SelectionMode="{Binding ElementName=SelectionComboBox,Path=SelectedItem}"
@@ -320,16 +320,16 @@
                                   x:Name="ListBox" />
             </StackPanel>
             <local:SampleSection.ControlPanel>
-                <kino:KinoForm Style="{StaticResource ControlPanelFromStyle}">
+                <kino:Form Style="{StaticResource ControlPanelFromStyle}">
                     <ComboBox Width="300"
                               HorizontalAlignment="Left"
                               x:Name="SelectionComboBox"  
-                              kino:KinoForm.Label="SelectionMode"/>
+                              kino:Form.Label="SelectionMode"/>
                     <CheckBox Width="300"
-                              kino:KinoForm.Label="IsMultiSelectCheckBoxEnabled"
+                              kino:Form.Label="IsMultiSelectCheckBoxEnabled"
                               HorizontalAlignment="Left"
                               x:Name="IsMultiSelectCheckBoxEnabledElement" />
-                </kino:KinoForm>
+                </kino:Form>
             </local:SampleSection.ControlPanel>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
@@ -349,14 +349,14 @@
                               Checked="OnChangeToMultipleSelection"
                               Unchecked="OnChangeToSingleSelection"
                               HorizontalAlignment="Left" />
-                    <kino:KinoSelectionCheckBox Selector="{Binding ElementName=SquareListBox}"
+                    <kino:SelectionCheckBox Selector="{Binding ElementName=SquareListBox}"
                                                 Content="全选"
                                                 Margin="8"
                                                 Visibility="Collapsed"
                                                 x:Name="SquareSelectionCheckBox"
                                                 HorizontalAlignment="Right" />
                 </Grid>
-                <kino:KinoListBox Margin="8,0,8,8"
+                <kino:ExtendedListBox Margin="8,0,8,8"
                                   x:Name="SquareListBox"
                                   BorderThickness="0"
                                   ItemContainerStyle="{StaticResource SquareListBoxItemStyle}"
@@ -394,12 +394,12 @@
                     <Rectangle />
                     <Rectangle />
                     <Rectangle />
-                </kino:KinoListBox>
+                </kino:ExtendedListBox>
             </StackPanel>
         </local:SampleSection>
         <local:SampleSection Header="使用VisualState">
             <StackPanel>
-                <kino:KinoListBox DisplayMemberPath="Name"
+                <kino:ExtendedListBox DisplayMemberPath="Name"
                                   ItemsSource="{Binding}"
                                   ItemContainerStyle="{StaticResource StyleUsingVisualState}"
                                   IsMultiSelectCheckBoxEnabled="{Binding ElementName=IsMultiSelectCheckBoxEnabledElement2,Path=IsChecked}"
@@ -407,12 +407,12 @@
                                   Margin="8,4,8,8"/>
             </StackPanel>
             <local:SampleSection.ControlPanel>
-                <kino:KinoForm Style="{StaticResource ControlPanelFromStyle}">
+                <kino:Form Style="{StaticResource ControlPanelFromStyle}">
                     <CheckBox Width="300"
-                              kino:KinoForm.Label="IsMultiSelectCheckBoxEnabled"
+                              kino:Form.Label="IsMultiSelectCheckBoxEnabled"
                               HorizontalAlignment="Left"
                               x:Name="IsMultiSelectCheckBoxEnabledElement2" />
-                </kino:KinoForm>
+                </kino:Form>
             </local:SampleSection.ControlPanel>
         </local:SampleSection>
     </StackPanel>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Paging/PagingSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Paging/PagingSample.xaml
index e9f44e0..da500d0 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Paging/PagingSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Paging/PagingSample.xaml
@@ -28,7 +28,7 @@
                                                     SortMemberPath="Name" />
                             </DataGrid.Columns>
                         </DataGrid>
-                        <kino:KinoDataPager Source="{Binding}"
+                        <kino:DataPager Source="{Binding}"
                                             DisplayMode="FirstLastPreviousNextNumeric" />
                     </StackPanel>
                 </xctk:BusyIndicator>
@@ -56,7 +56,7 @@
                                                     SortMemberPath="Name" />
                             </DataGrid.Columns>
                         </DataGrid>
-                        <kino:KinoDataPager Source="{Binding}"
+                        <kino:DataPager Source="{Binding}"
                                             DisplayMode="FirstLastPreviousNextNumeric" />
                     </StackPanel>
                 </xctk:BusyIndicator>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/ProgressRing/ProgressRingSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/ProgressRing/ProgressRingSample.xaml
index 0e3d986..a5fc783 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/ProgressRing/ProgressRingSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/ProgressRing/ProgressRingSample.xaml
@@ -13,11 +13,11 @@
     <Grid>
         <local:SampleSection>
             <StackPanel VerticalAlignment="Center" HorizontalAlignment="Left">
-                <kino:KinoProgressRing IsActive="True"
+                <kino:ProgressRing IsActive="True"
                                        Height="20"
                                        Width="20"
                                        Margin="8" />
-                <kino:KinoProgressRing IsActive="True"
+                <kino:ProgressRing IsActive="True"
                                        Height="40"
                                        Width="40"
                                        Margin="8"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/RadioButtonMenuItem/RadioButtonMenuItemSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/RadioButtonMenuItem/RadioButtonMenuItemSample.xaml
index b281499..67f3bd1 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/RadioButtonMenuItem/RadioButtonMenuItemSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/RadioButtonMenuItem/RadioButtonMenuItemSample.xaml
@@ -13,35 +13,35 @@
     <Grid>
         <local:SampleSection>
             <Menu>
-                <kino:KinoRadioButtonMenuItem Header="Option A" />
-                <kino:KinoRadioButtonMenuItem Header="Option B" />
-                <kino:KinoRadioButtonMenuItem Header="Option C" />
+                <kino:RadioButtonMenuItem Header="Option A" />
+                <kino:RadioButtonMenuItem Header="Option B" />
+                <kino:RadioButtonMenuItem Header="Option C" />
                 <Separator />
-                <kino:KinoRadioButtonMenuItem Header="MoreOptions">
-                    <kino:KinoRadioButtonMenuItem Header="Option 1"
+                <kino:RadioButtonMenuItem Header="MoreOptions">
+                    <kino:RadioButtonMenuItem Header="Option 1"
                                                   GroupName="GroupA" />
-                    <kino:KinoRadioButtonMenuItem Header="Option 2"
+                    <kino:RadioButtonMenuItem Header="Option 2"
                                                   GroupName="GroupA" />
-                    <kino:KinoRadioButtonMenuItem Header="Option 3"
+                    <kino:RadioButtonMenuItem Header="Option 3"
                                                   GroupName="GroupA" />
                     <Separator />
-                    <kino:KinoRadioButtonMenuItem Header="Option 4"
+                    <kino:RadioButtonMenuItem Header="Option 4"
                                                   GroupName="GroupB" />
-                    <kino:KinoRadioButtonMenuItem Header="Option 5"
+                    <kino:RadioButtonMenuItem Header="Option 5"
                                                   GroupName="GroupB" />
-                    <kino:KinoRadioButtonMenuItem Header="Option 6"
+                    <kino:RadioButtonMenuItem Header="Option 6"
                                                   GroupName="GroupB" />
                     
                     
                     <Separator />
-                    <kino:KinoRadioButtonMenuItem Header="Options ">
-                        <kino:KinoRadioButtonMenuItem Header="Option 7"
+                    <kino:RadioButtonMenuItem Header="Options ">
+                        <kino:RadioButtonMenuItem Header="Option 7"
                                                       GroupName="GroupC" />
-                        <kino:KinoRadioButtonMenuItem Header="Option 8"
+                        <kino:RadioButtonMenuItem Header="Option 8"
                                                       GroupName="GroupC" />
-                        <kino:KinoRadioButtonMenuItem Header="Option 9"
+                        <kino:RadioButtonMenuItem Header="Option 9"
                                                       GroupName="GroupC" />
-                    </kino:KinoRadioButtonMenuItem>
+                    </kino:RadioButtonMenuItem>
                     <Separator />
                     <MenuItem IsCheckable="True"
                               Header="Option X" />
@@ -49,7 +49,7 @@
                               Header="Option Y" />
                     <MenuItem IsCheckable="True"
                               Header="Option Z" />
-                </kino:KinoRadioButtonMenuItem>
+                </kino:RadioButtonMenuItem>
             </Menu>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Resizer/ResizerSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Resizer/ResizerSample.xaml
index 93963f9..9ca19c9 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Resizer/ResizerSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Resizer/ResizerSample.xaml
@@ -27,19 +27,19 @@
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
-                        <kino:KinoResizer HorizontalContentAlignment="Left">
+                        <kino:Resizer HorizontalContentAlignment="Left">
                             <TextBox AcceptsReturn="True"
                                      MinWidth="50"
                                      VerticalScrollBarVisibility="Disabled" />
-                        </kino:KinoResizer>
+                        </kino:Resizer>
                         <Button Margin="8,0,0,0"
                                 Grid.Column="1" />
                     </Grid>
                     <StackPanel Orientation="Horizontal"
                                 Margin="0,8,0,0">
-                        <kino:KinoResizer>
+                        <kino:Resizer>
                             <TextBox  MinWidth="50" />
-                        </kino:KinoResizer>
+                        </kino:Resizer>
                         <Button Margin="8,0,0,0" />
                     </StackPanel>
                 </StackPanel>
@@ -51,10 +51,10 @@
             </local:SampleSection>
             <local:SampleSection Header="Vertical">
                 <StackPanel>
-                    <kino:KinoResizer HorizontalContentAlignment="Stretch">
+                    <kino:Resizer HorizontalContentAlignment="Stretch">
                         <TextBox AcceptsReturn="True"
                                  VerticalScrollBarVisibility="Disabled" />
-                    </kino:KinoResizer>
+                    </kino:Resizer>
                     <Button Margin="0,8,0,0" />
                 </StackPanel>
                 <local:SampleSection.SourceCodes>
@@ -66,18 +66,18 @@
 
             <local:SampleSection Header="Custom Animation">
                 <StackPanel>
-                    <kino:KinoResizer HorizontalContentAlignment="Stretch">
-                        <kino:KinoResizer.Animation>
+                    <kino:Resizer HorizontalContentAlignment="Stretch">
+                        <kino:Resizer.Animation>
                             <DoubleAnimation BeginTime="0:0:0"
                                              Duration="0:0:3">
                                 <DoubleAnimation.EasingFunction>
                                     <QuinticEase EasingMode="EaseOut" />
                                 </DoubleAnimation.EasingFunction>
                             </DoubleAnimation>
-                        </kino:KinoResizer.Animation>
+                        </kino:Resizer.Animation>
                         <TextBox AcceptsReturn="True"
                                  VerticalScrollBarVisibility="Disabled" />
-                    </kino:KinoResizer>
+                    </kino:Resizer>
                     <Button Content="Commit"
                             Margin="0,8,0,0" />
                 </StackPanel>
@@ -89,11 +89,11 @@
             </local:SampleSection>
             <local:SampleSection Header="No Animation">
                 <StackPanel>
-                    <kino:KinoResizer HorizontalContentAlignment="Stretch"
+                    <kino:Resizer HorizontalContentAlignment="Stretch"
                                       Animation="{x:Null}">
                         <TextBox AcceptsReturn="True"
                                  VerticalScrollBarVisibility="Disabled" />
-                    </kino:KinoResizer>
+                    </kino:Resizer>
                     <Button Content="Commit"
                             Margin="0,8,0,0" />
                 </StackPanel>
@@ -106,18 +106,18 @@
 
             <local:SampleSection Header="Simple Expander">
                 <StackPanel>
-                    <kino:KinoResizer HorizontalContentAlignment="Stretch">
+                    <kino:Resizer HorizontalContentAlignment="Stretch">
                         <Expander Header="Expander1">
                             <Rectangle Height="100"
                                        Fill="Red" />
                         </Expander>
-                    </kino:KinoResizer>
-                    <kino:KinoResizer HorizontalContentAlignment="Stretch">
+                    </kino:Resizer>
+                    <kino:Resizer HorizontalContentAlignment="Stretch">
                         <Expander Header="Expander2">
                             <Rectangle Height="100"
                                        Fill="Blue" />
                         </Expander>
-                    </kino:KinoResizer>
+                    </kino:Resizer>
                 </StackPanel>
                 <local:SampleSection.SourceCodes>
                     <local:SourceCodeModel SourceCodeType="Xaml"
@@ -128,7 +128,7 @@
 
             <local:SampleSection Header="Outlook 2019">
                 <StackPanel>
-                    <kino:KinoResizer HorizontalContentAlignment="Stretch">
+                    <kino:Resizer HorizontalContentAlignment="Stretch">
                         <Expander Header="我的日历">
                             <StackPanel>
                                 <CheckBox Content="Calender"/>
@@ -136,8 +136,8 @@
                                 <CheckBox Content="Birthdays"/>
                             </StackPanel>
                         </Expander>
-                    </kino:KinoResizer>
-                    <kino:KinoResizer HorizontalContentAlignment="Stretch">
+                    </kino:Resizer>
+                    <kino:Resizer HorizontalContentAlignment="Stretch">
                         <Expander Header="其它日历">
                             <StackPanel>
                                 <CheckBox Content="Calender"/>
@@ -145,8 +145,8 @@
                                 <CheckBox Content="Birthdays"/>
                             </StackPanel>
                         </Expander>
-                    </kino:KinoResizer>
-                    <kino:KinoResizer HorizontalContentAlignment="Stretch">
+                    </kino:Resizer>
+                    <kino:Resizer HorizontalContentAlignment="Stretch">
                         <Expander Header="共享日历">
                             <StackPanel>
                                 <CheckBox Content="Calender"/>
@@ -154,7 +154,7 @@
                                 <CheckBox Content="Birthdays"/>
                             </StackPanel>
                         </Expander>
-                    </kino:KinoResizer>
+                    </kino:Resizer>
                 </StackPanel>
             </local:SampleSection>
         </StackPanel>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/SquareBox/SquareBoxSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/SquareBox/SquareBoxSample.xaml
index 707f686..ee6958a 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/SquareBox/SquareBoxSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/SquareBox/SquareBoxSample.xaml
@@ -14,43 +14,43 @@
         <StackPanel>
             <local:SampleSection>
                 <StackPanel Orientation="Horizontal">
-                    <kino:KinoSquareBox HorizontalAlignment="Left"
+                    <kino:SquareBox HorizontalAlignment="Left"
                                         Height="{Binding ElementName=HeightElement,Path=Value}"
                                         Width="{Binding ElementName=WidthElement,Path=Value}">
                         <Ellipse Fill="Green" />
-                    </kino:KinoSquareBox>
-                    <kino:KinoSquareBox Margin="8,0,0,0"
+                    </kino:SquareBox>
+                    <kino:SquareBox Margin="8,0,0,0"
                                         HorizontalAlignment="Left"
                                         Height="{Binding ElementName=HeightElement,Path=Value}"
                                         Width="{Binding ElementName=WidthElement,Path=Value}">
                         <Rectangle Fill="Green" />
-                    </kino:KinoSquareBox>
+                    </kino:SquareBox>
                 </StackPanel>
                 <local:SampleSection.ControlPanel>
                     <StackPanel>
-                        <kino:KinoForm HorizontalAlignment="Left"
+                        <kino:Form HorizontalAlignment="Left"
                                        ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
-                            <Slider kino:KinoForm.Label="Height"
+                            <Slider kino:Form.Label="Height"
                                     Maximum="100"
                                     Value="10"
                                     Minimum="5"
                                     Width="300"
                                     x:Name="HeightElement">
-                                <kino:KinoForm.Description>
+                                <kino:Form.Description>
                                     <TextBlock Text="{Binding ElementName=HeightElement,Path=Value,StringFormat=N2}" />
-                                </kino:KinoForm.Description>
+                                </kino:Form.Description>
                             </Slider>
-                            <Slider kino:KinoForm.Label="Width"
+                            <Slider kino:Form.Label="Width"
                                     Maximum="100"
                                     Value="10"
                                     Minimum="5"
                                     Width="300"
                                     x:Name="WidthElement">
-                                <kino:KinoForm.Description>
+                                <kino:Form.Description>
                                     <TextBlock Text="{Binding ElementName=WidthElement,Path=Value,StringFormat=N2}" />
-                                </kino:KinoForm.Description>
+                                </kino:Form.Description>
                             </Slider>
-                        </kino:KinoForm>
+                        </kino:Form>
                     </StackPanel>
                 </local:SampleSection.ControlPanel>
                 <local:SampleSection.SourceCodes>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/StateIndicator/StateIndicatorSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/StateIndicator/StateIndicatorSample.xaml
index 6ad8743..a73c41e 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/StateIndicator/StateIndicatorSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/StateIndicator/StateIndicatorSample.xaml
@@ -12,22 +12,22 @@
                   d:DesignWidth="800">
     <Grid>
         <local:SampleSection>
-            <kino:KinoStateIndicator x:Name="StateIndicator"
+            <kino:StateIndicator x:Name="StateIndicator"
                                      VerticalContentAlignment="Center"
                                      HorizontalContentAlignment="Center"
                                      State="{Binding SelectedItem,ElementName=StatesListBox}"
                                      HorizontalAlignment="Left" />
             <local:SampleSection.ControlPanel>
-                <kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
-                    <CheckBox kino:KinoForm.Label="Has Content"
+                <kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
+                    <CheckBox kino:Form.Label="Has Content"
                               x:Name="HasContentCheckBox"
                               Checked="OnHasContentChecked"
                               Unchecked="OnHasContentUnchecked" />
                     <ListBox x:Name="StatesListBox"
                              HorizontalAlignment="Left"
                              Width="250"
-                             kino:KinoForm.Label="State" />
-                </kino:KinoForm>
+                             kino:Form.Label="State" />
+                </kino:Form>
             </local:SampleSection.ControlPanel>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/TransitioningContentControl/TransitioningContentControlSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/TransitioningContentControl/TransitioningContentControlSample.xaml
index 74a50aa..a433b46 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/TransitioningContentControl/TransitioningContentControlSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/TransitioningContentControl/TransitioningContentControlSample.xaml
@@ -13,7 +13,7 @@
     <Grid>
         <Grid.Resources>
             <ControlTemplate x:Key="CustomTemplate"
-                             TargetType="kino:KinoTransitioningContentControl">
+                             TargetType="kino:TransitioningContentControl">
                 <Border Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}">
@@ -176,7 +176,7 @@
         <StackPanel>
             <local:SampleSection Header="Default Transition">
                 <StackPanel>
-                    <kino:KinoTransitioningContentControl Margin="8"
+                    <kino:TransitioningContentControl Margin="8"
                                                           x:Name="DefaultContent"
                                                           HorizontalAlignment="Left" />
                     <StackPanel Orientation="Horizontal">
@@ -213,7 +213,7 @@
             </local:SampleSection>
             <local:SampleSection Header="Custom Transition">
                 <StackPanel>
-                    <kino:KinoTransitioningContentControl Margin="8"
+                    <kino:TransitioningContentControl Margin="8"
                                                           x:Name="CustomContent"
                                                           Template="{StaticResource CustomTemplate}" />
                     <StackPanel Orientation="Horizontal">
@@ -239,8 +239,8 @@
 
 
             <local:SampleSection Header="Custom ContentTemplate">
-                <kino:KinoTransitioningContentControl x:Name="ContentControl"
-                                                      Transition="{x:Static kino:KinoTransitioningContentControl.DownTransitionState}"
+                <kino:TransitioningContentControl x:Name="ContentControl"
+                                                      Transition="{x:Static kino:TransitioningContentControl.DownTransitionState}"
                                                       Margin="0,0,0,30">
                     <ContentControl.ContentTemplate>
                         <DataTemplate>
@@ -273,7 +273,7 @@
                             </Grid>
                         </DataTemplate>
                     </ContentControl.ContentTemplate>
-                </kino:KinoTransitioningContentControl>
+                </kino:TransitioningContentControl>
                 <local:SampleSection.SourceCodes>
                     <local:SourceCodeModel SourceCodeType="Xaml"
                                            Haader="TransitioningContentControlSample.xaml"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/TransitioningContentControl/TransitioningContentControlSample.xaml.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/TransitioningContentControl/TransitioningContentControlSample.xaml.cs
index c896762..d554b39 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/TransitioningContentControl/TransitioningContentControlSample.xaml.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/TransitioningContentControl/TransitioningContentControlSample.xaml.cs
@@ -46,31 +46,31 @@ private async void OnLoaded(object sender, RoutedEventArgs e)
 
         private void OnChangByDefault(object sender, RoutedEventArgs e)
         {
-            DefaultContent.Transition = KinoTransitioningContentControl.DefaultTransitionState;
+            DefaultContent.Transition = TransitioningContentControl.DefaultTransitionState;
             DefaultContent.Content = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
         }
 
         private void OnChangeByLeft(object sender, RoutedEventArgs e)
         {
-            DefaultContent.Transition = KinoTransitioningContentControl.LeftTransitionState;
+            DefaultContent.Transition = TransitioningContentControl.LeftTransitionState;
             DefaultContent.Content = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
         }
 
         private void OnChangeByUp(object sender, RoutedEventArgs e)
         {
-            DefaultContent.Transition = KinoTransitioningContentControl.UpTransitionState;
+            DefaultContent.Transition = TransitioningContentControl.UpTransitionState;
             DefaultContent.Content = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
         }
 
         private void OnChangeByRight(object sender, RoutedEventArgs e)
         {
-            DefaultContent.Transition = KinoTransitioningContentControl.RightTransitionState;
+            DefaultContent.Transition = TransitioningContentControl.RightTransitionState;
             DefaultContent.Content = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
         }
 
         private void OnChangeByDown(object sender, RoutedEventArgs e)
         {
-            DefaultContent.Transition = KinoTransitioningContentControl.DownTransitionState;
+            DefaultContent.Transition = TransitioningContentControl.DownTransitionState;
             DefaultContent.Content = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
         }
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/TestRibbonWindow.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/TestRibbonWindow.xaml
index 088f16c..cace03a 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/TestRibbonWindow.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/TestRibbonWindow.xaml
@@ -1,4 +1,4 @@
-<kino:KinoRibbonWindow x:Class="Kino.Toolkit.Wpf.Samples.TestRibbonWindow"
+<kino:ExtendedRibbonWindow x:Class="Kino.Toolkit.Wpf.Samples.TestRibbonWindow"
                        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,8 +10,8 @@
                        Title="TestWindow"
                        Height="450"
                        Width="800">
-    <kino:KinoRibbonWindow.FunctionBar>
-        <kino:KinoWindowFunctionBar>
+    <kino:ExtendedRibbonWindow.FunctionBar>
+        <kino:WindowFunctionBar>
             <Button Content="Dino.C" />
             <Separator />
             <Menu>
@@ -35,8 +35,8 @@
                            Fill="White" />
                 </Grid>
             </Button>
-        </kino:KinoWindowFunctionBar>
-    </kino:KinoRibbonWindow.FunctionBar>
+        </kino:WindowFunctionBar>
+    </kino:ExtendedRibbonWindow.FunctionBar>
 
     <Grid>
         <Ribbon x:Name="RibbonMenu"
@@ -84,4 +84,4 @@
                 HorizontalAlignment="Center" />
 
     </Grid>
-</kino:KinoRibbonWindow>
+</kino:ExtendedRibbonWindow>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/TestWindow.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/TestWindow.xaml
index 2ce3f5e..a79f308 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/TestWindow.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/TestWindow.xaml
@@ -1,4 +1,4 @@
-<kino:KinoWindow x:Class="Kino.Toolkit.Wpf.Samples.TestWindow"
+<kino:ExtendedWindow x:Class="Kino.Toolkit.Wpf.Samples.TestWindow"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,8 +10,8 @@
                  Width="400"
                  SizeToContent="Height"
                  UseLayoutRounding="True">
-    <kino:KinoWindow.FunctionBar>
-        <kino:KinoWindowFunctionBar>
+    <kino:ExtendedWindow.FunctionBar>
+        <kino:WindowFunctionBar>
             <Button Content="Dino.C" />
             <Separator />
             <Menu>
@@ -35,8 +35,8 @@
                            Fill="White" />
                 </Grid>
             </Button>
-        </kino:KinoWindowFunctionBar>
-    </kino:KinoWindow.FunctionBar>
+        </kino:WindowFunctionBar>
+    </kino:ExtendedWindow.FunctionBar>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
@@ -59,4 +59,4 @@
                 Margin="0,10" />
 
     </Grid>
-</kino:KinoWindow>
+</kino:ExtendedWindow>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/WindowSample.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/WindowSample.xaml
index f77df69..978ee48 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/WindowSample.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Samples/Window/WindowSample.xaml
@@ -39,8 +39,8 @@
                         Click="OnSystemRibbonWindowShowDialog" />
             </StackPanel>
             <local:SampleSection.ControlPanel>
-                <kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
-                    <ListBox kino:KinoForm.Label="WindowState"
+                <kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
+                    <ListBox kino:Form.Label="WindowState"
                              SelectedIndex="0"
                              Width="250"
                              HorizontalAlignment="Left"
@@ -48,7 +48,7 @@
                         <WindowState>Normal</WindowState>
                         <WindowState>Maximized</WindowState>
                     </ListBox>
-                    <ListBox kino:KinoForm.Label="WindowStartupLocation"
+                    <ListBox kino:Form.Label="WindowStartupLocation"
                              SelectedIndex="0"
                              Width="250"
                              HorizontalAlignment="Left"
@@ -57,7 +57,7 @@
                         <WindowStartupLocation>CenterScreen</WindowStartupLocation>
                         <WindowStartupLocation>CenterOwner</WindowStartupLocation>
                     </ListBox>
-                    <ListBox kino:KinoForm.Label="ResizeMode"
+                    <ListBox kino:Form.Label="ResizeMode"
                              SelectedIndex="0"
                              Width="250"
                              HorizontalAlignment="Left"
@@ -67,7 +67,7 @@
                         <ResizeMode>CanResize</ResizeMode>
                         <ResizeMode>CanResizeWithGrip</ResizeMode>
                     </ListBox>
-                </kino:KinoForm>
+                </kino:Form>
             </local:SampleSection.ControlPanel>
             <local:SampleSection.SourceCodes>
                 <local:SourceCodeModel SourceCodeType="Xaml"
@@ -78,4 +78,3 @@
 
     </Grid>
 </local:SamplePage>
-                  
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section1.txt
index 2a310a6..7ed4ebf 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section1.txt
@@ -1,18 +1,18 @@
-<kino:KinoButton Content="bookmark"
+<kino:ExtendedButton Content="bookmark"
                  MinWidth="18"
                  x:Name="BookmarkButton"
                  HorizontalAlignment="Left"
                  State="{Binding SelectedItem,ElementName=StatesListBox}">
-    <kino:KinoButton.Icon>
+    <kino:ExtendedButton.Icon>
         <TextBlock Style="{StaticResource FontAwesome}"
                    Text="&#xf02e;" />
-    </kino:KinoButton.Icon>
-</kino:KinoButton>
+    </kino:ExtendedButton.Icon>
+</kino:ExtendedButton>
 
 <local:SampleSection.ControlPanel>
-    <kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
+    <kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
         <StackPanel Orientation="Horizontal"
-                    kino:KinoForm.Label="Content And Icon">
+                    kino:Form.Label="Content And Icon">
             <RadioButton Content="Content Only"
                          Checked="OnContentOnlyCheck" />
             <RadioButton Content="Icon Only"
@@ -26,6 +26,6 @@
         <ListBox x:Name="StatesListBox"
                  HorizontalAlignment="Left"
                  Width="250"
-                 kino:KinoForm.Label="State" />
-    </kino:KinoForm>
+                 kino:Form.Label="State" />
+    </kino:Form>
 </local:SampleSection.ControlPanel>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section3.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section3.txt
index fb43341..358b08a 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section3.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section3.txt
@@ -2,16 +2,16 @@
     <TextBlock Text="Comment" />
     <TextBox Width="200"
              HorizontalAlignment="Left" />
-    <kino:KinoButton Content="Comment"
+    <kino:ExtendedButton Content="Comment"
                      x:Name="CommentButton"
                      HorizontalAlignment="Left"
                      Margin="0,4,0,0"
                      Width="100"
                      Click="OnComment"
                      IsDefault="True">
-        <kino:KinoButton.Icon>
+        <kino:ExtendedButton.Icon>
             <TextBlock Style="{StaticResource FontAwesome}"
                        Text="&#xf075;" Foreground="BlueViolet"/>
-        </kino:KinoButton.Icon>
-    </kino:KinoButton>
+        </kino:ExtendedButton.Icon>
+    </kino:ExtendedButton>
 </StackPanel>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section4.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section4.txt
index ff21c61..dc597bb 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section4.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ButtonSample.Section4.txt
@@ -1,6 +1,6 @@
 private async void OnComment(object sender, RoutedEventArgs e)
 {
-    var button = sender as KinoButton;
+    var button = sender as ExtendedButton;
     button.IsEnabled = false;
     button.State = ProgressState.Busy;
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/DataGridSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/DataGridSample.Section1.txt
index e936f25..9a67927 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/DataGridSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/DataGridSample.Section1.txt
@@ -4,7 +4,7 @@
           HorizontalAlignment="Left"
           Margin="8"
           x:Name="SelectionComboBox" />
-<kino:KinoDataGrid ItemsSource="{Binding}" 
+<kino:ExtendedDataGrid ItemsSource="{Binding}" 
                AutoGenerateColumns="False"
                SelectionMode="{Binding ElementName=SelectionComboBox,Path=SelectedItem}"
                IsReadOnly="True">
@@ -13,4 +13,4 @@
                         Binding="{Binding Name}"
                         Width="200" />
     </DataGrid.Columns>
-</kino:KinoDataGrid>
+</kino:ExtendedDataGrid>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/DataPagerSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/DataPagerSample.Section1.txt
index 51311eb..36ce8b5 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/DataPagerSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/DataPagerSample.Section1.txt
@@ -1,5 +1,5 @@
 <extend:ColorToSolidColorBrushConverter x:Key="ColorToSolidBrushConverter" />
-<Style TargetType="kino:KinoDataPager">
+<Style TargetType="kino:DataPager">
     <Setter Property="NumericButtonCount"
             Value="{Binding Value, ElementName=NumericButtonCount}" />
     <Setter Property="AutoEllipsis"
@@ -15,20 +15,20 @@
 </Style>
 
 
-<kino:KinoForm>
-    <kino:KinoDataPager DisplayMode="FirstLastNumeric"
-                        kino:KinoForm.Label="FirstLastNumeric" />
-    <kino:KinoDataPager DisplayMode="FirstLastPreviousNext"
-                        kino:KinoForm.Label="FirstLastPreviousNext" />
-    <kino:KinoDataPager DisplayMode="FirstLastPreviousNextNumeric"
-                        kino:KinoForm.Label="FirstLastPreviousNextNumeric" />
-    <kino:KinoDataPager DisplayMode="Numeric"
-                        kino:KinoForm.Label="Numeric" />
-    <kino:KinoDataPager DisplayMode="PreviousNext"
-                        kino:KinoForm.Label="PreviousNext" />
-    <kino:KinoDataPager DisplayMode="PreviousNextNumeric"
-                        kino:KinoForm.Label="PreviousNextNumeric" />
-</kino:KinoForm>
+<kino:Form>
+    <kino:DataPager DisplayMode="FirstLastNumeric"
+                        kino:Form.Label="FirstLastNumeric" />
+    <kino:DataPager DisplayMode="FirstLastPreviousNext"
+                        kino:Form.Label="FirstLastPreviousNext" />
+    <kino:DataPager DisplayMode="FirstLastPreviousNextNumeric"
+                        kino:Form.Label="FirstLastPreviousNextNumeric" />
+    <kino:DataPager DisplayMode="Numeric"
+                        kino:Form.Label="Numeric" />
+    <kino:DataPager DisplayMode="PreviousNext"
+                        kino:Form.Label="PreviousNext" />
+    <kino:DataPager DisplayMode="PreviousNextNumeric"
+                        kino:Form.Label="PreviousNextNumeric" />
+</kino:Form>
 <StackPanel Grid.Column="1">
     <ListBox ItemsSource="{Binding}"
              DisplayMemberPath="Name"
@@ -49,22 +49,22 @@
 </StackPanel>
 
 
-<kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}"
+<kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}"
                HorizontalAlignment="Left">
     <CheckBox x:Name="AutoEllipsis"
-              kino:KinoForm.Label="AutoEllipsis" />
+              kino:Form.Label="AutoEllipsis" />
     <CheckBox x:Name="TotalItemCountFixed"
-              kino:KinoForm.Label="IsTotalItemCountFixed"
+              kino:Form.Label="IsTotalItemCountFixed"
               IsChecked="True" />
     <extend:IntegerUpDown x:Name="NumericButtonCount"
-                          kino:KinoForm.Label="NumericButtonCount"
+                          kino:Form.Label="NumericButtonCount"
                           Value="5"
                           Minimum="0"
                           Maximum="20" />
     <extend:IntegerUpDown Value="{Binding PageSize, Mode=TwoWay}"
-                          kino:KinoForm.Label="PageSize"
+                          kino:Form.Label="PageSize"
                           Minimum="1" />
     <extend:ColorPicker SelectedColor="Black"
-                        kino:KinoForm.Label="Foreground"
+                        kino:Form.Label="Foreground"
                         x:Name="ColorPicker" />
-</kino:KinoForm>
\ No newline at end of file
+</kino:Form>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ExpanderSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ExpanderSample.Section1.txt
index 2332e1c..763f1cf 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ExpanderSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ExpanderSample.Section1.txt
@@ -1,23 +1,23 @@
 <StackPanel>
-    <kino:KinoExpander Header="我的日历">
+    <kino:ExtendedExpander Header="我的日历">
         <StackPanel>
             <CheckBox Content="Calender"/>
             <CheckBox Content="中国节假日"/>
             <CheckBox Content="Birthdays"/>
         </StackPanel>
-    </kino:KinoExpander>
-    <kino:KinoExpander Header="其它日历">
+    </kino:ExtendedExpander>
+    <kino:ExtendedExpander Header="其它日历">
         <StackPanel>
             <CheckBox Content="Calender"/>
             <CheckBox Content="中国节假日"/>
             <CheckBox Content="Birthdays"/>
         </StackPanel>
-    </kino:KinoExpander>
-    <kino:KinoExpander Header="共享日历">
+    </kino:ExtendedExpander>
+    <kino:ExtendedExpander Header="共享日历">
         <StackPanel>
             <CheckBox Content="Calender"/>
             <CheckBox Content="中国节假日"/>
             <CheckBox Content="Birthdays"/>
         </StackPanel>
-    </kino:KinoExpander>
+    </kino:ExtendedExpander>
 </StackPanel>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ExpanderSample.Section2.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ExpanderSample.Section2.txt
index e1b49e2..385f0af 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ExpanderSample.Section2.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ExpanderSample.Section2.txt
@@ -1,8 +1,8 @@
-var expanders = new List<KinoExpander>();
+var expanders = new List<ExtendedExpander>();
 Expander firstExpander = null;
 for (int i = 0; i < 10; i++)
 {
-    var expander = new KinoExpander() { Header = "This is AccordionItem " + i };
+    var expander = new ExtendedExpander() { Header = "This is AccordionItem " + i };
     if (i == 0)
         firstExpander = expander;
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section1.txt
index 7510e72..32e5078 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section1.txt
@@ -1,36 +1,36 @@
 <StackPanel Width="500"
             HorizontalAlignment="Left"
             Grid.IsSharedSizeScope="True">
-    <kino:KinoFormTitle Content="用户信息" />
-    <kino:KinoFormItem Label="用户名"
+    <kino:FormTitle Content="用户信息" />
+    <kino:FormItem Label="用户名"
                        IsRequired="True">
         <TextBox Text="{Binding Name,Mode=TwoWay}" />
-    </kino:KinoFormItem>
-    <kino:KinoFormItem Label="密码"
+    </kino:FormItem>
+    <kino:FormItem Label="密码"
                        IsRequired="True">
         <PasswordBox />
-    </kino:KinoFormItem>
-    <kino:KinoFormItem Label="国家与地区(请选择居住地)">
+    </kino:FormItem>
+    <kino:FormItem Label="国家与地区(请选择居住地)">
         <ComboBox />
-    </kino:KinoFormItem>
-    <kino:KinoFormSeparator />
+    </kino:FormItem>
+    <kino:FormSeparator />
 
-    <kino:KinoFormTitle Content="家庭信息"
+    <kino:FormTitle Content="家庭信息"
                         Description="填写家庭信息可以让我们给您提供更好的服务。"/>
-    <kino:KinoFormItem Label="父"
+    <kino:FormItem Label="父"
                        Description="可以不填">
         <TextBox />
-    </kino:KinoFormItem>
-    <kino:KinoFormItem Label="母"
+    </kino:FormItem>
+    <kino:FormItem Label="母"
                        Description="可以不填">
         <TextBox />
-    </kino:KinoFormItem>
-    <kino:KinoFormItem Label="伴侣"
+    </kino:FormItem>
+    <kino:FormItem Label="伴侣"
                        Description="可以没有"
                        IsRequired="True">
         <TextBox />
-    </kino:KinoFormItem>
-    <kino:KinoFormItem Label="性别">
+    </kino:FormItem>
+    <kino:FormItem Label="性别">
         <StackPanel Orientation="Horizontal">
             <RadioButton Content="男"
                          GroupName="Sex" />
@@ -38,11 +38,11 @@
                          GroupName="Sex"
                          Margin="8,0,0,0" />
         </StackPanel>
-    </kino:KinoFormItem>
-    <kino:KinoFormItem Label="备注"
+    </kino:FormItem>
+    <kino:FormItem Label="备注"
                        LabelTemplate="{StaticResource TopHeaderTemplate}">
         <TextBox AcceptsReturn="True"
                  VerticalScrollBarVisibility="Auto"
                  Height="100" />
-    </kino:KinoFormItem>
+    </kino:FormItem>
 </StackPanel>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section2.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section2.txt
index c24d59b..811e9c2 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section2.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section2.txt
@@ -1,10 +1,10 @@
 <local:SampleSection.Resources>
-    <Style TargetType="kino:KinoFormItem">
+    <Style TargetType="kino:FormItem">
         <Setter Property="Padding"
                 Value="0,4,0,0" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="kino:KinoFormItem">
+                <ControlTemplate TargetType="kino:FormItem">
                     <StackPanel x:Name="Root">
                         <StackPanel Orientation="Horizontal">
                             <ContentPresenter Content="{TemplateBinding Label}"
@@ -35,28 +35,28 @@
         </Setter>
     </Style>
 </local:SampleSection.Resources>
-<kino:KinoForm Width="400"
+<kino:Form Width="400"
                HorizontalAlignment="Left"
                Header="登录">
-    <kino:KinoFormTitle Content="用户信息" />
+    <kino:FormTitle Content="用户信息" />
 
-    <TextBox kino:KinoForm.Label="用户名"
-             kino:KinoForm.IsRequired="True"
+    <TextBox kino:Form.Label="用户名"
+             kino:Form.IsRequired="True"
              Text="{Binding Name,Mode=TwoWay}" />
 
-    <PasswordBox kino:KinoForm.Label="密码"
-                 kino:KinoForm.IsRequired="True" />
-    <ComboBox kino:KinoForm.Label="国家"
-              kino:KinoForm.Description="请选择先居住地" />
+    <PasswordBox kino:Form.Label="密码"
+                 kino:Form.IsRequired="True" />
+    <ComboBox kino:Form.Label="国家"
+              kino:Form.Description="请选择先居住地" />
 
-    <kino:KinoForm.FunctionBar>
-        <kino:KinoFormFunctionBar>
-            <kino:KinoButton Content="OK"
+    <kino:Form.FunctionBar>
+        <kino:FormFunctionBar>
+            <kino:ExtendedButton Content="OK"
                              Click="OnOK"
                              IsDefault="True" />
-            <kino:KinoButton Content="Cancel"
+            <kino:ExtendedButton Content="Cancel"
                              IsCancel="True" />
 
-        </kino:KinoFormFunctionBar>
-    </kino:KinoForm.FunctionBar>
-</kino:KinoForm>
+        </kino:FormFunctionBar>
+    </kino:Form.FunctionBar>
+</kino:Form>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section3.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section3.txt
index 5cc088a..792d023 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section3.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section3.txt
@@ -1,4 +1,4 @@
-<kino:KinoPageTitle>
+<kino:PageTitle>
     <Grid>
         <TextBlock Text="Responsive" />
         <CheckBox HorizontalAlignment="Right"
@@ -8,4 +8,4 @@
                   Checked="OnCanEditChecked"
                   Unchecked="OnCanEditUnchecked" />
     </Grid>
-</kino:KinoPageTitle>
+</kino:PageTitle>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section4.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section4.txt
index bb52b94..e86beb9 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section4.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormItemSample.Section4.txt
@@ -1,7 +1,7 @@
 private async void OnCanEditChecked(object sender, RoutedEventArgs e)
 {
     this.Root.Resources.Clear();
-    this.Root.Resources.Add(typeof(KinoFormItem), this._editableFormItemStyle);
+    this.Root.Resources.Add(typeof(FormItem), this._editableFormItemStyle);
     await this.Dispatcher.InvokeAsync(async () =>
     {
         await Task.Delay(100);
@@ -12,5 +12,5 @@
 private void OnCanEditUnchecked(object sender, RoutedEventArgs e)
 {
     this.Root.Resources.Clear();
-    this.Root.Resources.Add(typeof(KinoFormItem), this._formItemStyle);
+    this.Root.Resources.Add(typeof(FormItem), this._formItemStyle);
 }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section1.txt
index 2ee754e..b79317f 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section1.txt
@@ -1,28 +1,28 @@
-<kino:KinoForm Width="500"
+<kino:Form Width="500"
                HorizontalAlignment="Left"
                Header="NormalForm">
-    <kino:KinoFormTitle Content="用户信息" />
-    <TextBox kino:KinoForm.Label="用户名"
-             kino:KinoForm.IsRequired="True"
+    <kino:FormTitle Content="用户信息" />
+    <TextBox kino:Form.Label="用户名"
+             kino:Form.IsRequired="True"
              Text="{Binding Name,Mode=TwoWay}" />
 
-    <PasswordBox kino:KinoForm.Label="密码"
-                 kino:KinoForm.IsRequired="True" />
-    <ComboBox kino:KinoForm.Label="国家与地区(请选择居住地)" />
+    <PasswordBox kino:Form.Label="密码"
+                 kino:Form.IsRequired="True" />
+    <ComboBox kino:Form.Label="国家与地区(请选择居住地)" />
 
-    <kino:KinoFormSeparator />
+    <kino:FormSeparator />
 
-    <kino:KinoFormTitle Content="家庭信息"
+    <kino:FormTitle Content="家庭信息"
                         Description="填写家庭信息可以让我们给您提供更好的服务。" />
 
-    <TextBox kino:KinoForm.Label="父"
-             kino:KinoForm.Description="可以不填" />
-    <TextBox kino:KinoForm.Label="母"
-             kino:KinoForm.Description="可以不填" />
-    <TextBox kino:KinoForm.Label="伴侣"
-             kino:KinoForm.Description="可以没有"
-             kino:KinoForm.IsRequired="True" />
-    <StackPanel kino:KinoForm.Label="性别"
+    <TextBox kino:Form.Label="父"
+             kino:Form.Description="可以不填" />
+    <TextBox kino:Form.Label="母"
+             kino:Form.Description="可以不填" />
+    <TextBox kino:Form.Label="伴侣"
+             kino:Form.Description="可以没有"
+             kino:Form.IsRequired="True" />
+    <StackPanel kino:Form.Label="性别"
                 Orientation="Horizontal">
         <RadioButton Content="男"
                      GroupName="Sex" />
@@ -31,19 +31,19 @@
                      Margin="8,0,0,0" />
     </StackPanel>
     <TextBox AcceptsReturn="True"
-             kino:KinoForm.Label="备注"
-             kino:KinoForm.LabelTemplate="{StaticResource TopHeaderTemplate}"
+             kino:Form.Label="备注"
+             kino:Form.LabelTemplate="{StaticResource TopHeaderTemplate}"
              VerticalScrollBarVisibility="Auto"
              Height="100" />
-    <kino:KinoForm.FunctionBar>
-        <kino:KinoFormFunctionBar>
-            <kino:KinoButton Content="OK"
+    <kino:Form.FunctionBar>
+        <kino:FormFunctionBar>
+            <kino:ExtendedButton Content="OK"
                              Click="OnOK"
                              IsDefault="True" />
-            <kino:KinoButton Content="Cancel"
+            <kino:ExtendedButton Content="Cancel"
                              IsCancel="True"
                              Click="OnCancel" />
 
-        </kino:KinoFormFunctionBar>
-    </kino:KinoForm.FunctionBar>
-</kino:KinoForm>
+        </kino:FormFunctionBar>
+    </kino:Form.FunctionBar>
+</kino:Form>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section2.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section2.txt
index f90cb86..d7485b4 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section2.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section2.txt
@@ -1,18 +1,18 @@
-<kino:KinoForm Width="500"
+<kino:Form Width="500"
                HorizontalAlignment="Left">
-    <CheckBox kino:KinoForm.Label="显示额外信息"
+    <CheckBox kino:Form.Label="显示额外信息"
               x:Name="ExtraInformationCheckBox" />
-    <Grid kino:KinoForm.IsItemItsOwnContainer="True"
+    <Grid kino:Form.IsItemItsOwnContainer="True"
           Visibility="{Binding IsChecked,ElementName=ExtraInformationCheckBox,Converter={StaticResource BooleanToVisibilityConverter}}">
-        <kino:KinoForm Grid.IsSharedSizeScope="False"
+        <kino:Form Grid.IsSharedSizeScope="False"
                        Padding="0">
-            <ComboBox kino:KinoForm.Label="国家" />
-            <TextBox kino:KinoForm.Label="父"
-                     kino:KinoForm.Description="可以不填" />
-            <TextBox kino:KinoForm.Label="母"
-                     kino:KinoForm.Description="可以不填" />
-        </kino:KinoForm>
+            <ComboBox kino:Form.Label="国家" />
+            <TextBox kino:Form.Label="父"
+                     kino:Form.Description="可以不填" />
+            <TextBox kino:Form.Label="母"
+                     kino:Form.Description="可以不填" />
+        </kino:Form>
     </Grid>
-    <TextBox kino:KinoForm.Label="地址"
+    <TextBox kino:Form.Label="地址"
              Visibility="{Binding IsChecked,ElementName=ExtraInformationCheckBox,Converter={StaticResource BooleanToVisibilityConverter}}"/>
-</kino:KinoForm>
+</kino:Form>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section3.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section3.txt
index f948e95..b66d832 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section3.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section3.txt
@@ -1,27 +1,27 @@
-<kino:KinoForm Width="500"
+<kino:Form Width="500"
                HorizontalAlignment="Left">
-    <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+    <Expander kino:Form.IsItemItsOwnContainer="True"
               Header="用户信息"
               IsExpanded="True">
-        <kino:KinoForm Grid.IsSharedSizeScope="False"
+        <kino:Form Grid.IsSharedSizeScope="False"
                        Padding="0">
-            <TextBox kino:KinoForm.Label="用户名"
-                     kino:KinoForm.IsRequired="True"
+            <TextBox kino:Form.Label="用户名"
+                     kino:Form.IsRequired="True"
                      Text="{Binding Name,Mode=TwoWay}" />
-            <PasswordBox kino:KinoForm.Label="密码"
-                         kino:KinoForm.IsRequired="True" />
-        </kino:KinoForm>
+            <PasswordBox kino:Form.Label="密码"
+                         kino:Form.IsRequired="True" />
+        </kino:Form>
     </Expander>
-    <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+    <Expander kino:Form.IsItemItsOwnContainer="True"
               Header="其它信息"
               IsExpanded="True">
-        <kino:KinoForm Grid.IsSharedSizeScope="False"
+        <kino:Form Grid.IsSharedSizeScope="False"
                        Padding="0">
-            <ComboBox kino:KinoForm.Label="国家" />
-            <TextBox kino:KinoForm.Label="父"
-                     kino:KinoForm.Description="可以不填" />
-            <TextBox kino:KinoForm.Label="母"
-                     kino:KinoForm.Description="可以不填" />
-        </kino:KinoForm>
+            <ComboBox kino:Form.Label="国家" />
+            <TextBox kino:Form.Label="父"
+                     kino:Form.Description="可以不填" />
+            <TextBox kino:Form.Label="母"
+                     kino:Form.Description="可以不填" />
+        </kino:Form>
     </Expander>
-</kino:KinoForm>
+</kino:Form>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section4.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section4.txt
index 9214167..5fdd7d3 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section4.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section4.txt
@@ -1,14 +1,14 @@
-<kino:KinoForm Width="500"
+<kino:Form Width="500"
                HorizontalAlignment="Left">
-    <kino:KinoForm.Resources>
-        <Style TargetType="kino:KinoFormItem"
+    <kino:Form.Resources>
+        <Style TargetType="kino:FormItem"
                x:Key="FromItemStyle"
                BasedOn="{StaticResource ControlPanelFromItemStyle}">
             <Setter Property="Margin"
                     Value="8" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="kino:KinoFormItem">
+                    <ControlTemplate TargetType="kino:FormItem">
                         <StackPanel x:Name="Root">
                             <ContentPresenter Content="{TemplateBinding Label}"
                                               ContentTemplate="{TemplateBinding LabelTemplate}" />
@@ -27,36 +27,36 @@
         <ItemsPanelTemplate x:Key="ItemsPanelTemplate">
             <UniformGrid Rows="1" />
         </ItemsPanelTemplate>
-    </kino:KinoForm.Resources>
-    <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+    </kino:Form.Resources>
+    <Expander kino:Form.IsItemItsOwnContainer="True"
               Header="用户信息"
               IsExpanded="True">
-        <kino:KinoForm Grid.IsSharedSizeScope="False"
+        <kino:Form Grid.IsSharedSizeScope="False"
                        Padding="0"
                        ItemContainerStyle="{StaticResource FromItemStyle}"
                        ItemsPanel="{StaticResource ItemsPanelTemplate}">
-            <TextBox kino:KinoForm.Label="用户名" />
-            <TextBox kino:KinoForm.Label="级别" />
-            <TextBox kino:KinoForm.Label="备注" />
+            <TextBox kino:Form.Label="用户名" />
+            <TextBox kino:Form.Label="级别" />
+            <TextBox kino:Form.Label="备注" />
 
-        </kino:KinoForm>
+        </kino:Form>
     </Expander>
-    <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+    <Expander kino:Form.IsItemItsOwnContainer="True"
               Header="其它信息"
               IsExpanded="True">
-        <kino:KinoForm Grid.IsSharedSizeScope="False"
+        <kino:Form Grid.IsSharedSizeScope="False"
                        Padding="0"
                        ItemContainerStyle="{StaticResource FromItemStyle}"
                        ItemsPanel="{StaticResource ItemsPanelTemplate}">
-            <TextBox kino:KinoForm.Label="学校" />
-            <TextBox kino:KinoForm.Label="职业" />
-            <TextBox kino:KinoForm.Label="证书" />
-        </kino:KinoForm>
+            <TextBox kino:Form.Label="学校" />
+            <TextBox kino:Form.Label="职业" />
+            <TextBox kino:Form.Label="证书" />
+        </kino:Form>
     </Expander>
-    <Expander kino:KinoForm.IsItemItsOwnContainer="True"
+    <Expander kino:Form.IsItemItsOwnContainer="True"
               Header="住址信息"
               IsExpanded="True">
-        <kino:KinoForm Grid.IsSharedSizeScope="False"
+        <kino:Form Grid.IsSharedSizeScope="False"
                        Padding="0"
                        ItemContainerStyle="{StaticResource FromItemStyle}">
             <ItemsControl.ItemsPanel>
@@ -70,12 +70,12 @@
                     </Grid>
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
-            <TextBox kino:KinoForm.Label="邮编" />
-            <kino:KinoFormItem Label="住址"
+            <TextBox kino:Form.Label="邮编" />
+            <kino:FormItem Label="住址"
                                Grid.Column="1"
                                Grid.ColumnSpan="2">
                 <TextBox />
-            </kino:KinoFormItem>
-        </kino:KinoForm>
+            </kino:FormItem>
+        </kino:Form>
     </Expander>
-</kino:KinoForm>
+</kino:Form>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section5.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section5.txt
index 621e3e3..c448887 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section5.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/FormSample.Section5.txt
@@ -1,3 +1,3 @@
-<kino:KinoForm ItemsSource="{x:Static local:Product.Products}"
+<kino:Form ItemsSource="{x:Static local:Product.Products}"
                DisplayMemberPath="Value"
                LabelMemberPath="Key" />
diff --git "a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/HighlightSample.Section1 - \345\244\215\345\210\266.txt" "b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/HighlightSample.Section1 - \345\244\215\345\210\266.txt"
index e8d2f78..eca3c12 100644
--- "a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/HighlightSample.Section1 - \345\244\215\345\210\266.txt"	
+++ "b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/HighlightSample.Section1 - \345\244\215\345\210\266.txt"	
@@ -3,18 +3,18 @@
         <ColumnDefinition Width="Auto" />
         <ColumnDefinition />
     </Grid.ColumnDefinitions>
-    <kino:KinoResizer HorizontalContentAlignment="Left">
+    <kino:Resizer HorizontalContentAlignment="Left">
         <TextBox AcceptsReturn="True"
                  MinWidth="50"
                  VerticalScrollBarVisibility="Disabled" />
-    </kino:KinoResizer>
+    </kino:Resizer>
     <Button Margin="8,0,0,0"
             Grid.Column="1" />
 </Grid>
 <StackPanel Orientation="Horizontal"
             Margin="0,8,0,0">
-    <kino:KinoResizer>
+    <kino:Resizer>
         <TextBox  MinWidth="50" />
-    </kino:KinoResizer>
+    </kino:Resizer>
     <Button Margin="8,0,0,0" />
 </StackPanel>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ListBoxSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ListBoxSample.Section1.txt
index b7da85e..45df109 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ListBoxSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ListBoxSample.Section1.txt
@@ -1,8 +1,8 @@
 <StackPanel>
-    <kino:KinoSelectionCheckBox Selector="{Binding ElementName=ListBox}"
+    <kino:SelectionCheckBox Selector="{Binding ElementName=ListBox}"
                                 Content="全选"
                                 Margin="8,8,8,0" />
-    <kino:KinoListBox DisplayMemberPath="Name"
+    <kino:ExtendedListBox DisplayMemberPath="Name"
                       ItemsSource="{Binding}"
                       IsMultiSelectCheckBoxEnabled="{Binding ElementName=IsMultiSelectCheckBoxEnabledElement,Path=IsChecked}"
                       SelectionMode="{Binding ElementName=SelectionComboBox,Path=SelectedItem}"
@@ -10,14 +10,14 @@
                       x:Name="ListBox" />
 </StackPanel>
 <local:SampleSection.ControlPanel>
-    <kino:KinoForm Style="{StaticResource ControlPanelFromStyle}">
+    <kino:Form Style="{StaticResource ControlPanelFromStyle}">
         <ComboBox Width="300"
                   HorizontalAlignment="Left"
                   x:Name="SelectionComboBox"  
-                  kino:KinoForm.Label="SelectionMode"/>
+                  kino:Form.Label="SelectionMode"/>
         <CheckBox Width="300"
-                  kino:KinoForm.Label="IsMultiSelectCheckBoxEnabled"
+                  kino:Form.Label="IsMultiSelectCheckBoxEnabled"
                   HorizontalAlignment="Left"
                   x:Name="IsMultiSelectCheckBoxEnabledElement" />
-    </kino:KinoForm>
+    </kino:Form>
 </local:SampleSection.ControlPanel>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/PagingSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/PagingSample.Section1.txt
index 1ae5c2e..945f51b 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/PagingSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/PagingSample.Section1.txt
@@ -12,7 +12,7 @@
                                     SortMemberPath="Name" />
             </DataGrid.Columns>
         </DataGrid>
-        <kino:KinoDataPager Source="{Binding}"
+        <kino:DataPager Source="{Binding}"
                             DisplayMode="FirstLastPreviousNextNumeric" />
     </StackPanel>
 </xctk:BusyIndicator>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/PagingSample.Section3.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/PagingSample.Section3.txt
index 5181d32..63869cc 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/PagingSample.Section3.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/PagingSample.Section3.txt
@@ -12,7 +12,7 @@
                                     SortMemberPath="Name" />
             </DataGrid.Columns>
         </DataGrid>
-        <kino:KinoDataPager Source="{Binding}"
+        <kino:DataPager Source="{Binding}"
                             DisplayMode="FirstLastPreviousNextNumeric" />
     </StackPanel>
 </xctk:BusyIndicator>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ProgressRingSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ProgressRingSample.Section1.txt
index bc370b7..6ec9090 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ProgressRingSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ProgressRingSample.Section1.txt
@@ -1,9 +1,9 @@
 <StackPanel VerticalAlignment="Center" HorizontalAlignment="Left">
-    <kino:KinoProgressRing IsActive="True"
+    <kino:ProgressRing IsActive="True"
                            Height="20"
                            Width="20"
                            Margin="8" />
-    <kino:KinoProgressRing IsActive="True"
+    <kino:ProgressRing IsActive="True"
                            Height="40"
                            Width="40"
                            Margin="8"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/RadioButtonMenuItemSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/RadioButtonMenuItemSample.Section1.txt
index c298dee..b121542 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/RadioButtonMenuItemSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/RadioButtonMenuItemSample.Section1.txt
@@ -1,21 +1,21 @@
 <Menu>
-    <kino:KinoRadioButtonMenuItem Header="Option A" />
-    <kino:KinoRadioButtonMenuItem Header="Option B" />
-    <kino:KinoRadioButtonMenuItem Header="Option C" />
+    <kino:RadioButtonMenuItem Header="Option A" />
+    <kino:RadioButtonMenuItem Header="Option B" />
+    <kino:RadioButtonMenuItem Header="Option C" />
     <Separator />
-    <kino:KinoRadioButtonMenuItem Header="MoreOptions">
-        <kino:KinoRadioButtonMenuItem Header="Option 1"
+    <kino:RadioButtonMenuItem Header="MoreOptions">
+        <kino:RadioButtonMenuItem Header="Option 1"
                                       GroupName="GroupA" />
-        <kino:KinoRadioButtonMenuItem Header="Option 2"
+        <kino:RadioButtonMenuItem Header="Option 2"
                                       GroupName="GroupA" />
-        <kino:KinoRadioButtonMenuItem Header="Option 3"
+        <kino:RadioButtonMenuItem Header="Option 3"
                                       GroupName="GroupA" />
         <Separator />
-        <kino:KinoRadioButtonMenuItem Header="Option 4"
+        <kino:RadioButtonMenuItem Header="Option 4"
                                       GroupName="GroupB" />
-        <kino:KinoRadioButtonMenuItem Header="Option 5"
+        <kino:RadioButtonMenuItem Header="Option 5"
                                       GroupName="GroupB" />
-        <kino:KinoRadioButtonMenuItem Header="Option 6"
+        <kino:RadioButtonMenuItem Header="Option 6"
                                       GroupName="GroupB" />
         <Separator />
         <MenuItem IsCheckable="True"
@@ -24,5 +24,5 @@
                   Header="Option 8" />
         <MenuItem IsCheckable="True"
                   Header="Option 9" />
-    </kino:KinoRadioButtonMenuItem>
+    </kino:RadioButtonMenuItem>
 </Menu>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section1.txt
index e8d2f78..eca3c12 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section1.txt
@@ -3,18 +3,18 @@
         <ColumnDefinition Width="Auto" />
         <ColumnDefinition />
     </Grid.ColumnDefinitions>
-    <kino:KinoResizer HorizontalContentAlignment="Left">
+    <kino:Resizer HorizontalContentAlignment="Left">
         <TextBox AcceptsReturn="True"
                  MinWidth="50"
                  VerticalScrollBarVisibility="Disabled" />
-    </kino:KinoResizer>
+    </kino:Resizer>
     <Button Margin="8,0,0,0"
             Grid.Column="1" />
 </Grid>
 <StackPanel Orientation="Horizontal"
             Margin="0,8,0,0">
-    <kino:KinoResizer>
+    <kino:Resizer>
         <TextBox  MinWidth="50" />
-    </kino:KinoResizer>
+    </kino:Resizer>
     <Button Margin="8,0,0,0" />
 </StackPanel>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section2.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section2.txt
index 13cfa61..9160eab 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section2.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section2.txt
@@ -1,5 +1,5 @@
-<kino:KinoResizer HorizontalContentAlignment="Stretch">
+<kino:Resizer HorizontalContentAlignment="Stretch">
     <TextBox AcceptsReturn="True"
              VerticalScrollBarVisibility="Disabled" />
-</kino:KinoResizer>
+</kino:Resizer>
 <Button Margin="0,8,0,0" />
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section3.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section3.txt
index 55f46b3..664ca3c 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section3.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section3.txt
@@ -1,14 +1,14 @@
-<kino:KinoResizer HorizontalContentAlignment="Stretch">
-    <kino:KinoResizer.Animation>
+<kino:Resizer HorizontalContentAlignment="Stretch">
+    <kino:Resizer.Animation>
         <DoubleAnimation BeginTime="0:0:0"
                          Duration="0:0:3">
             <DoubleAnimation.EasingFunction>
                 <QuinticEase EasingMode="EaseOut" />
             </DoubleAnimation.EasingFunction>
         </DoubleAnimation>
-    </kino:KinoResizer.Animation>
+    </kino:Resizer.Animation>
     <TextBox AcceptsReturn="True"
              VerticalScrollBarVisibility="Disabled" />
-</kino:KinoResizer>
+</kino:Resizer>
 <Button Content="Commit"
         Margin="0,8,0,0" />
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section4.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section4.txt
index fe0956c..03294ce 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section4.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section4.txt
@@ -1,7 +1,7 @@
-<kino:KinoResizer HorizontalContentAlignment="Stretch"
+<kino:Resizer HorizontalContentAlignment="Stretch"
                   Animation="{x:Null}">
     <TextBox AcceptsReturn="True"
              VerticalScrollBarVisibility="Disabled" />
-</kino:KinoResizer>
+</kino:Resizer>
 <Button Content="Commit"
         Margin="0,8,0,0" />
\ No newline at end of file
diff --git "a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section5 - \345\244\215\345\210\266.txt" "b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section5 - \345\244\215\345\210\266.txt"
index bda1fa1..2cff3e1 100644
--- "a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section5 - \345\244\215\345\210\266.txt"	
+++ "b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section5 - \345\244\215\345\210\266.txt"	
@@ -1,12 +1,12 @@
-<kino:KinoResizer HorizontalContentAlignment="Stretch">
+<kino:Resizer HorizontalContentAlignment="Stretch">
     <Expander Header="Expander1">
         <Rectangle Height="100"
                    Fill="Red" />
     </Expander>
-</kino:KinoResizer>
-<kino:KinoResizer HorizontalContentAlignment="Stretch">
+</kino:Resizer>
+<kino:Resizer HorizontalContentAlignment="Stretch">
     <Expander Header="Expander2">
         <Rectangle Height="100"
                    Fill="Blue" />
     </Expander>
-</kino:KinoResizer>
\ No newline at end of file
+</kino:Resizer>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section5.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section5.txt
index bda1fa1..2cff3e1 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section5.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/ResizerSample.Section5.txt
@@ -1,12 +1,12 @@
-<kino:KinoResizer HorizontalContentAlignment="Stretch">
+<kino:Resizer HorizontalContentAlignment="Stretch">
     <Expander Header="Expander1">
         <Rectangle Height="100"
                    Fill="Red" />
     </Expander>
-</kino:KinoResizer>
-<kino:KinoResizer HorizontalContentAlignment="Stretch">
+</kino:Resizer>
+<kino:Resizer HorizontalContentAlignment="Stretch">
     <Expander Header="Expander2">
         <Rectangle Height="100"
                    Fill="Blue" />
     </Expander>
-</kino:KinoResizer>
\ No newline at end of file
+</kino:Resizer>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/SquareBoxSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/SquareBoxSample.Section1.txt
index 9d59dc8..7444e45 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/SquareBoxSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/SquareBoxSample.Section1.txt
@@ -1,42 +1,42 @@
 <local:SampleSection>
     <StackPanel Orientation="Horizontal">
-        <kino:KinoSquareBox HorizontalAlignment="Left"
+        <kino:SquareBox HorizontalAlignment="Left"
                             Height="{Binding ElementName=HeightElement,Path=Value}"
                             Width="{Binding ElementName=WidthElement,Path=Value}">
             <Ellipse Fill="Green" />
-        </kino:KinoSquareBox>
-        <kino:KinoSquareBox Margin="8,0,0,0"
+        </kino:SquareBox>
+        <kino:SquareBox Margin="8,0,0,0"
                             HorizontalAlignment="Left"
                             Height="{Binding ElementName=HeightElement,Path=Value}"
                             Width="{Binding ElementName=WidthElement,Path=Value}">
             <Rectangle Fill="Green" />
-        </kino:KinoSquareBox>
+        </kino:SquareBox>
     </StackPanel>
     <local:SampleSection.ControlPanel>
         <StackPanel>
-            <kino:KinoForm HorizontalAlignment="Left"
+            <kino:Form HorizontalAlignment="Left"
                            ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
-                <Slider kino:KinoForm.Label="Height"
+                <Slider kino:Form.Label="Height"
                         Maximum="100"
                         Value="10"
                         Minimum="5"
                         Width="300"
                         x:Name="HeightElement">
-                    <kino:KinoForm.Description>
+                    <kino:Form.Description>
                         <TextBlock Text="{Binding ElementName=HeightElement,Path=Value,StringFormat=N2}" />
-                    </kino:KinoForm.Description>
+                    </kino:Form.Description>
                 </Slider>
-                <Slider kino:KinoForm.Label="Width"
+                <Slider kino:Form.Label="Width"
                         Maximum="100"
                         Value="10"
                         Minimum="5"
                         Width="300"
                         x:Name="WidthElement">
-                    <kino:KinoForm.Description>
+                    <kino:Form.Description>
                         <TextBlock Text="{Binding ElementName=WidthElement,Path=Value,StringFormat=N2}" />
-                    </kino:KinoForm.Description>
+                    </kino:Form.Description>
                 </Slider>
-            </kino:KinoForm>
+            </kino:Form>
         </StackPanel>
     </local:SampleSection.ControlPanel>
 </local:SampleSection>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/StateIndicatorSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/StateIndicatorSample.Section1.txt
index b0c62c2..d9974ee 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/StateIndicatorSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/StateIndicatorSample.Section1.txt
@@ -1,17 +1,17 @@
-<kino:KinoStateIndicator x:Name="StateIndicator"
+<kino:StateIndicator x:Name="StateIndicator"
                          VerticalContentAlignment="Center"
                          HorizontalContentAlignment="Center"
                          State="{Binding SelectedItem,ElementName=StatesListBox}"
                          HorizontalAlignment="Left" />
 <local:SampleSection.ControlPanel>
-    <kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
-        <CheckBox kino:KinoForm.Label="Has Content"
+    <kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
+        <CheckBox kino:Form.Label="Has Content"
                   x:Name="HasContentCheckBox"
                   Checked="OnHasContentChecked"
                   Unchecked="OnHasContentUnchecked" />
         <ListBox x:Name="StatesListBox"
                  HorizontalAlignment="Left"
                  Width="250"
-                 kino:KinoForm.Label="State" />
-    </kino:KinoForm>
+                 kino:Form.Label="State" />
+    </kino:Form>
 </local:SampleSection.ControlPanel>
\ No newline at end of file
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section1.txt
index a42a79d..39a419d 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section1.txt
@@ -1,5 +1,5 @@
 <StackPanel>
-    <kino:KinoTransitioningContentControl Margin="8"
+    <kino:TransitioningContentControl Margin="8"
                                           x:Name="DefaultContent" 
                                           HorizontalAlignment="Left"/>
     <StackPanel Orientation="Horizontal">
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section3.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section3.txt
index dfaae82..30098cf 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section3.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section3.txt
@@ -35,7 +35,7 @@
 </VisualState>
 
 
-<kino:KinoTransitioningContentControl Margin="8"
+<kino:TransitioningContentControl Margin="8"
                                       x:Name="CustomContent"
                                       Template="{StaticResource CustomTemplate}" />
 <StackPanel Orientation="Horizontal">
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section5.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section5.txt
index f99a8f2..78609b3 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section5.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/TransitioningContentControlSample.Section5.txt
@@ -1,5 +1,5 @@
-<kino:KinoTransitioningContentControl x:Name="ContentControl"
-                                      Transition="{x:Static kino:KinoTransitioningContentControl.DownTransitionState}">
+<kino:TransitioningContentControl x:Name="ContentControl"
+                                      Transition="{x:Static kino:TransitioningContentControl.DownTransitionState}">
     <ContentControl.ContentTemplate>
         <DataTemplate>
             <Grid MinWidth="370">
@@ -31,4 +31,4 @@
             </Grid>
         </DataTemplate>
     </ContentControl.ContentTemplate>
-</kino:KinoTransitioningContentControl>
+</kino:TransitioningContentControl>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/WindowSample.Section1.txt b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/WindowSample.Section1.txt
index 82d7cb4..40a30af 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/WindowSample.Section1.txt
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/SourceFiles/WindowSample.Section1.txt
@@ -1,4 +1,4 @@
-<ListBox kino:KinoForm.Label="WindowState"
+<ListBox kino:Form.Label="WindowState"
          SelectedIndex="0"
          Width="250"
          HorizontalAlignment="Left"
@@ -6,7 +6,7 @@
     <WindowState>Normal</WindowState>
     <WindowState>Maximized</WindowState>
 </ListBox>
-<ListBox kino:KinoForm.Label="WindowStartupLocation"
+<ListBox kino:Form.Label="WindowStartupLocation"
          SelectedIndex="0"
          Width="250"
          HorizontalAlignment="Left"
@@ -15,7 +15,7 @@
     <WindowStartupLocation>CenterScreen</WindowStartupLocation>
     <WindowStartupLocation>CenterOwner</WindowStartupLocation>
 </ListBox>
-<ListBox kino:KinoForm.Label="ResizeMode"
+<ListBox kino:Form.Label="ResizeMode"
          SelectedIndex="0"
          Width="250"
          HorizontalAlignment="Left"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Themes/Generic.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Themes/Generic.xaml
index a5b62de..109852c 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Themes/Generic.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Themes/Generic.xaml
@@ -35,7 +35,7 @@
                                                 Foreground="#FF54698D"
                                                 FontSize="36"
                                                 Margin="24" />
-                                <kino:KinoHyperlinkButton HorizontalAlignment="Right"
+                                <kino:HyperlinkButton HorizontalAlignment="Right"
                                                           VerticalAlignment="Bottom"
                                                           NavigateUri="{TemplateBinding Link}"
                                                           Margin="0,0,24,30"
@@ -175,7 +175,7 @@
                             <Rectangle Height="1"
                                        VerticalAlignment="Bottom"
                                        Fill="{TemplateBinding BorderBrush}" />
-                            <kino:KinoResizer Grid.Row="1"
+                            <kino:Resizer Grid.Row="1"
                                               HorizontalContentAlignment="Stretch">
                                 <ContentControl x:Name="SourceCodePlacement"
                                                 MaxHeight="5000"
@@ -195,7 +195,7 @@
                                         </Style>
                                     </ContentControl.Resources>
                                 </ContentControl>
-                            </kino:KinoResizer>
+                            </kino:Resizer>
                         </Grid>
                     </Border>
                 </ControlTemplate>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoButton.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/Button.xaml
similarity index 96%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoButton.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/Button.xaml
index b06bbf9..0d65771 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoButton.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/Button.xaml
@@ -38,7 +38,7 @@
                      Color="#FFADB2B5" />
     <SolidColorBrush x:Key="Button.Disabled.Foreground"
                      Color="#FF838383" />
-    <Style TargetType="local:KinoButton">
+    <Style TargetType="local:ExtendedButton">
         <Setter Property="FocusVisualStyle"
                 Value="{StaticResource FocusVisual}" />
         <Setter Property="Background"
@@ -57,7 +57,7 @@
                 Value="2,1" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoButton">
+                <ControlTemplate TargetType="local:ExtendedButton">
                     <Border x:Name="border"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
@@ -124,11 +124,11 @@
                             </Grid.ColumnDefinitions>
                             <StackPanel Orientation="Horizontal"
                                         HorizontalAlignment="Center">
-                                <primitives:KinoResizer VerticalContentAlignment="Stretch"
+                                <primitives:Resizer VerticalContentAlignment="Stretch"
                                                    HorizontalContentAlignment="Left"
                                                    FlowDirection="RightToLeft"
                                                    x:Name="Resizer">
-                                    <local:KinoStateIndicator State="{TemplateBinding State}"
+                                    <local:StateIndicator State="{TemplateBinding State}"
                                                               Height="Auto"
                                                               Width="Auto"
                                                               MaxHeight="{TemplateBinding FontSize}"
@@ -136,8 +136,8 @@
                                                               Content="{TemplateBinding Icon}"
                                                               VerticalContentAlignment="Stretch"
                                                               HorizontalContentAlignment="Stretch">
-                                    </local:KinoStateIndicator>
-                                </primitives:KinoResizer>
+                                    </local:StateIndicator>
+                                </primitives:Resizer>
                                 <Rectangle Width="{Binding ElementName=Resizer,Path=ActualWidth,Converter={StaticResource TimesConverter},ConverterParameter=0.3}"
                                            Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=Content,Converter={StaticResource NullToValueConverter},ConverterParameter=Collapsed,FallbackValue=Visible}" />
                             </StackPanel>
@@ -164,7 +164,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="local:KinoHyperlinkButton">
+    <Style TargetType="local:HyperlinkButton">
         <Setter Property="Foreground"
                 Value="#FF0066CC" />
         <Setter Property="Padding"
@@ -179,7 +179,7 @@
                 Value="Transparent" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoHyperlinkButton">
+                <ControlTemplate TargetType="local:HyperlinkButton">
                     <Grid Cursor="{TemplateBinding Cursor}"
                           Background="{TemplateBinding Background}">
                         <VisualStateManager.VisualStateGroups>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoButton.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/ExtendedButton.cs
similarity index 85%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoButton.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/ExtendedButton.cs
index c3bcfdb..27a87ae 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoButton.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/ExtendedButton.cs
@@ -8,23 +8,23 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoButton : Button
+    public class ExtendedButton : Button
     {
         /// <summary>
         /// 标识 Icon 依赖属性。
         /// </summary>
         public static readonly DependencyProperty IconProperty =
-            DependencyProperty.Register(nameof(Icon), typeof(object), typeof(KinoButton), new PropertyMetadata(null, OnIconChanged));
+            DependencyProperty.Register(nameof(Icon), typeof(object), typeof(ExtendedButton), new PropertyMetadata(null, OnIconChanged));
 
         /// <summary>
         /// 标识 State 依赖属性。
         /// </summary>
         public static readonly DependencyProperty StateProperty =
-            DependencyProperty.Register("State", typeof(ProgressState), typeof(KinoButton), new PropertyMetadata(ProgressState.None, OnStateChanged));
+            DependencyProperty.Register("State", typeof(ProgressState), typeof(ExtendedButton), new PropertyMetadata(ProgressState.None, OnStateChanged));
 
-        public KinoButton()
+        public ExtendedButton()
         {
-            DefaultStyleKey = typeof(KinoButton);
+            DefaultStyleKey = typeof(ExtendedButton);
         }
 
         /// <summary>
@@ -67,13 +67,13 @@ private static void OnIconChanged(DependencyObject obj, DependencyPropertyChange
                 return;
             }
 
-            var target = obj as KinoButton;
+            var target = obj as ExtendedButton;
             target?.OnIconChanged(oldValue, newValue);
         }
 
         private static void OnStateChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var target = obj as KinoButton;
+            var target = obj as ExtendedButton;
             var oldValue = (ProgressState)args.OldValue;
             var newValue = (ProgressState)args.NewValue;
             if (oldValue != newValue)
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoHyperlinkButton.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/HyperlinkButton.cs
similarity index 91%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoHyperlinkButton.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/HyperlinkButton.cs
index 72ac65a..5caa9d6 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/KinoHyperlinkButton.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Button/HyperlinkButton.cs
@@ -17,21 +17,21 @@ namespace Kino.Toolkit.Wpf
     [TemplateVisualState(Name = "Normal", GroupName = "CommonStates")]
     [TemplateVisualState(Name = "Pressed", GroupName = "CommonStates")]
     [TemplateVisualState(Name = "Unfocused", GroupName = "FocusStates")]
-    public class KinoHyperlinkButton : ButtonBase
+    public class HyperlinkButton : ButtonBase
     {
         /// <summary>Identifies the <see cref="P:System.Windows.Controls.HyperlinkButton.NavigateUri" /> dependency property.</summary>
         /// <returns>The identifier for the <see cref="P:System.Windows.Controls.HyperlinkButton.NavigateUri" /> dependency property.</returns>
         public static readonly DependencyProperty NavigateUriProperty;
 
-        static KinoHyperlinkButton()
+        static HyperlinkButton()
         {
-            NavigateUriProperty = DependencyProperty.Register("NavigateUri", typeof(Uri), typeof(KinoHyperlinkButton), null);
+            NavigateUriProperty = DependencyProperty.Register("NavigateUri", typeof(Uri), typeof(HyperlinkButton), null);
         }
 
-        /// <summary>Initializes a new instance of the <see cref="KinoHyperlinkButton"/> class.</summary>
-        public KinoHyperlinkButton()
+        /// <summary>Initializes a new instance of the <see cref="HyperlinkButton"/> class.</summary>
+        public HyperlinkButton()
         {
-            DefaultStyleKey = typeof(KinoHyperlinkButton);
+            DefaultStyleKey = typeof(HyperlinkButton);
             if (IsPermissionGranted() == false)
             {
                 IsEnabled = false;
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Class1.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Class1.cs
new file mode 100644
index 0000000..191322e
--- /dev/null
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Class1.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Kino.Toolkit.Wpf
+{
+    public class TextBox : System.Windows.Controls.TextBox
+    {
+
+        /// <summary>
+        /// 获取或设置Header的值
+        /// </summary>
+        public object Header
+        {
+            get => (object)GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
+        }
+
+        /// <summary>
+        /// 标识 Header 依赖属性。
+        /// </summary>
+        public static readonly DependencyProperty HeaderProperty =
+            DependencyProperty.Register(nameof(Header), typeof(object), typeof(TextBox), new PropertyMetadata(default(object)));
+
+      
+    }
+}
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/KinoDataGrid.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/DataGrid.xaml
similarity index 97%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/KinoDataGrid.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/DataGrid.xaml
index 0377f2c..fee31bd 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/KinoDataGrid.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/DataGrid.xaml
@@ -46,7 +46,7 @@
         </Grid>
     </DataTemplate>
 
-    <Style TargetType="{x:Type local:KinoDataGrid}">
+    <Style TargetType="{x:Type local:ExtendedDataGrid}">
         <Setter Property="RowHeaderStyle" Value="{StaticResource DataGridRowHeaderStyle}"/>
         <Setter Property="RowHeaderTemplate" Value="{StaticResource DataGridRowHeaderTemplate}"/>
         <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
@@ -60,7 +60,7 @@
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:KinoDataGrid}">
+                <ControlTemplate TargetType="{x:Type local:ExtendedDataGrid}">
                     <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
                         <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
                             <ScrollViewer.Template>
@@ -76,7 +76,7 @@
                                             <RowDefinition Height="*"/>
                                             <RowDefinition Height="Auto"/>
                                         </Grid.RowDefinitions>
-                                        <Primitives:KinoSelectionCheckBox x:Name="SelectionCheckBox" 
+                                        <Primitives:SelectionCheckBox x:Name="SelectionCheckBox" 
                                                                           Selector="{Binding RelativeSource={RelativeSource  Mode=FindAncestor, AncestorType=DataGrid}}" Focusable="False" 
                                                                           Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
                                                                           Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/KinoDataGrid.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/ExtendedDataGrid.cs
similarity index 77%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/KinoDataGrid.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/ExtendedDataGrid.cs
index 33a4b56..bcb1e8c 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/KinoDataGrid.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataGrid/ExtendedDataGrid.cs
@@ -9,15 +9,15 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoDataGrid : DataGrid, IMultiSelector
+    public class ExtendedDataGrid : DataGrid, IMultiSelector
     {
         // Using a DependencyProperty as the backing store for IsMultiSelectCheckBoxEnabled.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty IsMultiSelectCheckBoxEnabledProperty =
-            DependencyProperty.Register(nameof(IsMultiSelectCheckBoxEnabled), typeof(bool), typeof(KinoDataGrid), new PropertyMetadata(true));
+            DependencyProperty.Register(nameof(IsMultiSelectCheckBoxEnabled), typeof(bool), typeof(ExtendedDataGrid), new PropertyMetadata(true));
 
-        public KinoDataGrid()
+        public ExtendedDataGrid()
         {
-            DefaultStyleKey = typeof(KinoDataGrid);
+            DefaultStyleKey = typeof(ExtendedDataGrid);
         }
 
         public bool IsMultiSelectCheckBoxEnabled
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/KinoDataPager.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/DataPager.cs
similarity index 95%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/KinoDataPager.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/DataPager.cs
index 58282be..23404db 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/KinoDataPager.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/DataPager.cs
@@ -61,7 +61,7 @@ namespace Kino.Toolkit.Wpf
     [TemplateVisualState(Name = DATAPAGER_statePreviousNext, GroupName = DATAPAGER_groupDisplayMode)]
     [TemplateVisualState(Name = DATAPAGER_statePreviousNextNumeric, GroupName = DATAPAGER_groupDisplayMode)]
     [StyleTypedProperty(Property = DATAPAGER_styleNumericButton, StyleTargetType = typeof(ToggleButton))]
-    public class KinoDataPager : Control
+    public class DataPager : Control
     {
         ////------------------------------------------------------
         ////
@@ -152,7 +152,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "AutoEllipsis",
                 typeof(bool),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnAutoEllipsisPropertyChanged));
 
         /// <summary>
@@ -162,7 +162,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "CanChangePage",
                 typeof(bool),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnReadOnlyPropertyChanged));
 
         /// <summary>
@@ -172,7 +172,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "CanMoveToFirstPage",
                 typeof(bool),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnReadOnlyPropertyChanged));
 
         /// <summary>
@@ -182,7 +182,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "CanMoveToLastPage",
                 typeof(bool),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnReadOnlyPropertyChanged));
 
         /// <summary>
@@ -192,7 +192,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "CanMoveToNextPage",
                 typeof(bool),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnReadOnlyPropertyChanged));
 
         /// <summary>
@@ -202,7 +202,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "CanMoveToPreviousPage",
                 typeof(bool),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnReadOnlyPropertyChanged));
 
         /// <summary>
@@ -212,7 +212,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "DisplayMode",
                 typeof(PagerDisplayMode),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(DATAPAGER_defaultDisplayMode, OnDisplayModePropertyChanged));
 
         /// <summary>
@@ -222,7 +222,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "IsTotalItemCountFixed",
                 typeof(bool),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnIsTotalItemCountFixedPropertyChanged));
 
         /// <summary>
@@ -232,7 +232,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "ItemCount",
                 typeof(int),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnReadOnlyPropertyChanged));
 
         /// <summary>
@@ -242,7 +242,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "NumericButtonCount",
                 typeof(int),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(DATAPAGER_defaultNumericButtonCount, OnNumericButtonCountPropertyChanged));
 
         /// <summary>
@@ -252,7 +252,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "NumericButtonStyle",
                 typeof(Style),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnNumericButtonStylePropertyChanged));
 
         /// <summary>
@@ -262,7 +262,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "PageCount",
                 typeof(int),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnReadOnlyPropertyChanged));
 
         /// <summary>
@@ -272,7 +272,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "PageIndex",
                 typeof(int),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(DATAPAGER_defaultPageIndex, OnPageIndexPropertyChanged));
 
         /// <summary>
@@ -282,19 +282,19 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "PageSize",
                 typeof(int),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnPageSizePropertyChanged));
 
         /// <summary>
         /// Identifies the PrivateForeground dependency property. This dependency property is bound to
-        /// KinoDataPager.Foreground to be aware of its changes. It is used to update the foreground of the
+        /// DataPager.Foreground to be aware of its changes. It is used to update the foreground of the
         /// numeric toggle buttons.
         /// </summary>
         private static readonly DependencyProperty PrivateForegroundProperty =
             DependencyProperty.Register(
                 "PrivateForeground",
                 typeof(Brush),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnPrivateForegroundPropertyChanged));
 
         /// <summary>
@@ -304,7 +304,7 @@ public class KinoDataPager : Control
             DependencyProperty.Register(
                 "Source",
                 typeof(IEnumerable),
-                typeof(KinoDataPager),
+                typeof(DataPager),
                 new PropertyMetadata(OnSourcePropertyChanged));
 
         #endregion Static Fields
@@ -395,7 +395,7 @@ public class KinoDataPager : Control
         /// <summary>
         /// Holds the weak event listener for the INotifyPropertyChanged.PropertyChanged event.
         /// </summary>
-        private WeakEventListener<KinoDataPager, object, PropertyChangedEventArgs> _weakEventListenerPropertyChanged;
+        private WeakEventListener<DataPager, object, PropertyChangedEventArgs> _weakEventListenerPropertyChanged;
 
         /// <summary>
         /// Delegate for calling page move operations
@@ -414,16 +414,16 @@ public class KinoDataPager : Control
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the KinoDataPager class.
+        /// Initializes a new instance of the DataPager class.
         /// </summary>
-        public KinoDataPager()
+        public DataPager()
         {
-            this.DefaultStyleKey = typeof(KinoDataPager);
+            this.DefaultStyleKey = typeof(DataPager);
 
-            // Listening to the IsEnabled changes so the KinoDataPager states can be updated accordingly.
+            // Listening to the IsEnabled changes so the DataPager states can be updated accordingly.
             this.IsEnabledChanged += new DependencyPropertyChangedEventHandler(this.OnDataPagerIsEnabledChanged);
 
-            // Binding the KinoDataPager.Foreground property, one way, to the PrivateForeground property
+            // Binding the DataPager.Foreground property, one way, to the PrivateForeground property
             Binding foregroundBinding = new Binding("Foreground")
             {
                 Source = this
@@ -494,8 +494,8 @@ private set
         }
 
         /// <summary>
-        /// Gets a value that indicates whether or not the <see cref="T:Kino.Toolkit.Wpf.KinoDataPager" /> will
-        /// allow the user to attempt to move to the first page if <see cref="P:Kino.Toolkit.Wpf.KinoDataPager.CanChangePage" /> is true.
+        /// Gets a value that indicates whether or not the <see cref="T:Kino.Toolkit.Wpf.DataPager" /> will
+        /// allow the user to attempt to move to the first page if <see cref="P:Kino.Toolkit.Wpf.DataPager.CanChangePage" /> is true.
         /// </summary>
         public bool CanMoveToFirstPage
         {
@@ -511,8 +511,8 @@ private set
         }
 
         /// <summary>
-        /// Gets a value that indicates whether or not the <see cref="T:Kino.Toolkit.Wpf.KinoDataPager" />
-        /// will allow the user to attempt to move to the last page if <see cref="P:Kino.Toolkit.Wpf.KinoDataPager.CanChangePage" /> is true.
+        /// Gets a value that indicates whether or not the <see cref="T:Kino.Toolkit.Wpf.DataPager" />
+        /// will allow the user to attempt to move to the last page if <see cref="P:Kino.Toolkit.Wpf.DataPager.CanChangePage" /> is true.
         /// </summary>
         public bool CanMoveToLastPage
         {
@@ -528,8 +528,8 @@ private set
         }
 
         /// <summary>
-        /// Gets a value that indicates whether or not the <see cref="T:Kino.Toolkit.Wpf.KinoDataPager" />
-        /// will allow the user to attempt to move to the next page if<see cref="P:Kino.Toolkit.Wpf.KinoDataPager.CanChangePage" /> is true.
+        /// Gets a value that indicates whether or not the <see cref="T:Kino.Toolkit.Wpf.DataPager" />
+        /// will allow the user to attempt to move to the next page if<see cref="P:Kino.Toolkit.Wpf.DataPager.CanChangePage" /> is true.
         /// </summary>
         public bool CanMoveToNextPage
         {
@@ -545,8 +545,8 @@ private set
         }
 
         /// <summary>
-        /// Gets a value that indicates whether or not the <see cref="T:Kino.Toolkit.Wpf.KinoDataPager" />
-        /// will allow the user to attempt to move to the previous page if <see cref="P:Kino.Toolkit.Wpf.KinoDataPager.CanChangePage" /> is true.
+        /// Gets a value that indicates whether or not the <see cref="T:Kino.Toolkit.Wpf.DataPager" />
+        /// will allow the user to attempt to move to the previous page if <see cref="P:Kino.Toolkit.Wpf.DataPager.CanChangePage" /> is true.
         /// </summary>
         public bool CanMoveToPreviousPage
         {
@@ -563,7 +563,7 @@ private set
 
         /// <summary>
         /// Gets or sets a value that indicates how the
-        /// <see cref="T:Kino.Toolkit.Wpf.KinoDataPager" /> user interface is displayed
+        /// <see cref="T:Kino.Toolkit.Wpf.DataPager" /> user interface is displayed
         /// </summary>
         public PagerDisplayMode DisplayMode
         {
@@ -628,7 +628,7 @@ public IEnumerable Source
 
         /// <summary>
         /// Gets or sets a value that indicates the number of page buttons shown
-        /// on the <see cref="T:Kino.Toolkit.Wpf.KinoDataPager" /> user interface.
+        /// on the <see cref="T:Kino.Toolkit.Wpf.DataPager" /> user interface.
         /// </summary>
         public int NumericButtonCount
         {
@@ -878,7 +878,7 @@ public override void OnApplyTemplate()
         ///// <summary>
         ///// Creates an AutomationPeer (<see cref="UIElement.OnCreateAutomationPeer"/>)
         ///// </summary>
-        ///// <returns>Automation Peer for this <see cref="T:Kino.Toolkit.Wpf.KinoDataPager" /> control</returns>
+        ///// <returns>Automation Peer for this <see cref="T:Kino.Toolkit.Wpf.DataPager" /> control</returns>
         // protected override AutomationPeer OnCreateAutomationPeer()
         // {
         //    return new DataPagerAutomationPeer(this);
@@ -900,18 +900,18 @@ public override void OnApplyTemplate()
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnAutoEllipsisPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
             pager.UpdateButtonDisplay();
         }
 
         /// <summary>
         /// DisplayMode property changed handler.
         /// </summary>
-        /// <param name="d">KinoDataPager that changed its DisplayMode.</param>
+        /// <param name="d">DataPager that changed its DisplayMode.</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnDisplayModePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
             if (!pager.AreHandlersSuspended())
             {
                 if (!Enum.IsDefined(typeof(PagerDisplayMode), e.NewValue))
@@ -932,22 +932,22 @@ private static void OnDisplayModePropertyChanged(DependencyObject d, DependencyP
         /// <summary>
         /// IsTotalItemCountFixed property changed handler.
         /// </summary>
-        /// <param name="d">KinoDataPager that changed IsTotalItemCountFixed.</param>
+        /// <param name="d">DataPager that changed IsTotalItemCountFixed.</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnIsTotalItemCountFixedPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
             pager.UpdateControl();
         }
 
         /// <summary>
         /// NumericButtonCount property changed handler.
         /// </summary>
-        /// <param name="d">KinoDataPager that changed its NumericButtonCount.</param>
+        /// <param name="d">DataPager that changed its NumericButtonCount.</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnNumericButtonCountPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
 
             if (!pager.AreHandlersSuspended())
             {
@@ -970,11 +970,11 @@ private static void OnNumericButtonCountPropertyChanged(DependencyObject d, Depe
         /// <summary>
         /// NumericButtonStyle property changed handler.
         /// </summary>
-        /// <param name="d">KinoDataPager that changed its NumericButtonStyle.</param>
+        /// <param name="d">DataPager that changed its NumericButtonStyle.</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnNumericButtonStylePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
 
             if (pager._numericButtonPanel != null)
             {
@@ -996,11 +996,11 @@ private static void OnNumericButtonStylePropertyChanged(DependencyObject d, Depe
         /// <summary>
         /// PageIndex property changed handler.
         /// </summary>
-        /// <param name="d">KinoDataPager that changed its PageIndex.</param>
+        /// <param name="d">DataPager that changed its PageIndex.</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnPageIndexPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
 
             if (!pager.AreHandlersSuspended())
             {
@@ -1062,11 +1062,11 @@ private static void OnPageIndexPropertyChanged(DependencyObject d, DependencyPro
         /// <summary>
         /// PageSize property changed handler.
         /// </summary>
-        /// <param name="d">KinoDataPager that changed its PageSize.</param>
+        /// <param name="d">DataPager that changed its PageSize.</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnPageSizePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
 
             if (!pager.AreHandlersSuspended())
             {
@@ -1108,11 +1108,11 @@ private static void OnPageSizePropertyChanged(DependencyObject d, DependencyProp
         /// <summary>
         /// PrivateForeground property changed handler.
         /// </summary>
-        /// <param name="d">KinoDataPager that changed its Foreground property</param>
+        /// <param name="d">DataPager that changed its Foreground property</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnPrivateForegroundPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
 
             // Push the new foreground into the numeric toggle buttons
             pager.UpdateNumericButtonsForeground();
@@ -1121,11 +1121,11 @@ private static void OnPrivateForegroundPropertyChanged(DependencyObject d, Depen
         /// <summary>
         /// Called when a Read-Only dependency property is changed
         /// </summary>
-        /// <param name="d">KinoDataPager that changed its read-only property.</param>
+        /// <param name="d">DataPager that changed its read-only property.</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnReadOnlyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
             if (pager != null && !pager.AreHandlersSuspended())
             {
                 pager.SetValueNoCallback(e.Property, e.OldValue);
@@ -1140,11 +1140,11 @@ private static void OnReadOnlyPropertyChanged(DependencyObject d, DependencyProp
         /// <summary>
         /// SourceProperty property changed handler.
         /// </summary>
-        /// <param name="d">KinoDataPager that changed its Source.</param>
+        /// <param name="d">DataPager that changed its Source.</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private static void OnSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoDataPager pager = d as KinoDataPager;
+            DataPager pager = d as DataPager;
 
             INotifyPropertyChanged oldNotifyPropertyChanged = e.OldValue as INotifyPropertyChanged;
             if (oldNotifyPropertyChanged != null && pager._weakEventListenerPropertyChanged != null)
@@ -1159,7 +1159,7 @@ private static void OnSourcePropertyChanged(DependencyObject d, DependencyProper
                 INotifyPropertyChanged newNotifyPropertyChanged = e.NewValue as INotifyPropertyChanged;
                 if (newNotifyPropertyChanged != null)
                 {
-                    pager._weakEventListenerPropertyChanged = new WeakEventListener<KinoDataPager, object, PropertyChangedEventArgs>(pager)
+                    pager._weakEventListenerPropertyChanged = new WeakEventListener<DataPager, object, PropertyChangedEventArgs>(pager)
                     {
                         OnEventAction = (instance, source, eventArgs) => instance.OnSourcePropertyChanged(source, eventArgs),
                         OnDetachAction = (weakEventListener) => newNotifyPropertyChanged.PropertyChanged -= weakEventListener.OnEvent
@@ -1313,9 +1313,9 @@ private void OnCurrentPageTextBoxLostFocus(object sender, RoutedEventArgs e)
         }
 
         /// <summary>
-        /// Handles the notifications for the KinoDataPager.IsEnabled changes
+        /// Handles the notifications for the DataPager.IsEnabled changes
         /// </summary>
-        /// <param name="sender">KinoDataPager that changed its IsEnabled property</param>
+        /// <param name="sender">DataPager that changed its IsEnabled property</param>
         /// <param name="e">The DependencyPropertyChangedEventArgs for this event.</param>
         private void OnDataPagerIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
@@ -1404,7 +1404,7 @@ private void PageMoveHandler(int oldPageIndex, int newPageIndex, PageMoveOperati
             this.RaisePageIndexChanging(cancelArgs);
 
             // When the IPagedCollectionView implementation updates its PageIndex property,
-            // the KinoDataPager gets a notification and raises the PageIndexChanged event.
+            // the DataPager gets a notification and raises the PageIndexChanged event.
             if (cancelArgs.Cancel)
             {
                 // Revert back to old value, since operation was canceled
@@ -1539,7 +1539,7 @@ private void RaisePageIndexChanging(CancelEventArgs e)
         }
 
         /// <summary>
-        /// Update KinoDataPager UI for paging enabled.
+        /// Update DataPager UI for paging enabled.
         /// </summary>
         /// <param name="needPage">Boolean that specifies if a page is needed</param>
         private void SetCannotChangePage(bool needPage)
@@ -1557,7 +1557,7 @@ private void SetCannotChangePage(bool needPage)
         }
 
         /// <summary>
-        /// Update KinoDataPager UI for paging disabled.
+        /// Update DataPager UI for paging disabled.
         /// </summary>
         private void SetCanChangePage()
         {
@@ -1980,7 +1980,7 @@ private void UpdateCurrentPagePrefixAndSuffix(bool needPage)
         }
 
         /// <summary>
-        /// Pushes this KinoDataPager's Foreground into the numeric buttons when that property isn't set
+        /// Pushes this DataPager's Foreground into the numeric buttons when that property isn't set
         /// in their style.
         /// </summary>
         private void UpdateNumericButtonsForeground()
@@ -2003,7 +2003,7 @@ private void UpdateNumericButtonsForeground()
                                     s.Value != null)
                                 {
                                     // The toggle button's style explicitly sets the foreground,
-                                    // let's not default to the KinoDataPager's setting then.
+                                    // let's not default to the DataPager's setting then.
                                     useDataPagerForeground = false;
                                     break;
                                 }
@@ -2047,4 +2047,4 @@ private void UpdatePageCount()
     }
 }
 #pragma warning restore IDE0019 // 使用模式匹配
-#pragma warning restore IDE1005 // 可简化委托调用。
\ No newline at end of file
+#pragma warning restore IDE1005 // 可简化委托调用。
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/KinoDataPager.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/DataPager.xaml
similarity index 99%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/KinoDataPager.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/DataPager.xaml
index 30fd302..623416f 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/KinoDataPager.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/DataPager/DataPager.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Kino.Toolkit.Wpf">
 
-    <Style TargetType="local:KinoDataPager">
+    <Style TargetType="local:DataPager">
         <Setter Property="Background"
                 Value="#FFF2F3F4" />
         <Setter Property="BorderBrush"
@@ -31,7 +31,7 @@
                     <Setter Property="Padding"
                             Value="1" />
                     <Setter Property="Foreground"
-                            Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:KinoDataPager},Path=Foreground}" />
+                            Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DataPager},Path=Foreground}" />
                     <Setter Property="Template">
                         <Setter.Value>
                             <ControlTemplate TargetType="ToggleButton">
@@ -132,7 +132,7 @@
 
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoDataPager">
+                <ControlTemplate TargetType="local:DataPager">
                     <Grid Name="Root"
                           Background="Transparent">
                         <Grid.Resources>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/KinoExpander.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/Expander.xaml
similarity index 99%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/KinoExpander.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/Expander.xaml
index bfa1f63..e8517b4 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/KinoExpander.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/Expander.xaml
@@ -220,7 +220,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type local:KinoExpander}">
+    <Style TargetType="{x:Type local:ExtendedExpander}">
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -229,7 +229,7 @@
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:KinoExpander}">
+                <ControlTemplate TargetType="{x:Type local:ExtendedExpander}">
                     <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="3" SnapsToDevicePixels="true">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="ExpansionStates">
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/KinoExpander.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/ExtendedExpander.cs
similarity index 61%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/KinoExpander.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/ExtendedExpander.cs
index 4cdbfea..30df325 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/KinoExpander.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Expander/ExtendedExpander.cs
@@ -7,11 +7,11 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoExpander : Expander
+    public class ExtendedExpander : Expander
     {
-        public KinoExpander()
+        public ExtendedExpander()
         {
-            DefaultStyleKey = typeof(KinoExpander);
+            DefaultStyleKey = typeof(ExtendedExpander);
         }
     }
 }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.Properties.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.Properties.cs
similarity index 88%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.Properties.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.Properties.cs
index 01167be..5d68a31 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.Properties.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.Properties.cs
@@ -11,62 +11,62 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public partial class KinoForm : HeaderedItemsControl
+    public partial class Form : HeaderedItemsControl
     {
         /// <summary>
         /// 标识 FunctionBar 依赖属性。
         /// </summary>
         public static readonly DependencyProperty FunctionBarProperty =
-            DependencyProperty.Register(nameof(FunctionBar), typeof(KinoFormFunctionBar), typeof(KinoForm), new PropertyMetadata(default(KinoFormFunctionBar), OnFunctionBarChanged));
+            DependencyProperty.Register(nameof(FunctionBar), typeof(FormFunctionBar), typeof(Form), new PropertyMetadata(default(FormFunctionBar), OnFunctionBarChanged));
 
         /// <summary>
         /// 标识 LabelMemberPath 依赖属性。
         /// </summary>
         public static readonly DependencyProperty LabelMemberPathProperty =
-            DependencyProperty.Register(nameof(LabelMemberPath), typeof(string), typeof(KinoForm), new PropertyMetadata(default(string), OnLabelMemberPathChanged));
+            DependencyProperty.Register(nameof(LabelMemberPath), typeof(string), typeof(Form), new PropertyMetadata(default(string), OnLabelMemberPathChanged));
 
         /// <summary>
         /// 标识 Description 依赖项属性。
         /// </summary>
         public static readonly DependencyProperty DescriptionProperty =
-            DependencyProperty.RegisterAttached("Description", typeof(object), typeof(KinoForm), new PropertyMetadata(default, OnFormPropertyChanged));
+            DependencyProperty.RegisterAttached("Description", typeof(object), typeof(Form), new PropertyMetadata(default, OnFormPropertyChanged));
 
         /// <summary>
         /// 标识 Label 依赖项属性。
         /// </summary>
         public static readonly DependencyProperty LabelProperty =
-            DependencyProperty.RegisterAttached("Label", typeof(object), typeof(KinoForm), new PropertyMetadata(default, OnFormPropertyChanged));
+            DependencyProperty.RegisterAttached("Label", typeof(object), typeof(Form), new PropertyMetadata(default, OnFormPropertyChanged));
 
         /// <summary>
         /// 标识 LabelTemplate 依赖项属性。
         /// </summary>
         public static readonly DependencyProperty LabelTemplateProperty =
-            DependencyProperty.RegisterAttached("LabelTemplate", typeof(DataTemplate), typeof(KinoForm), new PropertyMetadata(default(DataTemplate), OnFormPropertyChanged));
+            DependencyProperty.RegisterAttached("LabelTemplate", typeof(DataTemplate), typeof(Form), new PropertyMetadata(default(DataTemplate), OnFormPropertyChanged));
 
         /// <summary>
         /// 标识 IsItemItsOwnContainer 依赖项属性。
         /// </summary>
         public static readonly DependencyProperty IsItemItsOwnContainerProperty =
-            DependencyProperty.RegisterAttached("IsItemItsOwnContainer", typeof(bool), typeof(KinoForm), new PropertyMetadata(default(bool), OnFormPropertyChanged));
+            DependencyProperty.RegisterAttached("IsItemItsOwnContainer", typeof(bool), typeof(Form), new PropertyMetadata(default(bool), OnFormPropertyChanged));
 
         /// <summary>
         /// 标识 IsRequired 依赖项属性。
         /// </summary>
         public static readonly DependencyProperty IsRequiredProperty =
-            DependencyProperty.RegisterAttached("IsRequired", typeof(bool), typeof(KinoForm), new PropertyMetadata(default(bool), OnFormPropertyChanged));
+            DependencyProperty.RegisterAttached("IsRequired", typeof(bool), typeof(Form), new PropertyMetadata(default(bool), OnFormPropertyChanged));
 
         /// <summary>
         /// 标识 ContainerStyle 依赖项属性。
         /// </summary>
         public static readonly DependencyProperty ContainerStyleProperty =
-            DependencyProperty.RegisterAttached("ContainerStyle", typeof(Style), typeof(KinoForm), new PropertyMetadata(default(Style), OnFormPropertyChanged));
+            DependencyProperty.RegisterAttached("ContainerStyle", typeof(Style), typeof(Form), new PropertyMetadata(default(Style), OnFormPropertyChanged));
 
         /// <summary>
         /// 获取或设置FunctionBar的值
         /// </summary>
-        public KinoFormFunctionBar FunctionBar
+        public FormFunctionBar FunctionBar
         {
-            get => (KinoFormFunctionBar)GetValue(FunctionBarProperty);
+            get => (FormFunctionBar)GetValue(FunctionBarProperty);
             set => SetValue(FunctionBarProperty, value);
         }
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.cs
similarity index 84%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.cs
index fc12d8c..1f6bc93 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.cs
@@ -11,14 +11,14 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    [StyleTypedProperty(Property = "ItemContainerStyle", StyleTargetType = typeof(KinoFormItem))]
-    public partial class KinoForm : HeaderedItemsControl
+    [StyleTypedProperty(Property = "ItemContainerStyle", StyleTargetType = typeof(FormItem))]
+    public partial class Form : HeaderedItemsControl
     {
         private DataTemplate _labelMemberTemplate;
 
-        public KinoForm()
+        public Form()
         {
-            DefaultStyleKey = typeof(KinoForm);
+            DefaultStyleKey = typeof(Form);
         }
 
         private DataTemplate LabelMemberTemplate
@@ -43,7 +43,7 @@ private DataTemplate LabelMemberTemplate
         /// </summary>
         /// <param name="oldValue">FunctionBar 属性的旧值。</param>
         /// <param name="newValue">FunctionBar 属性的新值。</param>
-        protected virtual void OnFunctionBarChanged(KinoFormFunctionBar oldValue, KinoFormFunctionBar newValue)
+        protected virtual void OnFunctionBarChanged(FormFunctionBar oldValue, FormFunctionBar newValue)
         {
         }
 
@@ -63,7 +63,7 @@ protected virtual void OnLabelMemberPathChanged(string oldValue, string newValue
             int count = Items.Count;
             for (int i = 0; i < count; i++)
             {
-                if (ItemContainerGenerator.ContainerFromIndex(i) is KinoFormItem formItem)
+                if (ItemContainerGenerator.ContainerFromIndex(i) is FormItem formItem)
                     PrepareFormItem(formItem, Items[i]);
             }
         }
@@ -74,12 +74,12 @@ protected override bool IsItemItsOwnContainerOverride(object item)
             if (item is FrameworkElement element)
                 isItemItsOwnContainer = GetIsItemItsOwnContainer(element);
 
-            return item is KinoFormItem || isItemItsOwnContainer;
+            return item is FormItem || isItemItsOwnContainer;
         }
 
         protected override DependencyObject GetContainerForItemOverride()
         {
-            var item = new KinoFormItem();
+            var item = new FormItem();
             return item;
         }
 
@@ -87,7 +87,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
         {
             base.PrepareContainerForItemOverride(element, item);
 
-            if (element is KinoFormItem formItem && item is KinoFormItem == false)
+            if (element is FormItem formItem && item is FormItem == false)
             {
                 if (item is FrameworkElement content)
                     PrepareFormFrameworkElement(formItem, content);
@@ -98,17 +98,17 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
         protected override bool ShouldApplyItemContainerStyle(DependencyObject container, object item)
         {
-            return container is KinoFormItem;
+            return container is FormItem;
         }
 
         private static void OnFunctionBarChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var oldValue = (KinoFormFunctionBar)args.OldValue;
-            var newValue = (KinoFormFunctionBar)args.NewValue;
+            var oldValue = (FormFunctionBar)args.OldValue;
+            var newValue = (FormFunctionBar)args.NewValue;
             if (oldValue == newValue)
                 return;
 
-            var target = obj as KinoForm;
+            var target = obj as Form;
             target?.OnFunctionBarChanged(oldValue, newValue);
         }
 
@@ -119,7 +119,7 @@ private static void OnLabelMemberPathChanged(DependencyObject obj, DependencyPro
             if (oldValue == newValue)
                 return;
 
-            var target = obj as KinoForm;
+            var target = obj as Form;
             target?.OnLabelMemberPathChanged(oldValue, newValue);
         }
 
@@ -128,14 +128,14 @@ private static void OnFormPropertyChanged(DependencyObject obj, DependencyProper
             if (args.OldValue == args.NewValue)
                 return;
 
-            if (obj is FrameworkElement content && content.Parent is KinoForm form)
+            if (obj is FrameworkElement content && content.Parent is Form form)
             {
-                if (form.ItemContainerGenerator.ContainerFromItem(content) is KinoFormItem formItem)
+                if (form.ItemContainerGenerator.ContainerFromItem(content) is FormItem formItem)
                     form.PrepareFormFrameworkElement(formItem, content);
             }
         }
 
-        private void PrepareFormFrameworkElement(KinoFormItem formItem, FrameworkElement content)
+        private void PrepareFormFrameworkElement(FormItem formItem, FrameworkElement content)
         {
             formItem.Label = GetLabel(content);
             formItem.Description = GetDescription(content);
@@ -161,7 +161,7 @@ private void PrepareFormFrameworkElement(KinoFormItem formItem, FrameworkElement
             formItem.SetBinding(VisibilityProperty, binding);
         }
 
-        private void PrepareFormItem(KinoFormItem formItem, object item)
+        private void PrepareFormItem(FormItem formItem, object item)
         {
             if (formItem == item)
                 return;
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.xaml
similarity index 91%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.xaml
index 86b4620..a3fe049 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoForm.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/Form.xaml
@@ -5,12 +5,12 @@
     <local:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter" />
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Style TargetType="local:KinoFormSeparator">
+    <Style TargetType="local:FormSeparator">
         <Setter Property="Margin"
                 Value="0,8,0,8" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoFormSeparator">
+                <ControlTemplate TargetType="local:FormSeparator">
                     <Rectangle VerticalAlignment="Bottom"
                                Height="1" />
                 </ControlTemplate>
@@ -18,7 +18,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="local:KinoFormTitle">
+    <Style TargetType="local:FormTitle">
         <Setter Property="FontSize"
                 Value="16" />
         <Setter Property="Margin"
@@ -31,7 +31,7 @@
                 Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoFormTitle">
+                <ControlTemplate TargetType="local:FormTitle">
                     <StackPanel Margin="{TemplateBinding Padding}">
                         <ContentPresenter x:Name="ContentPresenter"
                                           ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -48,7 +48,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="local:KinoFormItem">
+    <Style TargetType="local:FormItem">
         <Setter Property="IsTabStop"
                 Value="False" />
         <Setter Property="Margin"
@@ -65,7 +65,7 @@
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoFormItem">
+                <ControlTemplate TargetType="local:FormItem">
                     <Grid x:Name="Root">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto"
@@ -105,7 +105,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type local:KinoForm}">
+    <Style TargetType="{x:Type local:Form}">
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
                 Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
@@ -135,7 +135,7 @@
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type  local:KinoForm}">
+                <ControlTemplate TargetType="{x:Type  local:Form}">
                     <Border BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Background="{TemplateBinding Background}">
@@ -145,13 +145,13 @@
                                 <RowDefinition />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
-                            <local:KinoPageTitle Content="{TemplateBinding Header}"
+                            <local:PageTitle Content="{TemplateBinding Header}"
                                                  ContentTemplate="{TemplateBinding HeaderTemplate}" />
-                            <local:KinoScrollViewer Grid.Row="1"
+                            <local:ExtendedScrollViewer Grid.Row="1"
                                                     Padding="{TemplateBinding Padding}">
                                 <ItemsPresenter SnapsToDevicePixels="True"
                                                 UseLayoutRounding="True" />
-                            </local:KinoScrollViewer>
+                            </local:ExtendedScrollViewer>
                             <ContentPresenter Content="{TemplateBinding FunctionBar}"
                                               Grid.Row="2" />
                         </Grid>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormItem.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormItem.cs
similarity index 86%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormItem.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormItem.cs
index 4cfb767..ac7e6a1 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormItem.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormItem.cs
@@ -9,35 +9,35 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoFormItem : ContentControl
+    public class FormItem : ContentControl
     {
         /// <summary>
         /// 标识 IsRequired 依赖属性。
         /// </summary>
         public static readonly DependencyProperty IsRequiredProperty =
-            DependencyProperty.Register(nameof(IsRequired), typeof(bool), typeof(KinoFormItem), new PropertyMetadata(default(bool)));
+            DependencyProperty.Register(nameof(IsRequired), typeof(bool), typeof(FormItem), new PropertyMetadata(default(bool)));
 
         /// <summary>
         /// 标识 Description 依赖属性。
         /// </summary>
         public static readonly DependencyProperty DescriptionProperty =
-            DependencyProperty.Register(nameof(Description), typeof(object), typeof(KinoFormItem), new PropertyMetadata(default(object)));
+            DependencyProperty.Register(nameof(Description), typeof(object), typeof(FormItem), new PropertyMetadata(default(object)));
 
         /// <summary>
         /// 标识 Label 依赖属性。
         /// </summary>
         public static readonly DependencyProperty LabelProperty =
-            DependencyProperty.Register(nameof(Label), typeof(object), typeof(KinoFormItem), new PropertyMetadata(default, OnLabelChanged));
+            DependencyProperty.Register(nameof(Label), typeof(object), typeof(FormItem), new PropertyMetadata(default, OnLabelChanged));
 
         /// <summary>
         /// 标识 LabelTemplate 依赖属性。
         /// </summary>
         public static readonly DependencyProperty LabelTemplateProperty =
-            DependencyProperty.Register(nameof(LabelTemplate), typeof(DataTemplate), typeof(KinoFormItem), new PropertyMetadata(default(DataTemplate), OnLabelTemplateChanged));
+            DependencyProperty.Register(nameof(LabelTemplate), typeof(DataTemplate), typeof(FormItem), new PropertyMetadata(default(DataTemplate), OnLabelTemplateChanged));
 
-        public KinoFormItem()
+        public FormItem()
         {
-            DefaultStyleKey = typeof(KinoFormItem);
+            DefaultStyleKey = typeof(FormItem);
         }
 
         /// <summary>
@@ -101,7 +101,7 @@ private static void OnLabelChanged(DependencyObject obj, DependencyPropertyChang
             if (oldValue == newValue)
                 return;
 
-            var target = obj as KinoFormItem;
+            var target = obj as FormItem;
             target?.OnLabelChanged(oldValue, newValue);
         }
 
@@ -112,7 +112,7 @@ private static void OnLabelTemplateChanged(DependencyObject obj, DependencyPrope
             if (oldValue == newValue)
                 return;
 
-            var target = obj as KinoFormItem;
+            var target = obj as FormItem;
             target?.OnLabelTemplateChanged(oldValue, newValue);
         }
     }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormSeparator.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormSeparator.cs
similarity index 51%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormSeparator.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormSeparator.cs
index 6061902..791bff6 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormSeparator.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormSeparator.cs
@@ -7,12 +7,12 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoFormSeparator : Separator
+    public class FormSeparator : Separator
     {
-        public KinoFormSeparator()
+        public FormSeparator()
         {
-            DefaultStyleKey = typeof(KinoFormSeparator);
-            KinoForm.SetIsItemItsOwnContainer(this, true);
+            DefaultStyleKey = typeof(FormSeparator);
+            Form.SetIsItemItsOwnContainer(this, true);
         }
     }
 }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormTitle.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormTitle.cs
similarity index 81%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormTitle.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormTitle.cs
index 0040c1d..1ca1b6b 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/KinoFormTitle.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Form/FormTitle.cs
@@ -8,18 +8,18 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoFormTitle : ContentControl
+    public class FormTitle : ContentControl
     {
         /// <summary>
         /// 标识 Description 依赖属性。
         /// </summary>
         public static readonly DependencyProperty DescriptionProperty =
-            DependencyProperty.Register(nameof(Description), typeof(object), typeof(KinoFormTitle), new PropertyMetadata(default, OnDescriptionChanged));
+            DependencyProperty.Register(nameof(Description), typeof(object), typeof(FormTitle), new PropertyMetadata(default, OnDescriptionChanged));
 
-        public KinoFormTitle()
+        public FormTitle()
         {
-            DefaultStyleKey = typeof(KinoFormTitle);
-            KinoForm.SetIsItemItsOwnContainer(this, true);
+            DefaultStyleKey = typeof(FormTitle);
+            Form.SetIsItemItsOwnContainer(this, true);
         }
 
         /// <summary>
@@ -49,7 +49,7 @@ private static void OnDescriptionChanged(DependencyObject obj, DependencyPropert
                 return;
             }
 
-            var target = obj as KinoFormTitle;
+            var target = obj as FormTitle;
             target?.OnDescriptionChanged(oldValue, newValue);
         }
     }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFormFunctionBar.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FormFunctionBar.cs
similarity index 54%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFormFunctionBar.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FormFunctionBar.cs
index 3357b3b..095990d 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFormFunctionBar.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FormFunctionBar.cs
@@ -6,11 +6,11 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoFormFunctionBar : KinoFunctionBar
+    public class FormFunctionBar : FunctionBar
     {
-        public KinoFormFunctionBar()
+        public FormFunctionBar()
         {
-            DefaultStyleKey = typeof(KinoFormFunctionBar);
+            DefaultStyleKey = typeof(FormFunctionBar);
         }
     }
 }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFormFunctionBar.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FormFunctionBar.xaml
similarity index 88%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFormFunctionBar.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FormFunctionBar.xaml
index 40b0ca8..5a7cb47 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFormFunctionBar.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FormFunctionBar.xaml
@@ -17,8 +17,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="FormFunctionBarKinoButton"
-           TargetType="local:KinoButton"
+    <Style x:Key="FormFunctionBarExtendedButton"
+           TargetType="local:ExtendedButton"
            BasedOn="{StaticResource FormFunctionBarButtonBase}" />
 
 
@@ -28,7 +28,7 @@
 
 
 
-    <Style TargetType="{x:Type local:KinoFormFunctionBar}">
+    <Style TargetType="{x:Type local:FormFunctionBar}">
 
         <Setter Property="FocusVisualStyle"
                 Value="{x:Null}" />
@@ -44,12 +44,12 @@
                 Value="Right" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoFormFunctionBar">
+                <ControlTemplate TargetType="local:FormFunctionBar">
                     <ControlTemplate.Resources>
                         <Style BasedOn="{StaticResource FormFunctionBarButton}"
                                TargetType="{x:Type Button}" />
-                        <Style BasedOn="{StaticResource FormFunctionBarKinoButton}"
-                               TargetType="{x:Type local:KinoButton}" />
+                        <Style BasedOn="{StaticResource FormFunctionBarExtendedButton}"
+                               TargetType="{x:Type local:ExtendedButton}" />
                     </ControlTemplate.Resources>
                     <Grid Margin="{TemplateBinding Padding}">
                         <ContentPresenter Content="{TemplateBinding Header}"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFunctionBar.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FunctionBar.cs
similarity index 72%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFunctionBar.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FunctionBar.cs
index 51d740f..754499c 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFunctionBar.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FunctionBar.cs
@@ -3,9 +3,9 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoFunctionBar : HeaderedItemsControl
+    public class FunctionBar : HeaderedItemsControl
     {
-        public KinoFunctionBar()
+        public FunctionBar()
         {
         }
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFunctionBar.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FunctionBar.xaml
similarity index 84%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFunctionBar.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FunctionBar.xaml
index cf8a03e..53862d6 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoFunctionBar.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/FunctionBar.xaml
@@ -2,8 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Kino.Toolkit.Wpf">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/FunctionBar/KinoFormFunctionBar.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/FunctionBar/KinoWindowFunctionBar.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/FunctionBar/FormFunctionBar.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/FunctionBar/WindowFunctionBar.xaml" />
     </ResourceDictionary.MergedDictionaries>
    
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoWindowFunctionBar.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/WindowFunctionBar.cs
similarity index 53%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoWindowFunctionBar.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/WindowFunctionBar.cs
index 3db33d5..17a1a50 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoWindowFunctionBar.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/WindowFunctionBar.cs
@@ -6,11 +6,11 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoWindowFunctionBar : KinoFunctionBar
+    public class WindowFunctionBar : FunctionBar
     {
-        public KinoWindowFunctionBar()
+        public WindowFunctionBar()
         {
-            DefaultStyleKey = typeof(KinoWindowFunctionBar);
+            DefaultStyleKey = typeof(WindowFunctionBar);
         }
     }
 }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoWindowFunctionBar.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/WindowFunctionBar.xaml
similarity index 99%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoWindowFunctionBar.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/WindowFunctionBar.xaml
index 30230a4..5e337d7 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/KinoWindowFunctionBar.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/FunctionBar/WindowFunctionBar.xaml
@@ -667,7 +667,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type local:KinoWindowFunctionBar}">
+    <Style TargetType="{x:Type local:WindowFunctionBar}">
         <Setter Property="FocusVisualStyle"
                 Value="{x:Null}" />
         <Setter Property="Focusable"
@@ -676,7 +676,7 @@
                 Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoWindowFunctionBar">
+                <ControlTemplate TargetType="local:WindowFunctionBar">
                     <ControlTemplate.Resources>
                         <ResourceDictionary>
                             <Style BasedOn="{StaticResource WindowTitleBarButtonStyle}"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/GlobalSuppressions.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/GlobalSuppressions.cs
index 0520255..86c36eb 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/GlobalSuppressions.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/GlobalSuppressions.cs
@@ -3,13 +3,13 @@
 // Project-level suppressions either have no target or are given
 // a specific target and scoped to a namespace, type, member, etc.
 
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements must appear in the correct order", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.KinoTransitioningContentControl")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements must be ordered by access", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.KinoTransitioningContentControl")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements must appear in the correct order", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.TransitioningContentControl")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements must be ordered by access", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.TransitioningContentControl")]
 
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1116:Split parameters must start on line after declaration", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.KinoDataPager")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements must be ordered by access", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.KinoDataPager")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1642:Constructor summary documentation must begin with standard text", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.KinoDataPager")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements must appear in the correct order", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.KinoDataPager")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1116:Split parameters must start on line after declaration", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.DataPager")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements must be ordered by access", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.DataPager")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1642:Constructor summary documentation must begin with standard text", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.DataPager")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements must appear in the correct order", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.DataPager")]
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1642:Constructor summary documentation must begin with standard text", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.CollectionViewLoader")]
 
@@ -69,9 +69,9 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements must be ordered by access", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.Extensions")]
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("样式", "IDE1006:命名样式", Justification = "Opensource code", Scope = "type", Target = "System.Windows.Data.CollectionViewGroupRoot")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("样式", "IDE1006:命名样式", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.KinoDataPager")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("样式", "IDE1006:命名样式", Justification = "Opensource code", Scope = "type", Target = "Kino.Toolkit.Wpf.DataPager")]
 
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1823:Unused field '_falseValue'.", Justification = "<挂起>", Scope = "member", Target = "~F:Kino.Toolkit.Wpf.KinoRibbonWindow._falseValue")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1823:Unused field '_falseValue'.", Justification = "<挂起>", Scope = "member", Target = "~F:Kino.Toolkit.Wpf.ExtendedRibbonWindow._falseValue")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1823:Unused field 'Bottom'.", Justification = "<挂起>", Scope = "member", Target = "~F:Kino.Toolkit.Wpf.SystemDropShadowChrome.Bottom")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1823:Unused field 'BottomLeft'.", Justification = "<挂起>", Scope = "member", Target = "~F:Kino.Toolkit.Wpf.SystemDropShadowChrome.BottomLeft")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1823:Unused field 'BottomRight'.", Justification = "<挂起>", Scope = "member", Target = "~F:Kino.Toolkit.Wpf.SystemDropShadowChrome.BottomRight")]
@@ -96,21 +96,21 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.FocusService.SetIsAutoFocus(System.Windows.DependencyObject,System.Boolean)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.FrameworkElementService.GetResources(System.Windows.DependencyObject)~System.Windows.ResourceDictionary")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.FrameworkElementService.SetResources(System.Windows.DependencyObject,System.Windows.ResourceDictionary)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA2208:Method OnNumericButtonCountPropertyChanged passes 'value' as the paramName argument to a ArgumentOutOfRangeException constructor. Replace this argument with one of the method's parameter names. Note that the provided parameter name should have the exact casing as declared on the method.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoDataPager.OnNumericButtonCountPropertyChanged(System.Windows.DependencyObject,System.Windows.DependencyPropertyChangedEventArgs)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA2208:Method OnPageIndexPropertyChanged passes 'value' as the paramName argument to a ArgumentOutOfRangeException constructor. Replace this argument with one of the method's parameter names. Note that the provided parameter name should have the exact casing as declared on the method.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoDataPager.OnPageIndexPropertyChanged(System.Windows.DependencyObject,System.Windows.DependencyPropertyChangedEventArgs)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA2208:Method OnPageSizePropertyChanged passes 'value' as the paramName argument to a ArgumentOutOfRangeException constructor. Replace this argument with one of the method's parameter names. Note that the provided parameter name should have the exact casing as declared on the method.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoDataPager.OnPageSizePropertyChanged(System.Windows.DependencyObject,System.Windows.DependencyPropertyChangedEventArgs)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.GetContainerStyle(System.Windows.FrameworkElement)~System.Windows.Style")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.GetDescription(System.Windows.FrameworkElement)~System.Object")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.GetIsItemItsOwnContainer(System.Windows.FrameworkElement)~System.Boolean")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.GetIsRequired(System.Windows.FrameworkElement)~System.Boolean")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.GetLabel(System.Windows.FrameworkElement)~System.Object")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.SetContainerStyle(System.Windows.FrameworkElement,System.Windows.Style)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.SetDescription(System.Windows.FrameworkElement,System.Object)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.SetIsItemItsOwnContainer(System.Windows.FrameworkElement,System.Boolean)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.SetIsRequired(System.Windows.FrameworkElement,System.Boolean)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoForm.SetLabelTemplate(System.Windows.FrameworkElement,System.Windows.DataTemplate)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1810:Initialize all static fields in 'KinoHyperlinkButton' when those fields are declared and remove the explicit static constructor", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoHyperlinkButton.#cctor")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1031:Modify 'IsPermissionGranted' to catch a more specific exception type, or rethrow the exception.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.KinoHyperlinkButton.IsPermissionGranted~System.Boolean")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA2208:Method OnNumericButtonCountPropertyChanged passes 'value' as the paramName argument to a ArgumentOutOfRangeException constructor. Replace this argument with one of the method's parameter names. Note that the provided parameter name should have the exact casing as declared on the method.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.DataPager.OnNumericButtonCountPropertyChanged(System.Windows.DependencyObject,System.Windows.DependencyPropertyChangedEventArgs)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA2208:Method OnPageIndexPropertyChanged passes 'value' as the paramName argument to a ArgumentOutOfRangeException constructor. Replace this argument with one of the method's parameter names. Note that the provided parameter name should have the exact casing as declared on the method.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.DataPager.OnPageIndexPropertyChanged(System.Windows.DependencyObject,System.Windows.DependencyPropertyChangedEventArgs)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA2208:Method OnPageSizePropertyChanged passes 'value' as the paramName argument to a ArgumentOutOfRangeException constructor. Replace this argument with one of the method's parameter names. Note that the provided parameter name should have the exact casing as declared on the method.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.DataPager.OnPageSizePropertyChanged(System.Windows.DependencyObject,System.Windows.DependencyPropertyChangedEventArgs)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.GetContainerStyle(System.Windows.FrameworkElement)~System.Windows.Style")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.GetDescription(System.Windows.FrameworkElement)~System.Object")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.GetIsItemItsOwnContainer(System.Windows.FrameworkElement)~System.Boolean")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.GetIsRequired(System.Windows.FrameworkElement)~System.Boolean")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.GetLabel(System.Windows.FrameworkElement)~System.Object")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.SetContainerStyle(System.Windows.FrameworkElement,System.Windows.Style)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.SetDescription(System.Windows.FrameworkElement,System.Object)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.SetIsItemItsOwnContainer(System.Windows.FrameworkElement,System.Boolean)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.SetIsRequired(System.Windows.FrameworkElement,System.Boolean)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1720:Identifier 'obj' contains type name", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Form.SetLabelTemplate(System.Windows.FrameworkElement,System.Windows.DataTemplate)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1810:Initialize all static fields in 'HyperlinkButton' when those fields are declared and remove the explicit static constructor", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.HyperlinkButton.#cctor")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1031:Modify 'IsPermissionGranted' to catch a more specific exception type, or rethrow the exception.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.HyperlinkButton.IsPermissionGranted~System.Boolean")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1030:Consider making 'RaisePropertyChanged' an event.", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.PagedCollectionViewBase.RaisePropertyChanged(System.String)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1507:Use nameof in place of string literal 'propertyName'", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.PagedCollectionViewBase.RaisePropertyChanged(System.String)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1810:Initialize all static fields in 'DataGridHeaderBorder' when those fields are declared and remove the explicit static constructor", Justification = "<挂起>", Scope = "member", Target = "~M:Kino.Toolkit.Wpf.Primitives.DataGridHeaderBorder.#cctor")]
@@ -170,7 +170,7 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1812:ExtensionProperties is an internal class that is apparently never instantiated. If so, remove the code from the assembly. If this class is intended to contain only static members, make it static (Shared in Visual Basic).", Justification = "<挂起>", Scope = "type", Target = "~T:Kino.Toolkit.Wpf.ExtensionProperties")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1052:Type 'FocusService' is a static holder type but is neither static nor NotInheritable", Justification = "<挂起>", Scope = "type", Target = "~T:Kino.Toolkit.Wpf.FocusService")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1052:Type 'FrameworkElementService' is a static holder type but is neither static nor NotInheritable", Justification = "<挂起>", Scope = "type", Target = "~T:Kino.Toolkit.Wpf.FrameworkElementService")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1034:Do not nest type TemplateSettingValues. Alternatively, change its accessibility so that it is not externally visible.", Justification = "<挂起>", Scope = "type", Target = "~T:Kino.Toolkit.Wpf.KinoProgressRing.TemplateSettingValues")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1034:Do not nest type TemplateSettingValues. Alternatively, change its accessibility so that it is not externally visible.", Justification = "<挂起>", Scope = "type", Target = "~T:Kino.Toolkit.Wpf.ProgressRing.TemplateSettingValues")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1010:Collection 'RemoteCollectionView' directly or indirectly inherits 'IEnumerable' without implementing 'IEnumerable<T>'. Publicly-visible collections should implement the generic version to broaden usability.", Justification = "<挂起>", Scope = "type", Target = "~T:Kino.Toolkit.Wpf.RemoteCollectionView")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1710:Rename Kino.Toolkit.Wpf.RemoteCollectionView to end in 'Collection'.", Justification = "<挂起>", Scope = "type", Target = "~T:Kino.Toolkit.Wpf.RemoteCollectionView")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Build", "CA1052:Type 'TextBlockService' is a static holder type but is neither static nor NotInheritable", Justification = "<挂起>", Scope = "type", Target = "~T:Kino.Toolkit.Wpf.TextBlockService")]
@@ -193,4 +193,4 @@
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("样式", "IDE0057:使用范围运算符", Justification = "<挂起>", Scope = "type", Target = "Kino.Toolkit.Wpf.TypeHelper")]
 
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("代码质量", "IDE0051:删除未使用的私有成员", Justification = "<挂起>", Scope = "type", Target = "Kino.Toolkit.Wpf.KinoDataPager")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("代码质量", "IDE0051:删除未使用的私有成员", Justification = "<挂起>", Scope = "type", Target = "Kino.Toolkit.Wpf.DataPager")]
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/KinoHeaderedContentControl.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/ExtendedHeaderedContentControl.cs
similarity index 87%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/KinoHeaderedContentControl.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/ExtendedHeaderedContentControl.cs
index b60b377..31e183b 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/KinoHeaderedContentControl.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/ExtendedHeaderedContentControl.cs
@@ -12,7 +12,7 @@ namespace Kino.Toolkit.Wpf
     [TemplatePart(Name = HeaderElementName, Type = typeof(FrameworkElement))]
     [TemplateVisualState(Name = NormalName, GroupName = CommonStatesName)]
     [TemplateVisualState(Name = DisabledName, GroupName = CommonStatesName)]
-    public class KinoHeaderedContentControl : HeaderedContentControl
+    public class ExtendedHeaderedContentControl : HeaderedContentControl
     {
         private const string HeaderElementName = "HeaderElement";
 
@@ -22,12 +22,12 @@ public class KinoHeaderedContentControl : HeaderedContentControl
 
         private FrameworkElement _headerElement;
 
-        static KinoHeaderedContentControl()
+        static ExtendedHeaderedContentControl()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(KinoHeaderedContentControl), new FrameworkPropertyMetadata(typeof(KinoHeaderedContentControl)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ExtendedHeaderedContentControl), new FrameworkPropertyMetadata(typeof(ExtendedHeaderedContentControl)));
         }
 
-        public KinoHeaderedContentControl()
+        public ExtendedHeaderedContentControl()
         {
             IsEnabledChanged += OnIsEnabledChanged;
         }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/KinoHeaderedContentControl.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/HeaderedContentControl.xaml
similarity index 93%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/KinoHeaderedContentControl.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/HeaderedContentControl.xaml
index ede6ea5..be46cc3 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/KinoHeaderedContentControl.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/HeaderedContentControl/HeaderedContentControl.xaml
@@ -1,13 +1,13 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Kino.Toolkit.Wpf">
-    
-    <Style TargetType="{x:Type local:KinoHeaderedContentControl}">
+
+    <Style TargetType="{x:Type local:ExtendedHeaderedContentControl}">
         <Setter Property="IsTabStop"
                 Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:KinoHeaderedContentControl}">
+                <ControlTemplate TargetType="{x:Type local:ExtendedHeaderedContentControl}">
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
@@ -47,4 +47,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj
index 0336aad..8110312 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj
@@ -63,7 +63,7 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Button\KinoHyperlinkButton.cs" />
+    <Compile Include="Button\HyperlinkButton.cs" />
     <Compile Include="Chromes\DataGridHeaderBorder.cs" />
     <Compile Include="Common\DpiHelper.cs" />
     <Compile Include="Common\FocusService.cs" />
@@ -71,10 +71,10 @@
     <Compile Include="Common\Utility.cs" />
     <Compile Include="Common\WindowNotifications.cs" />
     <Compile Include="Expander\ExpandableContentControl.cs" />
-    <Compile Include="Expander\KinoExpander.cs" />
-    <Compile Include="FunctionBar\KinoFunctionBar.cs" />
-    <Compile Include="FunctionBar\KinoFormFunctionBar.cs" />
-    <Compile Include="FunctionBar\KinoWindowFunctionBar.cs" />
+    <Compile Include="Expander\ExtendedExpander.cs" />
+    <Compile Include="FunctionBar\FunctionBar.cs" />
+    <Compile Include="FunctionBar\FormFunctionBar.cs" />
+    <Compile Include="FunctionBar\WindowFunctionBar.cs" />
     <Compile Include="Common\Extensions.cs" />
     <Compile Include="Common\FunctionalProgramming.cs" />
     <Compile Include="Common\NativeMethods.cs" />
@@ -89,8 +89,8 @@
     <Compile Include="Converters\EmptyObjectToVisibilityConverter.cs" />
     <Compile Include="Converters\NullToValueConverter.cs" />
     <Compile Include="Converters\TimesConverter.cs" />
-    <Compile Include="DataGrid\KinoDataGrid.cs" />
-    <Compile Include="DataPager\KinoDataPager.cs" />
+    <Compile Include="DataGrid\ExtendedDataGrid.cs" />
+    <Compile Include="DataPager\DataPager.cs" />
     <Compile Include="DataPager\PagerDisplayMode.cs" />
     <Compile Include="DataPager\PagerResources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -112,16 +112,16 @@
     <Compile Include="DomainServices\AsyncRemoteCollectionView.cs" />
     <Compile Include="DomainServices\RemoteCollectionView.cs" />
     <Compile Include="DomainServices\RemoteCollectionViewLoader.cs" />
-    <Compile Include="Form\KinoForm.Properties.cs" />
-    <Compile Include="Form\KinoForm.cs" />
-    <Compile Include="Form\KinoFormItem.cs" />
-    <Compile Include="Form\KinoFormSeparator.cs" />
-    <Compile Include="Form\KinoFormTitle.cs" />
+    <Compile Include="Form\Form.Properties.cs" />
+    <Compile Include="Form\Form.cs" />
+    <Compile Include="Form\FormItem.cs" />
+    <Compile Include="Form\FormSeparator.cs" />
+    <Compile Include="Form\FormTitle.cs" />
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="HeaderedContentControl\KinoHeaderedContentControl.cs" />
-    <Compile Include="Layout\KinoPageTitle.cs" />
-    <Compile Include="ListBox\KinoListBox.cs" />
-    <Compile Include="ListBox\KinoListBoxItem.cs" />
+    <Compile Include="HeaderedContentControl\ExtendedHeaderedContentControl.cs" />
+    <Compile Include="Layout\PageTitle.cs" />
+    <Compile Include="ListBox\ExtendedListBox.cs" />
+    <Compile Include="ListBox\ListBoxItem.cs" />
     <Compile Include="PagedCollectionView\CollectionViewGroupInternal.cs" />
     <Compile Include="PagedCollectionView\CollectionViewGroupRoot.cs" />
     <Compile Include="PagedCollectionView\IPagedCollectionView.cs" />
@@ -133,94 +133,94 @@
       <DependentUpon>PagedCollectionViewResources.resx</DependentUpon>
     </Compile>
     <Compile Include="ProgressRing\TemplateSettingValues.cs" />
-    <Compile Include="RadioButtonMenuItem\KinoRadioButtonMenuItem.cs" />
+    <Compile Include="RadioButtonMenuItem\RadioButtonMenuItem.cs" />
     <Compile Include="Resizer\InnerContentControl.cs" />
-    <Compile Include="Resizer\KinoResizer.cs" />
-    <Compile Include="ScrollViewer\KinoScrollViewer.cs" />
+    <Compile Include="Resizer\Resizer.cs" />
+    <Compile Include="ScrollViewer\ExtendedScrollViewer.cs" />
     <Compile Include="SelectionCheckBox\IMultiSelector.cs" />
     <Compile Include="SelectionCheckBox\KinoSelectionCheckBox.cs" />
-    <Compile Include="SkeletonScreen\KinoSkeletonScreen.cs" />
-    <Compile Include="SquareBox\KinoSquareBox.cs" />
-    <Compile Include="SquareBox\KinoSquareBoxTemplateSettings.cs" />
-    <Compile Include="StateIndicator\KinoStateIndicator.cs" />
+    <Compile Include="SkeletonScreen\SkeletonScreen.cs" />
+    <Compile Include="SquareBox\SquareBox.cs" />
+    <Compile Include="SquareBox\SquareBoxTemplateSettings.cs" />
+    <Compile Include="StateIndicator\StateIndicator.cs" />
     <Compile Include="StateIndicator\ProgressState.cs" />
-    <Compile Include="ProgressRing\KinoProgressRing.cs" />
+    <Compile Include="ProgressRing\ProgressRing.cs" />
     <Compile Include="TextBlock\TextBlockHighlightSource.cs" />
     <Compile Include="TextBlock\TextBlockHightlighSourceConverter.cs" />
     <Compile Include="TextBlock\TextBlockService.cs" />
-    <Compile Include="TransitioningContentControl\KinoTransitioningContentControl.cs" />
+    <Compile Include="TransitioningContentControl\TransitioningContentControl.cs" />
     <Compile Include="TransitioningContentControl\TransitionType.cs" />
-    <Compile Include="Validation\KinoValidationContent.cs" />
-    <Compile Include="Window\KinoRibbonWindow.cs" />
-    <Compile Include="Window\KinoWindow.cs" />
+    <Compile Include="Validation\ValidationContent.cs" />
+    <Compile Include="Window\ExtendedRibbonWindow.cs" />
+    <Compile Include="Window\ExtendedWindow.cs" />
     <Compile Include="Window\WindowParameters.cs" />
     <Compile Include="Window\WindowService.cs" />
     <Compile Include="Window\WindowService.WindowCommandHelper.cs" />
-    <Page Include="Button\KinoButton.xaml">
+    <Page Include="Button\Button.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Expander\KinoExpander.xaml">
+    <Page Include="Expander\Expander.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="FunctionBar\KinoFunctionBar.xaml">
+    <Page Include="FunctionBar\FunctionBar.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="FunctionBar\KinoFormFunctionBar.xaml">
+    <Page Include="FunctionBar\FormFunctionBar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="FunctionBar\KinoWindowFunctionBar.xaml">
+    <Page Include="FunctionBar\WindowFunctionBar.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="DataGrid\KinoDataGrid.xaml">
+    <Page Include="DataGrid\DataGrid.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="DataPager\KinoDataPager.xaml">
+    <Page Include="DataPager\DataPager.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Form\KinoForm.xaml">
+    <Page Include="Form\Form.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="HeaderedContentControl\KinoHeaderedContentControl.xaml">
+    <Page Include="HeaderedContentControl\HeaderedContentControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Layout\KinoPageTitle.xaml">
+    <Page Include="Layout\PageTitle.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ListBox\KinoListBox.xaml">
+    <Page Include="ListBox\ListBox.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="RadioButtonMenuItem\KinoRadioButtonMenuItem.xaml">
+    <Page Include="RadioButtonMenuItem\RadioButtonMenuItem.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Resizer\KinoResizer.xaml">
+    <Page Include="Resizer\Resizer.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="SkeletonScreen\KinoSkeletonScreen.xaml">
+    <Page Include="SkeletonScreen\SkeletonScreen.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SquareBox\KinoSquareBox.xaml">
+    <Page Include="SquareBox\SquareBox.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="StateIndicator\KinoStateIndicator.xaml">
+    <Page Include="StateIndicator\StateIndicator.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProgressRing\KinoProgressRing.xaml">
+    <Page Include="ProgressRing\ProgressRing.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -228,16 +228,16 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="Button\KinoButton.cs" />
-    <Page Include="TransitioningContentControl\KinoTransitioningContentControl.xaml">
+    <Compile Include="Button\ExtendedButton.cs" />
+    <Page Include="TransitioningContentControl\TransitioningContentControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Validation\KinoValidationContent.xaml">
+    <Page Include="Validation\ValidationContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Window\KinoWindow.xaml">
+    <Page Include="Window\Window.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -286,7 +286,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Compile Include="TransitioningContentControl\KinoTransitioningContentControl.VisualStates.cs" />
+    <Compile Include="TransitioningContentControl\TransitioningContentControl.VisualStates.cs" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Assets\Images\defaultsystemicon.png" />
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/KinoPageTitle.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/PageTitle.cs
similarity index 86%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/KinoPageTitle.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/PageTitle.cs
index d16b4ce..ccc68fa 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/KinoPageTitle.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/PageTitle.cs
@@ -41,14 +41,14 @@ namespace Kino.Toolkit.Wpf
     /// 步骤 2)
     /// 继续操作并在 XAML 文件中使用控件。
     ///
-    ///     <MyNamespace:KinoPageTitle/>
+    ///     <MyNamespace:PageTitle/>
     ///
     /// </summary>
-    public class KinoPageTitle : ContentControl
+    public class PageTitle : ContentControl
     {
-        static KinoPageTitle()
+        static PageTitle()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(KinoPageTitle), new FrameworkPropertyMetadata(typeof(KinoPageTitle)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(PageTitle), new FrameworkPropertyMetadata(typeof(PageTitle)));
         }
     }
 }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/KinoPageTitle.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/PageTitle.xaml
similarity index 93%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/KinoPageTitle.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/PageTitle.xaml
index 5764d85..597a1db 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/KinoPageTitle.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Layout/PageTitle.xaml
@@ -3,7 +3,7 @@
                     xmlns:local="clr-namespace:Kino.Toolkit.Wpf">
     <local:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter" />
 
-    <Style TargetType="{x:Type local:KinoPageTitle}">
+    <Style TargetType="{x:Type local:PageTitle}">
         <Setter Property="IsTabStop"
                 Value="False" />
         <Setter Property="Padding"
@@ -18,7 +18,7 @@
                 Value="#FF333333" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type  local:KinoPageTitle}">
+                <ControlTemplate TargetType="{x:Type  local:PageTitle}">
                     <Border BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Background="{TemplateBinding Background}"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBox.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ExtendedListBox.cs
similarity index 89%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBox.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ExtendedListBox.cs
index a96ca56..083c0d6 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBox.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ExtendedListBox.cs
@@ -9,11 +9,11 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoListBox : ListBox, IMultiSelector
+    public class ExtendedListBox : ListBox, IMultiSelector
     {
         // Using a DependencyProperty as the backing store for IsMultiSelectCheckBoxEnabled.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty IsMultiSelectCheckBoxEnabledProperty =
-            DependencyProperty.Register(nameof(IsMultiSelectCheckBoxEnabled), typeof(bool), typeof(KinoListBox), new PropertyMetadata(true));
+            DependencyProperty.Register(nameof(IsMultiSelectCheckBoxEnabled), typeof(bool), typeof(ExtendedListBox), new PropertyMetadata(true));
 
         public bool IsMultiSelectCheckBoxEnabled
         {
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBox.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ListBox.xaml
similarity index 98%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBox.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ListBox.xaml
index 1d63d18..0621918 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBox.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ListBox.xaml
@@ -26,13 +26,13 @@
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <Primitives:KinoResizer>
+                            <Primitives:Resizer>
                                 <CheckBox Margin="{TemplateBinding Padding}"
                                           IsChecked="{Binding IsSelected, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                           IsTabStop="False"
                                           x:Name="SelectionCheckMark"/>
-                            </Primitives:KinoResizer>
+                            </Primitives:Resizer>
                             <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Column="1"
                                               Margin="{TemplateBinding Padding}"/>
                         </Grid>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBoxItem.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ListBoxItem.cs
similarity index 80%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBoxItem.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ListBoxItem.cs
index 7b60f3e..3217230 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/KinoListBoxItem.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ListBox/ListBoxItem.cs
@@ -26,9 +26,9 @@ public KinoListBoxItem()
         /// <summary>
         /// 获取或设置Owner的值
         /// </summary>
-        public KinoListBox Owner
+        public ExtendedListBox Owner
         {
-            get => (KinoListBox)GetValue(OwnerProperty);
+            get => (ExtendedListBox)GetValue(OwnerProperty);
             set => SetValue(OwnerProperty, value);
         }
 
@@ -36,12 +36,12 @@ public KinoListBox Owner
         /// 标识 Owner 依赖属性。
         /// </summary>
         public static readonly DependencyProperty OwnerProperty =
-            DependencyProperty.Register(nameof(Owner), typeof(KinoListBox), typeof(KinoListBoxItem), new PropertyMetadata(default(KinoListBox), OnOwnerChanged));
+            DependencyProperty.Register(nameof(Owner), typeof(ExtendedListBox), typeof(KinoListBoxItem), new PropertyMetadata(default(ExtendedListBox), OnOwnerChanged));
 
         private static void OnOwnerChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var oldValue = (KinoListBox)args.OldValue;
-            var newValue = (KinoListBox)args.NewValue;
+            var oldValue = (ExtendedListBox)args.OldValue;
+            var newValue = (ExtendedListBox)args.NewValue;
             if (oldValue == newValue)
                 return;
 
@@ -54,22 +54,22 @@ private static void OnOwnerChanged(DependencyObject obj, DependencyPropertyChang
         /// </summary>
         /// <param name="oldValue">Owner 属性的旧值。</param>
         /// <param name="newValue">Owner 属性的新值。</param>
-        protected virtual void OnOwnerChanged(KinoListBox oldValue, KinoListBox newValue)
+        protected virtual void OnOwnerChanged(ExtendedListBox oldValue, ExtendedListBox newValue)
         {
             if (oldValue != null)
             {
-                var descriptor = DependencyPropertyDescriptor.FromProperty(ListBox.SelectionModeProperty, typeof(KinoListBox));
+                var descriptor = DependencyPropertyDescriptor.FromProperty(ListBox.SelectionModeProperty, typeof(ExtendedListBox));
                 descriptor.RemoveValueChanged(newValue, OnSelectionModeChanged);
 
-                descriptor = DependencyPropertyDescriptor.FromProperty(KinoListBox.IsMultiSelectCheckBoxEnabledProperty, typeof(KinoListBox));
+                descriptor = DependencyPropertyDescriptor.FromProperty(ExtendedListBox.IsMultiSelectCheckBoxEnabledProperty, typeof(ExtendedListBox));
                 descriptor.RemoveValueChanged(newValue, OnIsMultiSelectCheckBoxEnabledChanged);
             }
             if (newValue != null)
             {
-                var descriptor = DependencyPropertyDescriptor.FromProperty(ListBox.SelectionModeProperty, typeof(KinoListBox));
+                var descriptor = DependencyPropertyDescriptor.FromProperty(ListBox.SelectionModeProperty, typeof(ExtendedListBox));
                 descriptor.AddValueChanged(newValue, OnSelectionModeChanged);
 
-                descriptor = DependencyPropertyDescriptor.FromProperty(KinoListBox.IsMultiSelectCheckBoxEnabledProperty, typeof(KinoListBox));
+                descriptor = DependencyPropertyDescriptor.FromProperty(ExtendedListBox.IsMultiSelectCheckBoxEnabledProperty, typeof(ExtendedListBox));
                 descriptor.AddValueChanged(newValue, OnIsMultiSelectCheckBoxEnabledChanged);
             }
         }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/KinoProgressRing.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/ProgressRing.cs
similarity index 88%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/KinoProgressRing.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/ProgressRing.cs
index fa4708d..80f04a8 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/KinoProgressRing.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/ProgressRing.cs
@@ -12,21 +12,21 @@ namespace Kino.Toolkit.Wpf
 {
     [TemplateVisualState(GroupName = VisualStates.GroupActive, Name = VisualStates.StateActive)]
     [TemplateVisualState(GroupName = VisualStates.GroupActive, Name = VisualStates.StateInactive)]
-    public partial class KinoProgressRing : Control
+    public partial class ProgressRing : Control
     {
         // Using a DependencyProperty as the backing store for IsActive.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty IsActiveProperty =
-            DependencyProperty.Register("IsActive", typeof(bool), typeof(KinoProgressRing), new PropertyMetadata(false, new PropertyChangedCallback(IsActiveChanged)));
+            DependencyProperty.Register("IsActive", typeof(bool), typeof(ProgressRing), new PropertyMetadata(false, new PropertyChangedCallback(IsActiveChanged)));
 
         // Using a DependencyProperty as the backing store for TemplateSettings.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty TemplateSettingsProperty =
-            DependencyProperty.Register("TemplateSettings", typeof(TemplateSettingValues), typeof(KinoProgressRing), new PropertyMetadata(null));
+            DependencyProperty.Register("TemplateSettings", typeof(TemplateSettingValues), typeof(ProgressRing), new PropertyMetadata(null));
 
         private bool hasAppliedTemplate = false;
 
-        public KinoProgressRing()
+        public ProgressRing()
         {
-            DefaultStyleKey = typeof(KinoProgressRing);
+            DefaultStyleKey = typeof(ProgressRing);
             TemplateSettings = new TemplateSettingValues(60);
         }
 
@@ -65,7 +65,7 @@ protected override System.Windows.Size MeasureOverride(System.Windows.Size avail
 
         private static void IsActiveChanged(DependencyObject d, DependencyPropertyChangedEventArgs args)
         {
-            var pr = (KinoProgressRing)d;
+            var pr = (ProgressRing)d;
             var isActive = (bool)args.NewValue;
             pr.UpdateState(isActive);
         }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/KinoProgressRing.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/ProgressRing.xaml
similarity index 99%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/KinoProgressRing.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/ProgressRing.xaml
index d4bce7f..8c13b31 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/KinoProgressRing.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/ProgressRing.xaml
@@ -3,7 +3,7 @@
                     xmlns:local="clr-namespace:Kino.Toolkit.Wpf">
 
 
-    <Style TargetType="{x:Type local:KinoProgressRing}">
+    <Style TargetType="{x:Type local:ProgressRing}">
         <Setter Property="Background"
                 Value="Transparent" />
         <Setter Property="Foreground"
@@ -22,7 +22,7 @@
                 Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:KinoProgressRing}">
+                <ControlTemplate TargetType="{x:Type local:ProgressRing}">
                     <Border x:Name="ProgressRingRoot"
                             Background="{TemplateBinding Background}"
                             BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/TemplateSettingValues.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/TemplateSettingValues.cs
index 04788d8..99f93fc 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/TemplateSettingValues.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ProgressRing/TemplateSettingValues.cs
@@ -4,7 +4,7 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public partial class KinoProgressRing
+    public partial class ProgressRing
     {
         public class TemplateSettingValues : System.Windows.DependencyObject
         {
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
index 9d4f096..5b90c2c 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
@@ -45,9 +45,11 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.1.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
 
 [assembly: XmlnsPrefix("https://github.com/DinoChan/Kino.Toolkit.Wpf", "kino")]
 [assembly: XmlnsDefinition("https://github.com/DinoChan/Kino.Toolkit.Wpf", "Kino.Toolkit.Wpf")]
 [assembly: XmlnsDefinition("https://github.com/DinoChan/Kino.Toolkit.Wpf", "Kino.Toolkit.Wpf.Primitives")]
+[assembly: NeutralResourcesLanguage("en-US")]
+
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/KinoRadioButtonMenuItem.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/RadioButtonMenuItem.cs
similarity index 80%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/KinoRadioButtonMenuItem.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/RadioButtonMenuItem.cs
index 340992b..0ad4749 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/KinoRadioButtonMenuItem.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/RadioButtonMenuItem.cs
@@ -12,17 +12,17 @@ namespace Kino.Toolkit.Wpf
     /// <summary>
     /// 单选菜单项
     /// </summary>
-    public class KinoRadioButtonMenuItem : MenuItem
+    public class RadioButtonMenuItem : MenuItem
     {
         /// <summary>
         /// 标识 GroupName 依赖属性。
         /// </summary>
         public static readonly DependencyProperty GroupNameProperty =
-            DependencyProperty.Register(nameof(GroupName), typeof(string), typeof(KinoRadioButtonMenuItem), new PropertyMetadata(default(string)));
+            DependencyProperty.Register(nameof(GroupName), typeof(string), typeof(RadioButtonMenuItem), new PropertyMetadata(default(string)));
 
-        static KinoRadioButtonMenuItem()
+        static RadioButtonMenuItem()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(KinoRadioButtonMenuItem), new FrameworkPropertyMetadata(typeof(KinoRadioButtonMenuItem)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(RadioButtonMenuItem), new FrameworkPropertyMetadata(typeof(RadioButtonMenuItem)));
         }
 
         /// <summary>
@@ -44,7 +44,7 @@ protected override void OnClick()
         /// <inheritdoc />
         protected override DependencyObject GetContainerForItemOverride()
         {
-            return new KinoRadioButtonMenuItem();
+            return new RadioButtonMenuItem();
         }
 
         /// <inheritdoc />
@@ -54,7 +54,7 @@ protected override void OnChecked(RoutedEventArgs e)
 
             if (VisualTreeHelper.GetParent(this) is FrameworkElement parent)
             {
-                foreach (var menuItem in this.GetVisualSiblings().OfType<KinoRadioButtonMenuItem>())
+                foreach (var menuItem in this.GetVisualSiblings().OfType<RadioButtonMenuItem>())
                 {
                     if (menuItem.GroupName == GroupName && (menuItem.DataContext == parent.DataContext || menuItem.DataContext != DataContext))
                     {
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/KinoRadioButtonMenuItem.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/RadioButtonMenuItem.xaml
similarity index 99%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/KinoRadioButtonMenuItem.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/RadioButtonMenuItem.xaml
index 8f53c5a..f345a6e 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/KinoRadioButtonMenuItem.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/RadioButtonMenuItem/RadioButtonMenuItem.xaml
@@ -497,8 +497,8 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-    <Style x:Key="{x:Type local:KinoRadioButtonMenuItem}"
-           TargetType="{x:Type local:KinoRadioButtonMenuItem}">
+    <Style x:Key="{x:Type local:RadioButtonMenuItem}"
+           TargetType="{x:Type local:RadioButtonMenuItem}">
         <Setter Property="Control.HorizontalContentAlignment"
                 Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Control.VerticalContentAlignment"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/KinoResizer.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/Resizer.cs
similarity index 93%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/KinoResizer.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/Resizer.cs
index 0aef4c7..4303a5f 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/KinoResizer.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/Resizer.cs
@@ -11,25 +11,25 @@
 namespace Kino.Toolkit.Wpf.Primitives
 {
     [TemplatePart(Name = InnerContentControlName, Type = typeof(InnerContentControl))]
-    public class KinoResizer : ContentControl
+    public class Resizer : ContentControl
     {
         /// <summary>
         /// 标识 Animation 依赖属性。
         /// </summary>
         public static readonly DependencyProperty AnimationProperty =
-            DependencyProperty.Register(nameof(Animation), typeof(DoubleAnimation), typeof(KinoResizer), new PropertyMetadata(default(DoubleAnimation), OnAnimationChanged));
+            DependencyProperty.Register(nameof(Animation), typeof(DoubleAnimation), typeof(Resizer), new PropertyMetadata(default(DoubleAnimation), OnAnimationChanged));
 
         /// <summary>
         /// 标识 ContentHeight 依赖属性。
         /// </summary>
         public static readonly DependencyProperty ContentHeightProperty =
-            DependencyProperty.Register(nameof(ContentHeight), typeof(double), typeof(KinoResizer), new PropertyMetadata(default(double), OnContentHeightChanged));
+            DependencyProperty.Register(nameof(ContentHeight), typeof(double), typeof(Resizer), new PropertyMetadata(default(double), OnContentHeightChanged));
 
         /// <summary>
         /// 标识 ContentWidth 依赖属性。
         /// </summary>
         public static readonly DependencyProperty ContentWidthProperty =
-            DependencyProperty.Register(nameof(ContentWidth), typeof(double), typeof(KinoResizer), new PropertyMetadata(default(double), OnContentWidthChanged));
+            DependencyProperty.Register(nameof(ContentWidth), typeof(double), typeof(Resizer), new PropertyMetadata(default(double), OnContentWidthChanged));
 
         private const string InnerContentControlName = "InnerContentControl";
         private readonly DoubleAnimation _defaultHeightAnimation;
@@ -39,9 +39,9 @@ public class KinoResizer : ContentControl
         private bool _isResizing;
         private bool _isInnerContentMeasuring;
 
-        public KinoResizer()
+        public Resizer()
         {
-            DefaultStyleKey = typeof(KinoResizer);
+            DefaultStyleKey = typeof(Resizer);
 
             // SizeChanged += OnControlSizeChanged;
             _resizingStoryboard = new Storyboard
@@ -196,7 +196,7 @@ private static void OnAnimationChanged(DependencyObject obj, DependencyPropertyC
                 return;
             }
 
-            var target = obj as KinoResizer;
+            var target = obj as Resizer;
             target?.OnAnimationChanged(oldValue, newValue);
         }
 
@@ -207,7 +207,7 @@ private static void OnContentHeightChanged(DependencyObject obj, DependencyPrope
             if (oldValue == newValue)
                 return;
 
-            var target = obj as KinoResizer;
+            var target = obj as Resizer;
             target?.OnContentHeightChanged(oldValue, newValue);
         }
 
@@ -218,7 +218,7 @@ private static void OnContentWidthChanged(DependencyObject obj, DependencyProper
             if (oldValue == newValue)
                 return;
 
-            var target = obj as KinoResizer;
+            var target = obj as Resizer;
             target?.OnContentWidthChanged(oldValue, newValue);
         }
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/KinoResizer.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/Resizer.xaml
similarity index 93%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/KinoResizer.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/Resizer.xaml
index fc1da1b..ed5369c 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/KinoResizer.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Resizer/Resizer.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Kino.Toolkit.Wpf.Primitives">
-    <Style TargetType="local:KinoResizer">
+    <Style TargetType="local:Resizer">
         <Setter Property="HorizontalContentAlignment"
                 Value="Left" />
         <Setter Property="VerticalContentAlignment"
@@ -22,7 +22,7 @@
         </Setter>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoResizer">
+                <ControlTemplate TargetType="local:Resizer">
                     <local:InnerContentControl x:Name="InnerContentControl"
                                                Content="{TemplateBinding Content}"
                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ScrollViewer/KinoScrollViewer.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ScrollViewer/ExtendedScrollViewer.cs
similarity index 92%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ScrollViewer/KinoScrollViewer.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ScrollViewer/ExtendedScrollViewer.cs
index 4f5b519..e1c6a3b 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ScrollViewer/KinoScrollViewer.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/ScrollViewer/ExtendedScrollViewer.cs
@@ -11,7 +11,7 @@ namespace Kino.Toolkit.Wpf
     /// <summary>
     /// 主要解决嵌套ScrollViewer滚动劫持的问题。如果此ScrollViewer的VerticalScrollBarVisibility == ScrollBarVisibility.Disabled，不处理鼠标滚动事件。
     /// </summary>
-    public class KinoScrollViewer : ScrollViewer
+    public class ExtendedScrollViewer : ScrollViewer
     {
         protected override void OnMouseWheel(MouseWheelEventArgs e)
         {
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SelectionCheckBox/KinoSelectionCheckBox.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SelectionCheckBox/KinoSelectionCheckBox.cs
index 8c25e1c..79d053a 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SelectionCheckBox/KinoSelectionCheckBox.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SelectionCheckBox/KinoSelectionCheckBox.cs
@@ -9,11 +9,11 @@
 
 namespace Kino.Toolkit.Wpf.Primitives
 {
-    public class KinoSelectionCheckBox : CheckBox
+    public class SelectionCheckBox : CheckBox
     {
         // Using a DependencyProperty as the backing store for Selector.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty SelectorProperty =
-            DependencyProperty.Register("Selector", typeof(IMultiSelector), typeof(KinoSelectionCheckBox), new PropertyMetadata(null, OnSelectorPropertyChanged));
+            DependencyProperty.Register("Selector", typeof(IMultiSelector), typeof(SelectionCheckBox), new PropertyMetadata(null, OnSelectorPropertyChanged));
 
         private bool _isUpdatingIsChecked;
 
@@ -72,7 +72,7 @@ protected override void OnUnchecked(RoutedEventArgs e)
 
         private static void OnSelectorPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var target = d as KinoSelectionCheckBox;
+            var target = d as SelectionCheckBox;
             target.OnSelectorChanged(e.OldValue as IMultiSelector, e.NewValue as IMultiSelector);
         }
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/KinoSkeletonScreen.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/SkeletonScreen.cs
similarity index 85%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/KinoSkeletonScreen.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/SkeletonScreen.cs
index 475c9c8..f01ada9 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/KinoSkeletonScreen.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/SkeletonScreen.cs
@@ -10,21 +10,21 @@ namespace Kino.Toolkit.Wpf
 {
     [TemplateVisualState(GroupName = BusyStatesName, Name = BusyStateName)]
     [TemplateVisualState(GroupName = BusyStatesName, Name = NormalStateName)]
-    public class KinoSkeletonScreen : ContentControl
+    public class SkeletonScreen : ContentControl
     {
         /// <summary>
         /// 标识 IsBusy 依赖属性。
         /// </summary>
         public static readonly DependencyProperty IsBusyProperty =
-            DependencyProperty.Register(nameof(IsBusy), typeof(bool), typeof(KinoSkeletonScreen), new PropertyMetadata(true, OnIsBusyChanged));
+            DependencyProperty.Register(nameof(IsBusy), typeof(bool), typeof(SkeletonScreen), new PropertyMetadata(true, OnIsBusyChanged));
 
         private const string NormalStateName = "Normal";
         private const string BusyStateName = "Busy";
         private const string BusyStatesName = "BusyStates";
 
-        static KinoSkeletonScreen()
+        static SkeletonScreen()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(KinoSkeletonScreen), new FrameworkPropertyMetadata(typeof(KinoSkeletonScreen)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(SkeletonScreen), new FrameworkPropertyMetadata(typeof(SkeletonScreen)));
         }
 
         /// <summary>
@@ -59,7 +59,7 @@ private static void OnIsBusyChanged(DependencyObject obj, DependencyPropertyChan
             if (oldValue == newValue)
                 return;
 
-            var target = obj as KinoSkeletonScreen;
+            var target = obj as SkeletonScreen;
             target?.OnIsBusyChanged(oldValue, newValue);
         }
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/KinoSkeletonScreen.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/SkeletonScreen.xaml
similarity index 98%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/KinoSkeletonScreen.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/SkeletonScreen.xaml
index 1f445ac..e120ba3 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/KinoSkeletonScreen.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SkeletonScreen/SkeletonScreen.xaml
@@ -5,14 +5,14 @@
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     mc:Ignorable="d">
 
-    <Style TargetType="local:KinoSkeletonScreen">
+    <Style TargetType="local:SkeletonScreen">
         <Setter Property="VerticalContentAlignment"
                 Value="Stretch" />
         <Setter Property="HorizontalContentAlignment"
                 Value="Stretch" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:KinoSkeletonScreen}">
+                <ControlTemplate TargetType="{x:Type local:SkeletonScreen}">
                     <Grid Background="{TemplateBinding Background}">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="BusyStates">
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBox.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBox.cs
similarity index 68%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBox.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBox.cs
index d061167..d1e9028 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBox.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBox.cs
@@ -8,26 +8,26 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoSquareBox : ContentControl
+    public class SquareBox : ContentControl
     {
         /// <summary>
         /// 标识 TemplateSettings 依赖属性。
         /// </summary>
         public static readonly DependencyProperty TemplateSettingsProperty =
-            DependencyProperty.Register(nameof(TemplateSettings), typeof(KinoSquareBoxTemplateSettings), typeof(KinoSquareBox), new PropertyMetadata(null));
+            DependencyProperty.Register(nameof(TemplateSettings), typeof(SquareBoxTemplateSettings), typeof(SquareBox), new PropertyMetadata(null));
 
-        public KinoSquareBox()
+        public SquareBox()
         {
-            DefaultStyleKey = typeof(KinoSquareBox);
-            TemplateSettings = new KinoSquareBoxTemplateSettings(0);
+            DefaultStyleKey = typeof(SquareBox);
+            TemplateSettings = new SquareBoxTemplateSettings(0);
         }
 
         /// <summary>
         /// 获取或设置TemplateSettings的值
         /// </summary>
-        public KinoSquareBoxTemplateSettings TemplateSettings
+        public SquareBoxTemplateSettings TemplateSettings
         {
-            get => (KinoSquareBoxTemplateSettings)GetValue(TemplateSettingsProperty);
+            get => (SquareBoxTemplateSettings)GetValue(TemplateSettingsProperty);
             set => SetValue(TemplateSettingsProperty, value);
         }
 
@@ -41,7 +41,7 @@ protected override Size MeasureOverride(Size constraint)
                 height = double.IsNaN(Height) == false ? Height : constraint.Height;
             }
 
-            TemplateSettings = new KinoSquareBoxTemplateSettings(Math.Min(width, height));
+            TemplateSettings = new SquareBoxTemplateSettings(Math.Min(width, height));
             return base.MeasureOverride(constraint);
         }
          }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBox.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBox.xaml
similarity index 87%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBox.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBox.xaml
index 943ada4..11dedde 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBox.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBox.xaml
@@ -2,10 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Kino.Toolkit.Wpf">
     
-    <Style TargetType="local:KinoSquareBox">
+    <Style TargetType="local:SquareBox">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoSquareBox">
+                <ControlTemplate TargetType="local:SquareBox">
                     <ContentPresenter x:Name="ContentPresenter"
                                       Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.MaxSideLength}"
                                       Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.MaxSideLength}" />
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBoxTemplateSettings.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBoxTemplateSettings.cs
similarity index 72%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBoxTemplateSettings.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBoxTemplateSettings.cs
index 9803007..8b0c9e5 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/KinoSquareBoxTemplateSettings.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/SquareBox/SquareBoxTemplateSettings.cs
@@ -7,12 +7,12 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoSquareBoxTemplateSettings : System.Windows.DependencyObject
+    public class SquareBoxTemplateSettings : System.Windows.DependencyObject
     {
         public static readonly DependencyProperty MaxSideLengthProperty =
-              DependencyProperty.Register("MaxSideLength", typeof(double), typeof(KinoSquareBoxTemplateSettings), new PropertyMetadata(0D));
+              DependencyProperty.Register("MaxSideLength", typeof(double), typeof(SquareBoxTemplateSettings), new PropertyMetadata(0D));
 
-        public KinoSquareBoxTemplateSettings(double width)
+        public SquareBoxTemplateSettings(double width)
         {
             MaxSideLength = width;
         }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/KinoStateIndicator.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/StateIndicator.cs
similarity index 92%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/KinoStateIndicator.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/StateIndicator.cs
index 8cd1813..de64d17 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/KinoStateIndicator.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/StateIndicator.cs
@@ -15,13 +15,13 @@ namespace Kino.Toolkit.Wpf
     [TemplateVisualState(GroupName = ProgressStatesGroupName, Name = FaultedStateName)]
     [TemplateVisualState(GroupName = ProgressStatesGroupName, Name = NoneStateName)]
     [TemplateVisualState(GroupName = ProgressStatesGroupName, Name = OtherStateName)]
-    public class KinoStateIndicator : ContentControl
+    public class StateIndicator : ContentControl
     {
         /// <summary>
         /// 标识 State 依赖属性。
         /// </summary>
         public static readonly DependencyProperty StateProperty =
-            DependencyProperty.Register("State", typeof(ProgressState), typeof(KinoStateIndicator), new PropertyMetadata(ProgressState.None, OnStateChanged));
+            DependencyProperty.Register("State", typeof(ProgressState), typeof(StateIndicator), new PropertyMetadata(ProgressState.None, OnStateChanged));
 
         private const string ProgressStatesGroupName = "ProgressStates";
         private const string IdleStateName = "Idle";
@@ -31,9 +31,9 @@ public class KinoStateIndicator : ContentControl
         private const string NoneStateName = "None";
         private const string OtherStateName = "Other";
 
-        public KinoStateIndicator()
+        public StateIndicator()
         {
-            DefaultStyleKey = typeof(KinoStateIndicator);
+            DefaultStyleKey = typeof(StateIndicator);
         }
 
         /// <summary>
@@ -89,7 +89,7 @@ protected virtual void UpdateVisualStates(bool useTransitions)
 
         private static void OnStateChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var target = obj as KinoStateIndicator;
+            var target = obj as StateIndicator;
             ProgressState oldValue = (ProgressState)args.OldValue;
             ProgressState newValue = (ProgressState)args.NewValue;
             if (oldValue != newValue)
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/KinoStateIndicator.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/StateIndicator.xaml
similarity index 93%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/KinoStateIndicator.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/StateIndicator.xaml
index 0c3a508..c6f6ba0 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/KinoStateIndicator.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/StateIndicator/StateIndicator.xaml
@@ -14,16 +14,16 @@
     </DataTemplate>
 
     <DataTemplate x:Key="BusyContentTemplate">
-        <local:KinoSquareBox>
-            <local:KinoProgressRing IsActive="True"
+        <local:SquareBox>
+            <local:ProgressRing IsActive="True"
                                     MinHeight="10"
                                     MinWidth="10" />
-        </local:KinoSquareBox>
+        </local:SquareBox>
     </DataTemplate>
 
 
     <DataTemplate x:Key="CompletedContentTemplate">
-        <local:KinoSquareBox>
+        <local:SquareBox>
             <Ellipse Fill="LightSeaGreen">
                 <Ellipse.Effect>
                     <DropShadowEffect ShadowDepth="0"
@@ -32,11 +32,11 @@
                                       Color="Black" />
                 </Ellipse.Effect>
             </Ellipse>
-        </local:KinoSquareBox>
+        </local:SquareBox>
     </DataTemplate>
 
     <DataTemplate x:Key="FaultedContentTemplate">
-        <local:KinoSquareBox>
+        <local:SquareBox>
             <Ellipse Fill="MediumVioletRed">
                 <Ellipse.Effect>
                     <DropShadowEffect ShadowDepth="0"
@@ -45,10 +45,10 @@
                                       Color="Black" />
                 </Ellipse.Effect>
             </Ellipse>
-        </local:KinoSquareBox>
+        </local:SquareBox>
     </DataTemplate>
 
-    <Style TargetType="{x:Type local:KinoStateIndicator}">
+    <Style TargetType="{x:Type local:StateIndicator}">
         <Setter Property="IsTabStop"
                 Value="False" />
         <Setter Property="Height"
@@ -61,7 +61,7 @@
                 Value="Stretch" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:KinoStateIndicator}">
+                <ControlTemplate TargetType="{x:Type local:StateIndicator}">
                     <Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="ProgressStates">
@@ -121,7 +121,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <local:KinoTransitioningContentControl x:Name="Content"
+                        <local:TransitioningContentControl x:Name="Content"
                                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                                                Content="{TemplateBinding Content}" />
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Themes/Generic.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Themes/Generic.xaml
index 6347450..4b60f68 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Themes/Generic.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Themes/Generic.xaml
@@ -3,23 +3,23 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:Kino.Toolkit.Wpf">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Button/KinoButton.xaml"/>
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/ProgressRing/KinoProgressRing.xaml"/>
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/TransitioningContentControl/KinoTransitioningContentControl.xaml"/>
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/StateIndicator/KinoStateIndicator.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Window/KinoWindow.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Resizer/KinoResizer.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/SquareBox/KinoSquareBox.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/FunctionBar/KinoFunctionBar.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Form/KinoForm.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/RadioButtonMenuItem/KinoRadioButtonMenuItem.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/DataPager/KinoDataPager.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/ListBox/KinoListBox.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/DataGrid/KinoDataGrid.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Validation/KinoValidationContent.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/HeaderedContentControl/KinoHeaderedContentControl.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Layout/KinoPageTitle.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/SkeletonScreen/KinoSkeletonScreen.xaml" />
-        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Expander/KinoExpander.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Button/Button.xaml"/>
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/ProgressRing/ProgressRing.xaml"/>
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/TransitioningContentControl/TransitioningContentControl.xaml"/>
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/StateIndicator/StateIndicator.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Window/Window.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Resizer/Resizer.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/SquareBox/SquareBox.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/FunctionBar/FunctionBar.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Form/Form.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/RadioButtonMenuItem/RadioButtonMenuItem.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/DataPager/DataPager.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/ListBox/ListBox.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/DataGrid/DataGrid.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Validation/ValidationContent.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/HeaderedContentControl/HeaderedContentControl.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Layout/PageTitle.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/SkeletonScreen/SkeletonScreen.xaml" />
+        <ResourceDictionary Source="/Kino.Toolkit.Wpf;component/Expander/Expander.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.VisualStates.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.VisualStates.cs
similarity index 88%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.VisualStates.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.VisualStates.cs
index 219b619..98026a1 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.VisualStates.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.VisualStates.cs
@@ -6,7 +6,7 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public partial class KinoTransitioningContentControl
+    public partial class TransitioningContentControl
     {
         public static string LeftTransitionState => "LeftTransition";
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.cs
similarity index 92%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.cs
index 6444066..a5cbf71 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.cs
@@ -28,7 +28,7 @@ namespace Kino.Toolkit.Wpf
     [TemplateVisualState(GroupName = PresentationGroup, Name = DefaultTransitionState)]
     [TemplatePart(Name = PreviousContentPresentationSitePartName, Type = typeof(ContentControl))]
     [TemplatePart(Name = CurrentContentPresentationSitePartName, Type = typeof(ContentControl))]
-    public partial class KinoTransitioningContentControl : ContentControl
+    public partial class TransitioningContentControl : ContentControl
     {
         #region Visual state names
 
@@ -112,17 +112,17 @@ private set
             DependencyProperty.Register(
                 "IsTransitioning",
                 typeof(bool),
-                typeof(KinoTransitioningContentControl),
+                typeof(TransitioningContentControl),
                 new PropertyMetadata(OnIsTransitioningPropertyChanged));
 
         /// <summary>
         /// IsTransitioningProperty property changed handler.
         /// </summary>
-        /// <param name="d">KinoTransitioningContentControl that changed its IsTransitioning.</param>
+        /// <param name="d">TransitioningContentControl that changed its IsTransitioning.</param>
         /// <param name="e">Event arguments.</param>
         private static void OnIsTransitioningPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoTransitioningContentControl source = (KinoTransitioningContentControl)d;
+            TransitioningContentControl source = (TransitioningContentControl)d;
 
             if (!source._allowIsTransitioningWrite)
             {
@@ -183,17 +183,17 @@ public string Transition
             DependencyProperty.Register(
                 "Transition",
                 typeof(string),
-                typeof(KinoTransitioningContentControl),
+                typeof(TransitioningContentControl),
                 new PropertyMetadata(DefaultTransitionState, OnTransitionPropertyChanged));
 
         /// <summary>
         /// TransitionProperty property changed handler.
         /// </summary>
-        /// <param name="d">KinoTransitioningContentControl that changed its Transition.</param>
+        /// <param name="d">TransitioningContentControl that changed its Transition.</param>
         /// <param name="e">Event arguments.</param>
         private static void OnTransitionPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            KinoTransitioningContentControl source = (KinoTransitioningContentControl)d;
+            TransitioningContentControl source = (TransitioningContentControl)d;
             string oldTransition = e.OldValue as string;
             string newTransition = e.NewValue as string;
 
@@ -249,17 +249,17 @@ public bool RestartTransitionOnContentChange
             DependencyProperty.Register(
                 "RestartTransitionOnContentChange",
                 typeof(bool),
-                typeof(KinoTransitioningContentControl),
+                typeof(TransitioningContentControl),
                 new PropertyMetadata(false, OnRestartTransitionOnContentChangePropertyChanged));
 
         /// <summary>
         /// RestartTransitionOnContentChangeProperty property changed handler.
         /// </summary>
-        /// <param name="d">KinoTransitioningContentControl that changed its RestartTransitionOnContentChange.</param>
+        /// <param name="d">TransitioningContentControl that changed its RestartTransitionOnContentChange.</param>
         /// <param name="e">Event arguments.</param>
         private static void OnRestartTransitionOnContentChangePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            ((KinoTransitioningContentControl)d).OnRestartTransitionOnContentChangeChanged((bool)e.OldValue, (bool)e.NewValue);
+            ((TransitioningContentControl)d).OnRestartTransitionOnContentChangeChanged((bool)e.OldValue, (bool)e.NewValue);
         }
 
         /// <summary>
@@ -281,15 +281,15 @@ protected virtual void OnRestartTransitionOnContentChangeChanged(bool oldValue,
         #endregion Events
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="KinoTransitioningContentControl"/> class.
+        /// Initializes a new instance of the <see cref="TransitioningContentControl"/> class.
         /// </summary>
-        public KinoTransitioningContentControl()
+        public TransitioningContentControl()
         {
-            DefaultStyleKey = typeof(KinoTransitioningContentControl);
+            DefaultStyleKey = typeof(TransitioningContentControl);
         }
 
         /// <summary>
-        /// Builds the visual tree for the KinoTransitioningContentControl control
+        /// Builds the visual tree for the TransitioningContentControl control
         /// when a new template is applied.
         /// </summary>
         public override void OnApplyTemplate()
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.xaml
similarity index 99%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.xaml
index 4106a03..081606e 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/KinoTransitioningContentControl.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/TransitioningContentControl/TransitioningContentControl.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Kino.Toolkit.Wpf">
 
-    <Style TargetType="local:KinoTransitioningContentControl">
+    <Style TargetType="local:TransitioningContentControl">
         <Setter Property="IsTabStop"
                 Value="False" />
         <Setter Property="Focusable"
@@ -15,7 +15,7 @@
                 Value="DefaultTransition" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:KinoTransitioningContentControl">
+                <ControlTemplate TargetType="local:TransitioningContentControl">
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/KinoValidationContent.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/ValidationContent.cs
similarity index 63%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/KinoValidationContent.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/ValidationContent.cs
index 2df23dd..e159a47 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/KinoValidationContent.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/ValidationContent.cs
@@ -9,11 +9,11 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoValidationContent : Control
+    public class ValidationContent : Control
     {
-        public KinoValidationContent()
+        public ValidationContent()
         {
-            DefaultStyleKey = typeof(KinoValidationContent);
+            DefaultStyleKey = typeof(ValidationContent);
         }
     }
 }
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/KinoValidationContent.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/ValidationContent.xaml
similarity index 99%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/KinoValidationContent.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/ValidationContent.xaml
index f64115b..d02c291 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/KinoValidationContent.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Validation/ValidationContent.xaml
@@ -74,7 +74,7 @@
         </Border>
     </ControlTemplate>
 
-    <Style TargetType="local:KinoValidationContent">
+    <Style TargetType="local:ValidationContent">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoRibbonWindow.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/ExtendedRibbonWindow.cs
similarity index 83%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoRibbonWindow.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/ExtendedRibbonWindow.cs
index fe89de3..e5c627e 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoRibbonWindow.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/ExtendedRibbonWindow.cs
@@ -13,24 +13,24 @@
 namespace Kino.Toolkit.Wpf
 {
     [StyleTypedProperty(Property = nameof(RibbonStyle), StyleTargetType = typeof(Ribbon))]
-    public class KinoRibbonWindow : RibbonWindow
+    public class ExtendedRibbonWindow : RibbonWindow
     {
         /// <summary>
         /// 标识 RibbonStyle 依赖属性。
         /// </summary>
         public static readonly DependencyProperty RibbonStyleProperty =
-            DependencyProperty.Register(nameof(RibbonStyle), typeof(Style), typeof(KinoRibbonWindow), new PropertyMetadata(default(Style), OnRibbonStyleChanged));
+            DependencyProperty.Register(nameof(RibbonStyle), typeof(Style), typeof(ExtendedRibbonWindow), new PropertyMetadata(default(Style), OnRibbonStyleChanged));
 
         /// <summary>
         /// 标识 FunctionBar 依赖属性。
         /// </summary>
         public static readonly DependencyProperty FunctionBarProperty =
-            DependencyProperty.Register(nameof(FunctionBar), typeof(KinoWindowFunctionBar), typeof(KinoRibbonWindow), new PropertyMetadata(default(KinoWindowFunctionBar), OnFunctionBarChanged));
+            DependencyProperty.Register(nameof(FunctionBar), typeof(WindowFunctionBar), typeof(ExtendedRibbonWindow), new PropertyMetadata(default(WindowFunctionBar), OnFunctionBarChanged));
 
 #pragma warning disable IDE1006 // 命名样式
         private static readonly DependencyPropertyKey IsNonClientActivePropertyKey =
 #pragma warning restore IDE1006 // 命名样式
-            DependencyProperty.RegisterReadOnly("IsNonClientActive", typeof(bool), typeof(KinoRibbonWindow), new FrameworkPropertyMetadata(false));
+            DependencyProperty.RegisterReadOnly("IsNonClientActive", typeof(bool), typeof(ExtendedRibbonWindow), new FrameworkPropertyMetadata(false));
 
 #pragma warning disable SA1202 // Elements must be ordered by access
         public static readonly DependencyProperty IsNonClientActiveProperty = IsNonClientActivePropertyKey.DependencyProperty;
@@ -38,9 +38,9 @@ public class KinoRibbonWindow : RibbonWindow
 
         private readonly IntPtr _trueValue = new IntPtr(1);
 
-        public KinoRibbonWindow()
+        public ExtendedRibbonWindow()
         {
-            DefaultStyleKey = typeof(KinoRibbonWindow);
+            DefaultStyleKey = typeof(ExtendedRibbonWindow);
         }
 
         /// <summary>
@@ -55,9 +55,9 @@ public Style RibbonStyle
         /// <summary>
         /// 获取或设置FunctionBar的值
         /// </summary>
-        public KinoWindowFunctionBar FunctionBar
+        public WindowFunctionBar FunctionBar
         {
-            get => (KinoWindowFunctionBar)GetValue(FunctionBarProperty);
+            get => (WindowFunctionBar)GetValue(FunctionBarProperty);
             set => SetValue(FunctionBarProperty, value);
         }
 
@@ -88,7 +88,7 @@ protected virtual void OnRibbonStyleChanged(Style oldValue, Style newValue)
         /// </summary>
         /// <param name="oldValue">FunctionBar 属性的旧值。</param>
         /// <param name="newValue">FunctionBar 属性的新值。</param>
-        protected virtual void OnFunctionBarChanged(KinoWindowFunctionBar oldValue, KinoWindowFunctionBar newValue)
+        protected virtual void OnFunctionBarChanged(WindowFunctionBar oldValue, WindowFunctionBar newValue)
         {
         }
 
@@ -125,20 +125,20 @@ private static void OnRibbonStyleChanged(DependencyObject obj, DependencyPropert
                 return;
             }
 
-            var target = obj as KinoRibbonWindow;
+            var target = obj as ExtendedRibbonWindow;
             target?.OnRibbonStyleChanged(oldValue, newValue);
         }
 
         private static void OnFunctionBarChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var oldValue = (KinoWindowFunctionBar)args.OldValue;
-            var newValue = (KinoWindowFunctionBar)args.NewValue;
+            var oldValue = (WindowFunctionBar)args.OldValue;
+            var newValue = (WindowFunctionBar)args.NewValue;
             if (oldValue == newValue)
             {
                 return;
             }
 
-            var target = obj as KinoRibbonWindow;
+            var target = obj as ExtendedRibbonWindow;
             target?.OnFunctionBarChanged(oldValue, newValue);
         }
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoWindow.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/ExtendedWindow.cs
similarity index 80%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoWindow.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/ExtendedWindow.cs
index e491c1c..471799b 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoWindow.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/ExtendedWindow.cs
@@ -9,16 +9,16 @@
 
 namespace Kino.Toolkit.Wpf
 {
-    public class KinoWindow : Window
+    public class ExtendedWindow : Window
     {
         /// <summary>
         /// 标识 FunctionBar 依赖属性。
         /// </summary>
         public static readonly DependencyProperty FunctionBarProperty =
-            DependencyProperty.Register(nameof(FunctionBar), typeof(KinoWindowFunctionBar), typeof(KinoWindow), new PropertyMetadata(default(KinoWindowFunctionBar), OnFunctionBarChanged));
+            DependencyProperty.Register(nameof(FunctionBar), typeof(WindowFunctionBar), typeof(ExtendedWindow), new PropertyMetadata(default(WindowFunctionBar), OnFunctionBarChanged));
 
         private static readonly DependencyPropertyKey IsNonClientActivePropertyKey =
-         DependencyProperty.RegisterReadOnly("IsNonClientActive", typeof(bool), typeof(KinoWindow), new FrameworkPropertyMetadata(false));
+         DependencyProperty.RegisterReadOnly("IsNonClientActive", typeof(bool), typeof(ExtendedWindow), new FrameworkPropertyMetadata(false));
 
 #pragma warning disable SA1202 // Elements must be ordered by access
         public static readonly DependencyProperty IsNonClientActiveProperty = IsNonClientActivePropertyKey.DependencyProperty;
@@ -26,17 +26,17 @@ public class KinoWindow : Window
 
         private readonly IntPtr _trueValue = new IntPtr(1);
 
-        public KinoWindow()
+        public ExtendedWindow()
         {
-            DefaultStyleKey = typeof(KinoWindow);
+            DefaultStyleKey = typeof(ExtendedWindow);
         }
 
         /// <summary>
         /// 获取或设置FunctionBar的值
         /// </summary>
-        public KinoWindowFunctionBar FunctionBar
+        public WindowFunctionBar FunctionBar
         {
-            get => (KinoWindowFunctionBar)GetValue(FunctionBarProperty);
+            get => (WindowFunctionBar)GetValue(FunctionBarProperty);
             set => SetValue(FunctionBarProperty, value);
         }
 
@@ -65,7 +65,7 @@ protected override void OnSourceInitialized(EventArgs e)
         /// </summary>
         /// <param name="oldValue">FunctionBar 属性的旧值。</param>
         /// <param name="newValue">FunctionBar 属性的新值。</param>
-        protected virtual void OnFunctionBarChanged(KinoWindowFunctionBar oldValue, KinoWindowFunctionBar newValue)
+        protected virtual void OnFunctionBarChanged(WindowFunctionBar oldValue, WindowFunctionBar newValue)
         {
         }
 
@@ -83,14 +83,14 @@ protected override void OnDeactivated(EventArgs e)
 
         private static void OnFunctionBarChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
         {
-            var oldValue = (KinoWindowFunctionBar)args.OldValue;
-            var newValue = (KinoWindowFunctionBar)args.NewValue;
+            var oldValue = (WindowFunctionBar)args.OldValue;
+            var newValue = (WindowFunctionBar)args.NewValue;
             if (oldValue == newValue)
             {
                 return;
             }
 
-            var target = obj as KinoWindow;
+            var target = obj as ExtendedWindow;
             target?.OnFunctionBarChanged(oldValue, newValue);
         }
 
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoWindow.xaml b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/Window.xaml
similarity index 99%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoWindow.xaml
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/Window.xaml
index 2d052e0..2007d7f 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/KinoWindow.xaml
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Window/Window.xaml
@@ -163,7 +163,7 @@
 
 
 
-    <Style TargetType="{x:Type local:KinoWindow}">
+    <Style TargetType="{x:Type local:ExtendedWindow}">
 
         <Setter Property="Foreground"
                 Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
@@ -199,7 +199,7 @@
                 Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:KinoWindow}">
+                <ControlTemplate TargetType="{x:Type local:ExtendedWindow}">
                     <Border BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             x:Name="WindowBorder">
@@ -351,7 +351,7 @@
 
 
 
-    <Style TargetType="{x:Type local:KinoRibbonWindow}">
+    <Style TargetType="{x:Type local:ExtendedRibbonWindow}">
         <Setter Property="Foreground"
                 Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
         <Setter Property="Background"
@@ -389,7 +389,7 @@
 
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:KinoRibbonWindow}">
+                <ControlTemplate TargetType="{x:Type local:ExtendedRibbonWindow}">
                     <Border BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             x:Name="WindowBorder">

From 727cf33b55af8d1440131f37c885bd2522312b22 Mon Sep 17 00:00:00 2001
From: Jinhua Chen <Jinhua.Chen@omec-instruments.com>
Date: Mon, 6 May 2019 14:49:13 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=A7=BB=E5=8A=A8SystemDropShadowChrome?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{Common => Chromes}/SystemDropShadowChrome.cs               | 0
 Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj       | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/{Common => Chromes}/SystemDropShadowChrome.cs (100%)

diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Common/SystemDropShadowChrome.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Chromes/SystemDropShadowChrome.cs
similarity index 100%
rename from Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Common/SystemDropShadowChrome.cs
rename to Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Chromes/SystemDropShadowChrome.cs
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj
index 8110312..316e7d6 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.csproj
@@ -67,7 +67,7 @@
     <Compile Include="Chromes\DataGridHeaderBorder.cs" />
     <Compile Include="Common\DpiHelper.cs" />
     <Compile Include="Common\FocusService.cs" />
-    <Compile Include="Common\SystemDropShadowChrome.cs" />
+    <Compile Include="Chromes\SystemDropShadowChrome.cs" />
     <Compile Include="Common\Utility.cs" />
     <Compile Include="Common\WindowNotifications.cs" />
     <Compile Include="Expander\ExpandableContentControl.cs" />

From c058d2caf1befc1aca3c14b71493915df7229d11 Mon Sep 17 00:00:00 2001
From: Dino Chan <dino.chan@live.com>
Date: Mon, 6 May 2019 21:42:26 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9nuget=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
index 12f4421..4136850 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
     <title>Kino.Toolkit.Wpf</title>
     <authors>dino.c</authors>
     <owners>dino.c</owners>
@@ -11,7 +11,7 @@
     <iconUrl>https://github.com/DinoChan/Kino.Toolkit.Wpf/blob/master/Logo.png?raw=true</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A set of wpf toolkit.</description>
-    <releaseNotes>1.3.1</releaseNotes>
+    <releaseNotes>1.4.0</releaseNotes>
     <copyright>Copyright 2019 dino.c</copyright>
     <tags>WPF Control Toolkit Xaml</tags>
     <dependencies>

From 6622c1876d7ae75fa58813a2cff04286cc0f8d7a Mon Sep 17 00:00:00 2001
From: Dino Chan <dino.chan@live.com>
Date: Thu, 9 May 2019 21:14:19 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec   | 4 ++--
 .../Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
index 4136850..54797a0 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>1.4.0</version>
+    <version>1.4.3</version>
     <title>Kino.Toolkit.Wpf</title>
     <authors>dino.c</authors>
     <owners>dino.c</owners>
@@ -11,7 +11,7 @@
     <iconUrl>https://github.com/DinoChan/Kino.Toolkit.Wpf/blob/master/Logo.png?raw=true</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A set of wpf toolkit.</description>
-    <releaseNotes>1.4.0</releaseNotes>
+    <releaseNotes>1.4.3</releaseNotes>
     <copyright>Copyright 2019 dino.c</copyright>
     <tags>WPF Control Toolkit Xaml</tags>
     <dependencies>
diff --git a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
index 5b90c2c..74b525a 100644
--- a/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
+++ b/Kino.Toolkit.Wpf/Kino.Toolkit.Wpf/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Kino.Toolkit.Wpf")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -45,8 +45,8 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.3.0")]
+[assembly: AssemblyFileVersion("1.4.3.0")]
 
 [assembly: XmlnsPrefix("https://github.com/DinoChan/Kino.Toolkit.Wpf", "kino")]
 [assembly: XmlnsDefinition("https://github.com/DinoChan/Kino.Toolkit.Wpf", "Kino.Toolkit.Wpf")]