diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 712a5b22..5e149efa 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -13042,7 +13042,6 @@
 		<Setter Property="MinHeight" Value="20" />
 	</Style>
 	<Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="GroupName" Value="1" />
 		<Setter Property="MinWidth" Value="30" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
@@ -13116,7 +13115,7 @@
 									<interactivity:EventToCommand Command="interactivity:ControlCommands.Selected" PassEventArgsToCommand="True" />
 								</interactivity:RoutedEventTrigger>
 							</interactivity:Interaction.Triggers>
-							<RadioButton Name="PART_ButtonFirst" Content="1" IsChecked="True" Style="{TemplateBinding PaginationButtonStyle}" />
+							<RadioButton Name="PART_ButtonFirst" IsChecked="True" Style="{TemplateBinding PaginationButtonStyle}" />
 							<Border Name="PART_MoreLeft" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
 								<hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
 							</Border>
@@ -13124,7 +13123,7 @@
 							<Border Name="PART_MoreRight" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
 								<hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
 							</Border>
-							<RadioButton Name="PART_ButtonLast" Content="10" Style="{TemplateBinding PaginationButtonStyle}" />
+							<RadioButton Name="PART_ButtonLast" Style="{TemplateBinding PaginationButtonStyle}" />
 						</StackPanel>
 						<Button x:Name="PART_ButtonRight" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource RightGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Margin="-1,0,0,0" Command="interactivity:ControlCommands.Next" />
 						<hc:NumericUpDown x:Name="PART_Jump" IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="6,0,0,0" Maximum="{Binding MaxPageCount,RelativeSource={RelativeSource TemplatedParent}}" Minimum="1" />
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
index fdd1bee6..52dba43a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
@@ -37,6 +37,8 @@ public class Pagination : Control
 
     #region Data
 
+    private readonly string _groupName = Guid.NewGuid().ToString("N");
+
     private Button _buttonLeft;
     private Button _buttonRight;
     private RadioButton _buttonFirst;
@@ -45,11 +47,8 @@ public class Pagination : Control
     private FrameworkElement _moreRight;
     private RadioButton _buttonLast;
     private NumericUpDown _jumpNumericUpDown;
-
     private bool _appliedTemplate;
 
-    private readonly string groupName = Guid.NewGuid().ToString("N");
-
     #endregion Data
 
     #region Public Events
@@ -93,9 +92,9 @@ public class Pagination : Control
     public static readonly DependencyProperty MaxPageCountProperty = DependencyProperty.Register(
         nameof(MaxPageCount), typeof(int), typeof(Pagination), new PropertyMetadata(ValueBoxes.Int1Box, OnMaxPageCountChanged, CoerceMaxPageCount), ValidateHelper.IsInRangeOfPosIntIncludeZero);
 
-    private static object CoerceMaxPageCount(DependencyObject d, object basevalue)
+    private static object CoerceMaxPageCount(DependencyObject d, object baseValue)
     {
-        var intValue = (int) basevalue;
+        var intValue = (int) baseValue;
         return intValue < 1 ? 1 : intValue;
     }
 
@@ -161,11 +160,11 @@ public class Pagination : Control
     public static readonly DependencyProperty PageIndexProperty = DependencyProperty.Register(
         nameof(PageIndex), typeof(int), typeof(Pagination), new PropertyMetadata(ValueBoxes.Int1Box, OnPageIndexChanged, CoercePageIndex), ValidateHelper.IsInRangeOfPosIntIncludeZero);
 
-    private static object CoercePageIndex(DependencyObject d, object basevalue)
+    private static object CoercePageIndex(DependencyObject d, object baseValue)
     {
         if (d is not Pagination pagination) return 1;
 
-        var intValue = (int) basevalue;
+        var intValue = (int) baseValue;
         return intValue < 1
             ? 1
             : intValue > pagination.MaxPageCount
@@ -275,6 +274,7 @@ public class Pagination : Control
     public override void OnApplyTemplate()
     {
         _appliedTemplate = false;
+
         base.OnApplyTemplate();
 
         _buttonLeft = GetTemplateChild(ElementButtonLeft) as Button;
@@ -286,12 +286,13 @@ public class Pagination : Control
         _buttonLast = GetTemplateChild(ElementButtonLast) as RadioButton;
         _jumpNumericUpDown = GetTemplateChild(ElementJump) as NumericUpDown;
 
-        _buttonFirst.GroupName = groupName;
-        _buttonLast.GroupName = groupName;
-
         CheckNull();
 
+        _buttonFirst.Content = "1";
+        _buttonFirst.GroupName = _groupName;
+        _buttonLast.GroupName = _groupName;
         _appliedTemplate = true;
+
         Update();
     }
 
@@ -397,11 +398,11 @@ public class Pagination : Control
 
     private RadioButton CreateButton(int page)
     {
-        return new()
+        return new RadioButton
         {
             Style = PaginationButtonStyle,
             Content = page.ToString(),
-            GroupName = groupName
+            GroupName = _groupName,
         };
     }
 
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Pagination.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Pagination.xaml
index 4ccd6ee0..dc5a0e32 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Pagination.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Pagination.xaml
@@ -7,7 +7,6 @@
                     xmlns:ex="clr-namespace:HandyControl.Tools.Extension">
 
     <Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-        <Setter Property="GroupName" Value="1"/>
         <Setter Property="MinWidth" Value="30"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
@@ -82,7 +81,7 @@
                                     <interactivity:EventToCommand Command="interactivity:ControlCommands.Selected" PassEventArgsToCommand="True" />
                                 </interactivity:RoutedEventTrigger>
                             </interactivity:Interaction.Triggers>
-                            <RadioButton Name="PART_ButtonFirst" Content="1" IsChecked="True" Style="{TemplateBinding PaginationButtonStyle}"/>
+                            <RadioButton Name="PART_ButtonFirst" IsChecked="True" Style="{TemplateBinding PaginationButtonStyle}"/>
                             <Border Name="PART_MoreLeft" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
                                 <hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center"/>
                             </Border>
@@ -90,7 +89,7 @@
                             <Border Name="PART_MoreRight" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
                                 <hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center"/>
                             </Border>
-                            <RadioButton Name="PART_ButtonLast" Content="10" Style="{TemplateBinding PaginationButtonStyle}"/>
+                            <RadioButton Name="PART_ButtonLast" Style="{TemplateBinding PaginationButtonStyle}"/>
                         </StackPanel>
                         <Button x:Name="PART_ButtonRight" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource RightGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Margin="-1,0,0,0" Command="interactivity:ControlCommands.Next"/>
                         <hc:NumericUpDown x:Name="PART_Jump" IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="6,0,0,0" Maximum="{Binding MaxPageCount,RelativeSource={RelativeSource TemplatedParent}}" Minimum="1"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 4320f08c..01fbee24 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -13194,7 +13194,6 @@
 		<Setter Property="MinHeight" Value="20" />
 	</Style>
 	<Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="GroupName" Value="1" />
 		<Setter Property="MinWidth" Value="30" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
@@ -13268,7 +13267,7 @@
 									<interactivity:EventToCommand Command="interactivity:ControlCommands.Selected" PassEventArgsToCommand="True" />
 								</interactivity:RoutedEventTrigger>
 							</interactivity:Interaction.Triggers>
-							<RadioButton Name="PART_ButtonFirst" Content="1" IsChecked="True" Style="{TemplateBinding PaginationButtonStyle}" />
+							<RadioButton Name="PART_ButtonFirst" IsChecked="True" Style="{TemplateBinding PaginationButtonStyle}" />
 							<Border Name="PART_MoreLeft" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
 								<hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
 							</Border>
@@ -13276,7 +13275,7 @@
 							<Border Name="PART_MoreRight" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
 								<hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
 							</Border>
-							<RadioButton Name="PART_ButtonLast" Content="10" Style="{TemplateBinding PaginationButtonStyle}" />
+							<RadioButton Name="PART_ButtonLast" Style="{TemplateBinding PaginationButtonStyle}" />
 						</StackPanel>
 						<Button x:Name="PART_ButtonRight" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource RightGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Margin="-1,0,0,0" Command="interactivity:ControlCommands.Next" />
 						<hc:NumericUpDown x:Name="PART_Jump" IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="6,0,0,0" Maximum="{Binding MaxPageCount,RelativeSource={RelativeSource TemplatedParent}}" Minimum="1" />