diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml
new file mode 100644
index 00000000..c7a319e3
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml
@@ -0,0 +1,61 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.CircleProgressBarExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <UniformGrid>
+            <wd:CircleProgressBar
+                Width="80"
+                Height="80"
+                Background="#21BA9D"
+                BorderBrush="LightGray"
+                BrushStrokeThickness="2"
+                StrokeThickness="5"
+                Value="{Binding ElementName=CircleSlider, Path=Value}" />
+
+            <wd:CircleProgressBar
+                Background="#E14D5F"
+                BorderBrush="#42ABAC"
+                BrushStrokeThickness="4"
+                IsRound="True"
+                StrokeThickness="7"
+                Value="{Binding ElementName=CircleSlider, Path=Value}" />
+            <wd:CircleProgressBar
+                Width="50"
+                Height="50"
+                Background="#1FA7FC"
+                BorderBrush="#D6D6D6"
+                BrushStrokeThickness="10"
+                Foreground="Black"
+                IsRound="True"
+                StrokeThickness="10"
+                Value="{Binding ElementName=CircleSlider, Path=Value}" />
+            <wd:CircleProgressBar
+                Width="100"
+                Height="100"
+                BrushStrokeThickness="10"
+                IsRound="True"
+                Value="{Binding ElementName=CircleSlider, Path=Value}" />
+            <wd:CircleProgressBar Value="{Binding ElementName=CircleSlider, Path=Value}" />
+            <Slider
+                x:Name="CircleSlider"
+                VerticalAlignment="Center"
+                IsSnapToTickEnabled="True"
+                Maximum="100"
+                Minimum="0"
+                Value="10" />
+        </UniformGrid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircleProgressBarExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircleProgressBarExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml.cs
new file mode 100644
index 00000000..c6b6ca8b
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircleProgressBarExample.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// CircleProgressBarExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class CircleProgressBarExample : UserControl
+    {
+        public CircleProgressBarExample()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml
deleted file mode 100644
index 7b8f195d..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.CircularProgressBarExample"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <controls:CodeViewer>
-        <UniformGrid>
-            <wd:CircularProgressBar Background="#21BA9D"
-                                       Value="{Binding ElementName=CirularSlider,Path=Value}"
-                                       BrushStrokeThickness="2"
-                                       StrokeThickness="3"
-                                       Size="20,30"
-                                       BorderBrush="LightGray"/>
-
-            <wd:CircularProgressBar Background="#E14D5F" 
-                                        Value="{Binding ElementName=CirularSlider,Path=Value}"
-                                       BrushStrokeThickness="4"
-                                       StrokeThickness="5"
-                                       Size="15,15"
-                                        BorderBrush="#42ABAC" />
-            <wd:CircularProgressBar Background="#1FA7FC" 
-                                       BorderBrush="#D6D6D6" 
-                                       Value="{Binding ElementName=CirularSlider,Path=Value}"
-                                       BrushStrokeThickness="10"
-                                       StrokeThickness="10"
-                                       Foreground="Black"/>
-            <wd:CircularProgressBar Value="{Binding ElementName=CirularSlider,Path=Value}"/>
-
-            <Slider Minimum="0" Maximum="100" 
-                    x:Name="CirularSlider" IsSnapToTickEnabled="True"
-                    VerticalAlignment="Center" Value="10"/>
-        </UniformGrid>
-        <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircularProgressBarExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CircularProgressBarExample.xaml.cs" 
-                CodeType="CSharp"/>
-        </controls:CodeViewer.SourceCodes>
-    </controls:CodeViewer>
-</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml.cs
deleted file mode 100644
index d329787b..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    /// <summary>
-    /// CircularProgressBarExample.xaml 的交互逻辑
-    /// </summary>
-    public partial class CircularProgressBarExample : UserControl
-    {
-        public CircularProgressBarExample()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index 0bcc0183..68a18aba 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -24,7 +24,7 @@ public enum MenuEnum
         VerifyCode,
         CircleMenu,
         ChatEmoji,
-        ProgressBar,
+        CircleProgressBar,
         Dashboard,
         PieControl,
         Password,
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index 1502bd45..d003502e 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -170,8 +170,8 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.ChatEmoji:
                     ControlPanel = new ChatEmojiExample();
                     break;
-                case MenuEnum.ProgressBar:
-                    ControlPanel = new CircularProgressBarExample();
+                case MenuEnum.CircleProgressBar:
+                    ControlPanel = new CircleProgressBarExample();
                     break;
                 case MenuEnum.Dashboard:
                     ControlPanel = new DashboardExample();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 6e6d917f..7771ddc7 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -119,9 +119,9 @@
       <SubType>Code</SubType>
       <DependentUpon>CircleMenuExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\CircularProgressBarExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\CircleProgressBarExample.xaml.cs">
       <SubType>Code</SubType>
-      <DependentUpon>CircularProgressBarExample.xaml</DependentUpon>
+      <DependentUpon>CircleProgressBarExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ColorPickerExample.xaml.cs">
       <DependentUpon>ColorPickerExample.xaml</DependentUpon>
@@ -616,7 +616,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\CircularProgressBarExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\CircleProgressBarExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index cfa41218..308f7d07 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -194,8 +194,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircularMenuExample.xaml">
 			<Link>ExampleViews\CircularMenuExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircularProgressBarExample.xaml">
-			<Link>ExampleViews\CircularProgressBarExample.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CircleProgressBarExample.xaml">
+			<Link>ExampleViews\CircleProgressBarExample.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CountdownTimerExample.xaml">
 			<Link>ExampleViews\CountdownTimerExample.xaml</Link>
diff --git a/src/WPFDevelopers.Shared/Controls/CircularProgressBar/CircularProgressBar.cs b/src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
similarity index 70%
rename from src/WPFDevelopers.Shared/Controls/CircularProgressBar/CircularProgressBar.cs
rename to src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
index c13c49cb..c3391d4d 100644
--- a/src/WPFDevelopers.Shared/Controls/CircularProgressBar/CircularProgressBar.cs
+++ b/src/WPFDevelopers.Shared/Controls/CircleProgressBar/CircleProgressBar.cs
@@ -11,73 +11,63 @@ namespace WPFDevelopers.Controls
     [TemplatePart(Name = PathFigureTemplateName, Type = typeof(PathFigure))]
     [TemplatePart(Name = PathFigureAngleTemplateName, Type = typeof(PathFigure))]
     [TemplatePart(Name = TextBlockTemplateName, Type = typeof(TextBlock))]
-    public class CircularProgressBar : ProgressBar
+    public class CircleProgressBar : ProgressBar
     {
         private const string ArcSegmentTemplateName = "PART_ArcSegment";
         private const string ArcSegmentAngleTemplateName = "PART_ArcSegmentAngle";
         private const string PathFigureTemplateName = "PART_PathFigure";
         private const string PathFigureAngleTemplateName = "PART_PathFigureAngle";
         private const string TextBlockTemplateName = "PART_TextBlock";
+        private readonly Size _size = new Size(50,50);
         private ArcSegment _arcSegment, _arcSegmentAngle;
         private PathFigure _pathFigure, _pathFigureAngle;
         private TextBlock _textBlock;
 
+        public static readonly DependencyProperty IsRoundProperty =
+            DependencyProperty.Register("IsRound", typeof(bool), typeof(CircleProgressBar),
+                new PropertyMetadata(false));
 
-        public static readonly DependencyProperty SizeProperty =
-           DependencyProperty.Register("Size", typeof(Size), typeof(CircularProgressBar),
-               new PropertyMetadata(new Size(50,50)));
         public static readonly DependencyProperty AngleProperty =
-            DependencyProperty.Register("Angle", typeof(double), typeof(CircularProgressBar),
+            DependencyProperty.Register("Angle", typeof(double), typeof(CircleProgressBar),
                 new PropertyMetadata(0.0));
 
         public static readonly DependencyProperty StrokeThicknessProperty =
-            DependencyProperty.Register("StrokeThickness", typeof(double), typeof(CircularProgressBar),
-                new PropertyMetadata(10.0));
+            DependencyProperty.Register("StrokeThickness", typeof(double), typeof(CircleProgressBar),
+                new PropertyMetadata(5.0));
 
         public static readonly DependencyProperty BrushStrokeThicknessProperty =
-            DependencyProperty.Register("BrushStrokeThickness", typeof(double), typeof(CircularProgressBar),
-                new PropertyMetadata(1.0));
+            DependencyProperty.Register("BrushStrokeThickness", typeof(double), typeof(CircleProgressBar),
+                new PropertyMetadata(5.0));
 
-        public CircularProgressBar()
+        public CircleProgressBar()
         {
             ValueChanged += CircularProgressBar_ValueChanged;
         }
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-           
-            if (Size.Width != Size.Height)
-            {
-                var max = Math.Max(Size.Width, Size.Height);
-                Size = new Size(max, max);
-            }
-           
             _pathFigure = GetTemplateChild(PathFigureTemplateName) as PathFigure;
             _pathFigureAngle = GetTemplateChild(PathFigureAngleTemplateName) as PathFigure;
-            _pathFigure.StartPoint = new Point(Size.Width, 0);
-            _pathFigureAngle.StartPoint = new Point(Size.Width, 0);
+            _pathFigure.StartPoint = new Point(_size.Width, 0);
+            _pathFigureAngle.StartPoint = new Point(_size.Width, 0);
             _arcSegment = GetTemplateChild(ArcSegmentTemplateName) as ArcSegment;
-            _arcSegment.Size = Size;
-            _arcSegment.Point = new Point(Size.Width - 0.000872664626, 7.61543361704753E-09);
+            _arcSegment.Size = _size;
+            _arcSegment.Point = new Point(_size.Width - 0.000872664626, 7.61543361704753E-09);
             _arcSegmentAngle = GetTemplateChild(ArcSegmentAngleTemplateName) as ArcSegment;
-            _arcSegmentAngle.Size = Size;
+            _arcSegmentAngle.Size = _size;
             _textBlock = GetTemplateChild(TextBlockTemplateName) as TextBlock;
-            if (Size.Width < 15)
-            {
-                FontSize = 8;
-            }
         }
-        
-        public Size Size
+
+        public bool IsRound
         {
-            get => (Size)GetValue(SizeProperty);
-            set => SetValue(SizeProperty, value);
+            get => (bool)GetValue(IsRoundProperty);
+            set => SetValue(IsRoundProperty, value);
         }
 
         public double Angle
         {
             get => (double)GetValue(AngleProperty);
-            set => SetValue(AngleProperty, value);
+            private set => SetValue(AngleProperty, value);
         }
 
         public double StrokeThickness
@@ -94,7 +84,7 @@ public double BrushStrokeThickness
 
         private void CircularProgressBar_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            var bar = sender as CircularProgressBar;
+            var bar = sender as CircleProgressBar;
             var currentAngle = bar.Angle;
             var targetAngle = e.NewValue / bar.Maximum * 359.999;
             var anim = new DoubleAnimation(currentAngle, targetAngle, TimeSpan.FromMilliseconds(500));
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
index e1f44c5d..024691cb 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Colors.xaml
@@ -28,6 +28,12 @@
         x:Key="WD.NormalSolidColorBrush"
         po:Freeze="True"
         Color="{StaticResource WD.NormalColor}" />
+    <Color x:Key="WD.NormalSuccess" po:Freeze="True">#FF13CE67</Color>
+    <SolidColorBrush
+        x:Key="WD.SuccessNormalBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.NormalSuccess}" />
+
     <!--  Success颜色  -->
 
     <Color x:Key="WD.SuccessBorderBrushColor" po:Freeze="True">#99FA68</Color>
diff --git a/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml b/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml
new file mode 100644
index 00000000..4b4037bb
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/CircleProgressBar.xaml
@@ -0,0 +1,132 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:convert="clr-namespace:WPFDevelopers.Converts"
+    xmlns:shapes="clr-namespace:Microsoft.Expression.Drawing.Shapes">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <convert:AngleToPointConverter x:Key="WD.PrConverter" />
+    <convert:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
+    <Style
+        x:Key="WD.CircleProgressBar"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:CircleProgressBar}">
+        <Setter Property="Maximum" Value="100" />
+        <Setter Property="StrokeThickness" Value="5" />
+        <Setter Property="BrushStrokeThickness" Value="5" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircleProgressBar}">
+                    <controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                        <Viewbox Margin="{TemplateBinding Padding}">
+                            <Canvas Width="{Binding ElementName=PART_Path, Path=ActualWidth}" Height="{Binding ElementName=PART_Path, Path=ActualHeight}">
+                                <Path
+                                    x:Name="PART_Path"
+                                    Stroke="{TemplateBinding BorderBrush}"
+                                    StrokeThickness="{TemplateBinding BrushStrokeThickness}">
+                                    <Path.Data>
+                                        <PathGeometry>
+                                            <PathFigure x:Name="PART_PathFigure">
+                                                <ArcSegment
+                                                    x:Name="PART_ArcSegment"
+                                                    IsLargeArc="True"
+                                                    SweepDirection="Clockwise" />
+                                            </PathFigure>
+                                        </PathGeometry>
+                                    </Path.Data>
+                                </Path>
+                                <Path
+                                    x:Name="PART_PathArc"
+                                    Stroke="{TemplateBinding Background}"
+                                    StrokeThickness="{TemplateBinding StrokeThickness}">
+                                    <Path.Data>
+                                        <PathGeometry>
+                                            <PathFigure x:Name="PART_PathFigureAngle">
+                                                <ArcSegment
+                                                    x:Name="PART_ArcSegmentAngle"
+                                                    IsLargeArc="{Binding Path=Angle, Converter={StaticResource WD.IsLargeConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType=ProgressBar}}"
+                                                    SweepDirection="Clockwise">
+                                                    <ArcSegment.Point>
+                                                        <MultiBinding Converter="{StaticResource WD.PrConverter}">
+                                                            <Binding Path="Angle" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
+                                                            <Binding Path="Size" RelativeSource="{RelativeSource Mode=Self}" />
+                                                        </MultiBinding>
+                                                    </ArcSegment.Point>
+                                                </ArcSegment>
+                                            </PathFigure>
+                                        </PathGeometry>
+                                    </Path.Data>
+                                </Path>
+                            </Canvas>
+                        </Viewbox>
+                        <TextBlock
+                            x:Name="PART_TextBlock"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="{TemplateBinding FontSize}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsRound" Value="True">
+                            <Setter TargetName="PART_PathArc" Property="StrokeStartLineCap" Value="Round" />
+                            <Setter TargetName="PART_PathArc" Property="StrokeEndLineCap" Value="Round" />
+                        </Trigger>
+                        <Trigger Property="Value" Value="100">
+                            <Setter Property="Background" Value="{StaticResource WD.SuccessNormalBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <!--<Style
+        x:Key="WD.CircularProgressBar"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:CircularProgressBar}">
+        <Setter Property="Maximum" Value="100" />
+        <Setter Property="StrokeThickness" Value="10" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.InfoSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircularProgressBar}">
+                    <controls:SmallPanel>
+                        <shapes:Arc
+                            x:Name="PART_ArcBackground"
+                            Width="{TemplateBinding ActualWidth}"
+                            Height="{TemplateBinding ActualHeight}"
+                            ArcThickness="{TemplateBinding BrushStrokeThickness}"
+                            Fill="{TemplateBinding BorderBrush}"
+                            Stretch="None" />
+                        <shapes:Arc
+                            x:Name="PART_Arc"
+                            Width="{TemplateBinding ActualWidth}"
+                            Height="{TemplateBinding ActualHeight}"
+                            ArcThickness="{TemplateBinding StrokeThickness}"
+                            EndAngle=""
+                            Fill="{TemplateBinding Background}"
+                            Stretch="None" />
+                        <TextBlock
+                            x:Name="PART_TextBlock"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="{TemplateBinding FontSize}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>-->
+    <Style BasedOn="{StaticResource WD.CircleProgressBar}" TargetType="{x:Type controls:CircleProgressBar}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/CircularProgressBar.xaml b/src/WPFDevelopers.Shared/Themes/CircularProgressBar.xaml
deleted file mode 100644
index d98ce31d..00000000
--- a/src/WPFDevelopers.Shared/Themes/CircularProgressBar.xaml
+++ /dev/null
@@ -1,78 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:convert="clr-namespace:WPFDevelopers.Converts">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <convert:AngleToPointConverter x:Key="WD.PrConverter" />
-    <convert:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
-    <Style
-        x:Key="WD.CircularProgressBar"
-        BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type controls:CircularProgressBar}">
-        <Setter Property="Maximum" Value="100" />
-        <Setter Property="StrokeThickness" Value="10" />
-        <Setter Property="Foreground" Value="{DynamicResource WD.InfoSolidColorBrush}" />
-        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:CircularProgressBar}">
-                    <controls:SmallPanel
-                        Width="{Binding ElementName=PART_Path, Path=ActualWidth}"
-                        Height="{Binding ElementName=PART_Path, Path=ActualHeight}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Canvas>
-                            <Path
-                                x:Name="PART_Path"
-                                Stroke="{TemplateBinding BorderBrush}"
-                                StrokeThickness="{TemplateBinding BrushStrokeThickness}">
-                                <Path.Data>
-                                    <PathGeometry>
-                                        <PathFigure x:Name="PART_PathFigure">
-                                            <ArcSegment
-                                                x:Name="PART_ArcSegment"
-                                                IsLargeArc="True"
-                                                SweepDirection="Clockwise" />
-                                        </PathFigure>
-                                    </PathGeometry>
-                                </Path.Data>
-                            </Path>
-                            <Path Stroke="{TemplateBinding Background}" StrokeThickness="{TemplateBinding StrokeThickness}">
-                                <Path.Data>
-                                    <PathGeometry>
-                                        <PathFigure x:Name="PART_PathFigureAngle">
-                                            <ArcSegment
-                                                x:Name="PART_ArcSegmentAngle"
-                                                IsLargeArc="{Binding Path=Angle, Converter={StaticResource WD.IsLargeConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType=ProgressBar}}"
-                                                SweepDirection="Clockwise">
-                                                <ArcSegment.Point>
-                                                    <MultiBinding Converter="{StaticResource WD.PrConverter}">
-                                                        <Binding Path="Angle" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
-                                                        <Binding Path="Size" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
-                                                    </MultiBinding>
-                                                </ArcSegment.Point>
-                                            </ArcSegment>
-                                        </PathFigure>
-                                    </PathGeometry>
-                                </Path.Data>
-                            </Path>
-                        </Canvas>
-                        <TextBlock
-                            x:Name="PART_TextBlock"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
-                    </controls:SmallPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style BasedOn="{StaticResource WD.CircularProgressBar}" TargetType="{x:Type controls:CircularProgressBar}" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 90b2dfc2..1c776717 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -81,9 +81,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BubblleControl\BubblleCanvas.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Carousel\EmphasizerCarousel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Carousel\MasterCarousel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\CircularProgressBar\CircularProgressBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CircleMenu\CircleMenu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CircleMenu\CircleMenuItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\CircleProgressBar\CircleProgressBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\CropAvatar\CropAvatar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DrawerMenu\DrawerMenu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DrawerMenu\DrawerMenuItem.cs" />
@@ -456,7 +456,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Themes\CircularProgressBar.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)Themes\CircleProgressBar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>