diff --git a/HandyControl/Controls/Other/CircleProgressBar.cs b/HandyControl/Controls/ProgressBar/CircleProgressBar.cs
similarity index 100%
rename from HandyControl/Controls/Other/CircleProgressBar.cs
rename to HandyControl/Controls/ProgressBar/CircleProgressBar.cs
diff --git a/HandyControl/Controls/ProgressBar/WaveProgressBar.cs b/HandyControl/Controls/ProgressBar/WaveProgressBar.cs
new file mode 100644
index 00000000..5f07b0be
--- /dev/null
+++ b/HandyControl/Controls/ProgressBar/WaveProgressBar.cs
@@ -0,0 +1,54 @@
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    public class WaveProgressBar : RangeBase
+    {
+        static WaveProgressBar()
+        {
+            FocusableProperty.OverrideMetadata(typeof(CircleProgressBar),
+                new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+            MaximumProperty.OverrideMetadata(typeof(CircleProgressBar),
+                new FrameworkPropertyMetadata(ValueBoxes.Double100Box));
+        }
+
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+            "Text", typeof(string), typeof(WaveProgressBar), new PropertyMetadata(default(string)));
+
+        public string Text
+        {
+            get => (string)GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
+        }
+
+        public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
+            "ShowText", typeof(bool), typeof(WaveProgressBar), new PropertyMetadata(ValueBoxes.TrueBox));
+
+        public bool ShowText
+        {
+            get => (bool)GetValue(ShowTextProperty);
+            set => SetValue(ShowTextProperty, value);
+        }
+
+        public static readonly DependencyProperty WaveBrushProperty = DependencyProperty.Register(
+            "WaveBrush", typeof(Brush), typeof(WaveProgressBar), new PropertyMetadata(default(Brush)));
+
+        public Brush WaveBrush
+        {
+            get => (Brush)GetValue(WaveBrushProperty);
+            set => SetValue(WaveBrushProperty, value);
+        }
+
+        public static readonly DependencyProperty WaveDiameterProperty = DependencyProperty.Register(
+            "WaveDiameter", typeof(double), typeof(WaveProgressBar), new PropertyMetadata(default(double)));
+
+        public double WaveDiameter
+        {
+            get => (double)GetValue(WaveDiameterProperty);
+            set => SetValue(WaveDiameterProperty, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 6e20ed86..a01d6620 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -117,11 +117,12 @@
     <Compile Include="Controls\Other\GotoTop.cs" />
     <Compile Include="Controls\Other\Gravatar.cs" />
     <Compile Include="Controls\Panel\SimplePanel.cs" />
+    <Compile Include="Controls\ProgressBar\WaveProgressBar.cs" />
     <Compile Include="Controls\Transfer\Transfer.cs" />
     <Compile Include="Controls\Transfer\TransferGroup.cs" />
     <Compile Include="Controls\Transfer\TransferItem.cs" />
     <Compile Include="Controls\Panel\CirclePanel.cs" />
-    <Compile Include="Controls\Other\CircleProgressBar.cs" />
+    <Compile Include="Controls\ProgressBar\CircleProgressBar.cs" />
     <Compile Include="Controls\Other\RadioGroup.cs" />
     <Compile Include="Controls\Other\Shield.cs" />
     <Compile Include="Controls\Panel\WaterfallPanel.cs" />
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index 529716b5..44fa6c82 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -36,7 +36,7 @@
 	
         public static readonly string PreviewSliderDemoCtl = nameof(PreviewSliderDemoCtl);
 	
-        public static readonly string CircleProgressBarDemoCtl = nameof(CircleProgressBarDemoCtl);
+        public static readonly string ProgressBarDemoCtl = nameof(ProgressBarDemoCtl);
 	
         public static readonly string TextBoxDemoCtl = nameof(TextBoxDemoCtl);
 	
@@ -94,23 +94,23 @@
 
         public static readonly string ExpanderDemoCtl = nameof(ExpanderDemoCtl);
 
-        public static readonly string ProgressBarDemoCtl = nameof(ProgressBarDemoCtl);
+        public static readonly string NativeProgressBarDemoCtl = nameof(NativeProgressBarDemoCtl);
 
         public static readonly string TabControlDemoCtl = nameof(TabControlDemoCtl);
 
         public static readonly string CalendarDemoCtl = nameof(CalendarDemoCtl);
 
-        public static readonly string NaiveDatePickerDemoCtl = nameof(NaiveDatePickerDemoCtl);
+        public static readonly string NativeDatePickerDemoCtl = nameof(NativeDatePickerDemoCtl);
 
-        public static readonly string NaiveTextBoxDemoCtl = nameof(NaiveTextBoxDemoCtl);
+        public static readonly string NativeTextBoxDemoCtl = nameof(NativeTextBoxDemoCtl);
 
         public static readonly string TextBlockDemoCtl = nameof(TextBlockDemoCtl);
 
-        public static readonly string NaiveComboBoxDemoCtl = nameof(NaiveComboBoxDemoCtl);
+        public static readonly string NativeComboBoxDemoCtl = nameof(NativeComboBoxDemoCtl);
 
-        public static readonly string NaivePasswordBoxDemoCtl = nameof(NaivePasswordBoxDemoCtl);
+        public static readonly string NativePasswordBoxDemoCtl = nameof(NativePasswordBoxDemoCtl);
 
-        public static readonly string NaiveTabControlDemoCtl = nameof(NaiveTabControlDemoCtl);
+        public static readonly string NativeTabControlDemoCtl = nameof(NativeTabControlDemoCtl);
 
         public static readonly string DataGridDemoCtl = nameof(DataGridDemoCtl);
 
@@ -126,7 +126,7 @@
 
         public static readonly string RadioButtonDemoCtl = nameof(RadioButtonDemoCtl);
 
-        public static readonly string NaiveScrollViewerDemoCtl = nameof(NaiveScrollViewerDemoCtl);
+        public static readonly string NativeScrollViewerDemoCtl = nameof(NativeScrollViewerDemoCtl);
 
         public static readonly string BrushDemoCtl = nameof(BrushDemoCtl);
 
diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt
index 3af06d18..549a85ed 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -21,7 +21,7 @@ var controlList = new List<string>
 	"WindowDemoCtl",
 	"ScrollViewerDemoCtl",
 	"PreviewSliderDemoCtl",
-	"CircleProgressBarDemoCtl",
+	"ProgressBarDemoCtl",
 	"TextBoxDemoCtl",
 	"ComboBoxDemoCtl",
 	"PasswordBoxDemoCtl",
@@ -53,15 +53,15 @@ var styleList = new List<string>
 	"ButtonDemoCtl",
 	"ToggleButtonDemoCtl",
 	"ExpanderDemoCtl",
-	"ProgressBarDemoCtl",
+	"NativeProgressBarDemoCtl",
 	"TabControlDemoCtl",
 	"CalendarDemoCtl",
-	"NaiveDatePickerDemoCtl",
-	"NaiveTextBoxDemoCtl",
+	"NativeDatePickerDemoCtl",
+	"NativeTextBoxDemoCtl",
 	"TextBlockDemoCtl",
-	"NaiveComboBoxDemoCtl",
-	"NaivePasswordBoxDemoCtl",
-	"NaiveTabControlDemoCtl",
+	"NativeComboBoxDemoCtl",
+	"NativePasswordBoxDemoCtl",
+	"NativeTabControlDemoCtl",
 	"DataGridDemoCtl",
 	"CheckBoxDemoCtl",
 	"ListBoxDemoCtl",
@@ -69,7 +69,7 @@ var styleList = new List<string>
 	"TreeViewDemoCtl",
 	"BorderDemoCtl",
 	"RadioButtonDemoCtl",
-	"NaiveScrollViewerDemoCtl",
+	"NativeScrollViewerDemoCtl",
 	"BrushDemoCtl",
 	"SliderDemoCtl",
 	"GroupBoxDemoCtl",
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 464bacdc..58544d2e 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -148,8 +148,8 @@
     <Compile Include="UserControl\Controls\CirclePanelDemoCtl.xaml.cs">
       <DependentUpon>CirclePanelDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\Controls\CircleProgressBarDemoCtl.xaml.cs">
-      <DependentUpon>CircleProgressBarDemoCtl.xaml</DependentUpon>
+    <Compile Include="UserControl\Controls\ProgressBarDemoCtl.xaml.cs">
+      <DependentUpon>ProgressBarDemoCtl.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControl\Controls\ClockDemoCtl.xaml.cs">
       <DependentUpon>ClockDemoCtl.xaml</DependentUpon>
@@ -280,14 +280,14 @@
     <Compile Include="UserControl\Styles\ListViewDemoCtl.xaml.cs">
       <DependentUpon>ListViewDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\Styles\NaiveComboBoxDemoCtl.xaml.cs">
-      <DependentUpon>NaiveComboBoxDemoCtl.xaml</DependentUpon>
+    <Compile Include="UserControl\Styles\NativeComboBoxDemoCtl.xaml.cs">
+      <DependentUpon>NativeComboBoxDemoCtl.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControl\Styles\DataGridDemoCtl.xaml.cs">
       <DependentUpon>DataGridDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\Styles\NaiveDatePickerDemoCtl.xaml.cs">
-      <DependentUpon>NaiveDatePickerDemoCtl.xaml</DependentUpon>
+    <Compile Include="UserControl\Styles\NativeDatePickerDemoCtl.xaml.cs">
+      <DependentUpon>NativeDatePickerDemoCtl.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControl\Styles\ExpanderDemoCtl.xaml.cs">
       <DependentUpon>ExpanderDemoCtl.xaml</DependentUpon>
@@ -310,17 +310,17 @@
     <Compile Include="UserControl\Styles\MenuDemoCtl.xaml.cs">
       <DependentUpon>MenuDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\Styles\NaiveScrollViewerDemoCtl.xaml.cs">
-      <DependentUpon>NaiveScrollViewerDemoCtl.xaml</DependentUpon>
+    <Compile Include="UserControl\Styles\NativeScrollViewerDemoCtl.xaml.cs">
+      <DependentUpon>NativeScrollViewerDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\Styles\NaiveTabControlDemoCtl.xaml.cs">
-      <DependentUpon>NaiveTabControlDemoCtl.xaml</DependentUpon>
+    <Compile Include="UserControl\Styles\NativeTabControlDemoCtl.xaml.cs">
+      <DependentUpon>NativeTabControlDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\Styles\NaivePasswordBoxDemoCtl.xaml.cs">
-      <DependentUpon>NaivePasswordBoxDemoCtl.xaml</DependentUpon>
+    <Compile Include="UserControl\Styles\NativePasswordBoxDemoCtl.xaml.cs">
+      <DependentUpon>NativePasswordBoxDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\Styles\ProgressBarDemoCtl.xaml.cs">
-      <DependentUpon>ProgressBarDemoCtl.xaml</DependentUpon>
+    <Compile Include="UserControl\Styles\NativeProgressBarDemoCtl.xaml.cs">
+      <DependentUpon>NativeProgressBarDemoCtl.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControl\Controls\TabControlDemoCtl.xaml.cs">
       <DependentUpon>TabControlDemoCtl.xaml</DependentUpon>
@@ -337,8 +337,8 @@
     <Compile Include="UserControl\Styles\TextBlockDemoCtl.xaml.cs">
       <DependentUpon>TextBlockDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControl\Styles\NaiveTextBoxDemoCtl.xaml.cs">
-      <DependentUpon>NaiveTextBoxDemoCtl.xaml</DependentUpon>
+    <Compile Include="UserControl\Styles\NativeTextBoxDemoCtl.xaml.cs">
+      <DependentUpon>NativeTextBoxDemoCtl.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControl\Styles\ToggleButtonDemoCtl.xaml.cs">
       <DependentUpon>ToggleButtonDemoCtl.xaml</DependentUpon>
@@ -464,7 +464,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\Controls\CircleProgressBarDemoCtl.xaml">
+    <Page Include="UserControl\Controls\ProgressBarDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -640,7 +640,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\Styles\NaiveComboBoxDemoCtl.xaml">
+    <Page Include="UserControl\Styles\NativeComboBoxDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -648,7 +648,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\Styles\NaiveDatePickerDemoCtl.xaml">
+    <Page Include="UserControl\Styles\NativeDatePickerDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -680,19 +680,19 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\Styles\NaiveScrollViewerDemoCtl.xaml">
+    <Page Include="UserControl\Styles\NativeScrollViewerDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\Styles\NaiveTabControlDemoCtl.xaml">
+    <Page Include="UserControl\Styles\NativeTabControlDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\Styles\NaivePasswordBoxDemoCtl.xaml">
+    <Page Include="UserControl\Styles\NativePasswordBoxDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\Styles\ProgressBarDemoCtl.xaml">
+    <Page Include="UserControl\Styles\NativeProgressBarDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -716,7 +716,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControl\Styles\NaiveTextBoxDemoCtl.xaml">
+    <Page Include="UserControl\Styles\NativeTextBoxDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -843,7 +843,6 @@
     <Resource Include="Resources\Img\LeftMainContent\Flow_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\TimePicker_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\Time_color_16x.png" />
-    <Resource Include="Resources\Img\LeftMainContent\ShapeArcRing_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\NumericListBox_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\Toggle_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\DataGrid_16x.png" />
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index 3ba49d5c..073911db 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -222,15 +222,6 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
-        /// <summary>
-        ///   查找类似 圆形进度条 的本地化字符串。
-        /// </summary>
-        public static string CircleProgressBar {
-            get {
-                return ResourceManager.GetString("CircleProgressBar", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 清空 的本地化字符串。
         /// </summary>
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index 9c359170..031b4922 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -387,9 +387,6 @@
   <data name="Slider" xml:space="preserve">
     <value>Slider</value>
   </data>
-  <data name="CircleProgressBar" xml:space="preserve">
-    <value>CircleProgressBar</value>
-  </data>
   <data name="IsNotPhone" xml:space="preserve">
     <value>It's not a phone number</value>
   </data>
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index 858deaca..4bfbd4a1 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -387,9 +387,6 @@
   <data name="Slider" xml:space="preserve">
     <value>滑块</value>
   </data>
-  <data name="CircleProgressBar" xml:space="preserve">
-    <value>圆形进度条</value>
-  </data>
   <data name="IsNotPhone" xml:space="preserve">
     <value>不是手机号码</value>
   </data>
diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/ShapeArcRing_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/ShapeArcRing_16x.png
deleted file mode 100644
index 64f52301..00000000
Binary files a/HandyControlDemo/Resources/Img/LeftMainContent/ShapeArcRing_16x.png and /dev/null differ
diff --git a/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ProgressBarDemoCtl.xaml
similarity index 94%
rename from HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml
rename to HandyControlDemo/UserControl/Controls/ProgressBarDemoCtl.xaml
index 1d89bbbc..9bf00205 100644
--- a/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/ProgressBarDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.CircleProgressBarDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.ProgressBarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
diff --git a/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/ProgressBarDemoCtl.xaml.cs
similarity index 100%
rename from HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml.cs
rename to HandyControlDemo/UserControl/Controls/ProgressBarDemoCtl.xaml.cs
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index 02714bdf..ca406766 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -59,7 +59,7 @@
                             <Image Source="../../Resources/Img/LeftMainContent/CheckBox_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NaiveScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
                         </controls:EdgeElement.LeftContent>
@@ -74,17 +74,17 @@
                             <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NaiveTextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeTextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NaiveComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NaivePasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.NativePasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png"/>
                         </controls:EdgeElement.LeftContent>
@@ -94,7 +94,7 @@
                             <Image Source="../../Resources/Img/LeftMainContent/Expander_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.ProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
                         </controls:EdgeElement.LeftContent>
@@ -104,12 +104,12 @@
                             <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NaiveDatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeDatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.NaiveTabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.NativeTabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
                         </controls:EdgeElement.LeftContent>
@@ -318,9 +318,9 @@
                             <Image Source="../../Resources/Img/LeftMainContent/LinearCarousel_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Tag="{x:Static data:MessageToken.CircleProgressBarDemoCtl}" Content="{x:Static langs:Lang.CircleProgressBar}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.ProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
                         <controls:EdgeElement.LeftContent>
-                            <Image Source="../../Resources/Img/LeftMainContent/ShapeArcRing_16x.png"/>
+                            <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
                     <ListBoxItem Tag="{x:Static data:MessageToken.StepBarDemoCtl}" Content="{x:Static langs:Lang.StepBar}">
diff --git a/HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml
similarity index 97%
rename from HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml
rename to HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml
index 377a8d1f..074f91c2 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.NaiveComboBoxDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.NativeComboBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
diff --git a/HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
similarity index 56%
rename from HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml.cs
rename to HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
index 3f147448..bb43f3e3 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
@@ -1,8 +1,8 @@
 namespace HandyControlDemo.UserControl
 {
-    public partial class NaiveComboBoxDemoCtl
+    public partial class NativeComboBoxDemoCtl
     {
-        public NaiveComboBoxDemoCtl()
+        public NativeComboBoxDemoCtl()
         {
             InitializeComponent();
         }
diff --git a/HandyControlDemo/UserControl/Styles/NaiveDatePickerDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml
similarity index 96%
rename from HandyControlDemo/UserControl/Styles/NaiveDatePickerDemoCtl.xaml
rename to HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml
index 0c241c84..e579d305 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveDatePickerDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.NaiveDatePickerDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.NativeDatePickerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
diff --git a/HandyControlDemo/UserControl/Styles/NaiveDatePickerDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
similarity index 55%
rename from HandyControlDemo/UserControl/Styles/NaiveDatePickerDemoCtl.xaml.cs
rename to HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
index a493aba7..b244fce8 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveDatePickerDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
@@ -1,8 +1,8 @@
 namespace HandyControlDemo.UserControl
 {
-    public partial class NaiveDatePickerDemoCtl
+    public partial class NativeDatePickerDemoCtl
     {
-        public NaiveDatePickerDemoCtl()
+        public NativeDatePickerDemoCtl()
         {
             InitializeComponent();
         }
diff --git a/HandyControlDemo/UserControl/Styles/NaivePasswordBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
similarity index 95%
rename from HandyControlDemo/UserControl/Styles/NaivePasswordBoxDemoCtl.xaml
rename to HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
index 129568f8..aa6296d4 100644
--- a/HandyControlDemo/UserControl/Styles/NaivePasswordBoxDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.NaivePasswordBoxDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.NativePasswordBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
diff --git a/HandyControlDemo/UserControl/Styles/NaivePasswordBoxDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
similarity index 55%
rename from HandyControlDemo/UserControl/Styles/NaivePasswordBoxDemoCtl.xaml.cs
rename to HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
index a17578c3..303db2ff 100644
--- a/HandyControlDemo/UserControl/Styles/NaivePasswordBoxDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
@@ -1,8 +1,8 @@
 namespace HandyControlDemo.UserControl
 {
-    public partial class NaivePasswordBoxDemoCtl
+    public partial class NativePasswordBoxDemoCtl
     {
-        public NaivePasswordBoxDemoCtl()
+        public NativePasswordBoxDemoCtl()
         {
             InitializeComponent();
         }
diff --git a/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml
similarity index 97%
rename from HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml
rename to HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml
index ae81491f..d4818d86 100644
--- a/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.ProgressBarDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.NativeProgressBarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Background="{DynamicResource RegionBrush}"
diff --git a/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
similarity index 55%
rename from HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml.cs
rename to HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
index 0093afc5..82b5e47c 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
@@ -1,9 +1,9 @@
 
 namespace HandyControlDemo.UserControl
 {
-    public partial class NaiveScrollViewerDemoCtl
+    public partial class NativeProgressBarDemoCtl
     {
-        public NaiveScrollViewerDemoCtl()
+        public NativeProgressBarDemoCtl()
         {
             InitializeComponent();
         }
diff --git a/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
similarity index 98%
rename from HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml
rename to HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
index 2249c71d..3a80a6b7 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.NaiveScrollViewerDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.NativeScrollViewerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
diff --git a/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
similarity index 54%
rename from HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml.cs
rename to HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
index 3190976f..083f4ca6 100644
--- a/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
@@ -1,9 +1,9 @@
 
 namespace HandyControlDemo.UserControl
 {
-    public partial class CircleProgressBarDemoCtl
+    public partial class NativeScrollViewerDemoCtl
     {
-        public CircleProgressBarDemoCtl()
+        public NativeScrollViewerDemoCtl()
         {
             InitializeComponent();
         }
diff --git a/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml
similarity index 99%
rename from HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml
rename to HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml
index 6bad4fc7..5175fd13 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.NaiveTabControlDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.NativeTabControlDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
diff --git a/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
similarity index 55%
rename from HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml.cs
rename to HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
index ccc35e13..3812e54b 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
@@ -1,9 +1,9 @@
 
 namespace HandyControlDemo.UserControl
 {
-    public partial class NaiveTabControlDemoCtl
+    public partial class NativeTabControlDemoCtl
     {
-        public NaiveTabControlDemoCtl()
+        public NativeTabControlDemoCtl()
         {
             InitializeComponent();
         }
diff --git a/HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml
similarity index 95%
rename from HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml
rename to HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml
index f06bb1d6..b9832881 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.NaiveTextBoxDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.NativeTextBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
diff --git a/HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
similarity index 57%
rename from HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml.cs
rename to HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
index f73ae25c..02c50edc 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveTextBoxDemoCtl.xaml.cs
+++ b/HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
@@ -1,9 +1,9 @@
 
 namespace HandyControlDemo.UserControl
 {
-    public partial class NaiveTextBoxDemoCtl
+    public partial class NativeTextBoxDemoCtl
     {
-        public NaiveTextBoxDemoCtl()
+        public NativeTextBoxDemoCtl()
         {
             InitializeComponent();
         }