diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs b/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
index 7fb8029a6..89d2dbe88 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
@@ -45,7 +45,7 @@ private static void OnSourceChanged(DependencyObject d, DependencyPropertyChange
                 {
                     Stretch = Stretch.UniformToFill
                 }
-                : ResourceHelper.GetResourceInternal<Brush>("SecondaryRegionBrush");
+                : ResourceHelper.GetResource<Brush>("SecondaryRegionBrush");
         }
 
         public ImageSource Source
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
index ca01ba30e..f84e81743 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
@@ -385,7 +385,7 @@ private RadioButton CreateButton(int page)
         {
             return new()
             {
-                Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.PaginationButtonStyle),
+                Style = ResourceHelper.GetResource<Style>(ResourceToken.PaginationButtonStyle),
                 Content = page.ToString()
             };
         }
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
index 979178cd4..cf78746cb 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
@@ -32,7 +32,7 @@ private static void OnTransitionModeChanged(DependencyObject d, DependencyProper
 
         private void OnTransitionModeChanged(TransitionMode newValue)
         {
-            _storyboardBuildIn = ResourceHelper.GetResourceInternal<Storyboard>($"{newValue}Transition");
+            _storyboardBuildIn = ResourceHelper.GetResource<Storyboard>($"{newValue}Transition");
             StartTransition();
         }
 
@@ -78,7 +78,7 @@ private void StartTransition()
             }
             else
             {
-                StoryboardBuildInDefault ??= ResourceHelper.GetResourceInternal<Storyboard>($"{default(TransitionMode)}Transition");
+                StoryboardBuildInDefault ??= ResourceHelper.GetResource<Storyboard>($"{default(TransitionMode)}Transition");
                 StoryboardBuildInDefault?.Begin(_contentPresenter);
             }
         }
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
index 21adcf1a6..b532a1731 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
@@ -14,9 +14,9 @@ public class HorizontalAlignmentPropertyEditor : PropertyEditorBase
     {
         public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
         {
-            Style = ResourceHelper.GetResourceInternal<Style>("ComboBoxCapsule"),
+            Style = ResourceHelper.GetResource<Style>("ComboBoxCapsule"),
             ItemsSource = Enum.GetValues(propertyItem.PropertyType),
-            ItemTemplateSelector = ResourceHelper.GetResourceInternal<DataTemplateSelector>("HorizontalAlignmentPathTemplateSelector"),
+            ItemTemplateSelector = ResourceHelper.GetResource<DataTemplateSelector>("HorizontalAlignmentPathTemplateSelector"),
             HorizontalAlignment = HorizontalAlignment.Left
         };
 
@@ -48,16 +48,16 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
                 switch (horizontalAlignment)
                 {
                     case HorizontalAlignment.Left:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignLeftGeometry"));
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignLeftGeometry"));
                         break;
                     case HorizontalAlignment.Center:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignHCenterGeometry"));
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignHCenterGeometry"));
                         break;
                     case HorizontalAlignment.Right:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignRightGeometry"));
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignRightGeometry"));
                         break;
                     case HorizontalAlignment.Stretch:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignHStretchGeometry"));
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignHStretchGeometry"));
                         break;
                 }
 
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
index cd70e8e3b..e5003d539 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
@@ -15,6 +15,6 @@ public class ReadOnlyTextPropertyEditor : PropertyEditorBase
 
         public override BindingMode GetBindingMode(PropertyItem propertyItem) => BindingMode.OneWay;
 
-        protected override IValueConverter GetConverter(PropertyItem propertyItem) => ResourceHelper.GetResourceInternal<IValueConverter>("Object2StringConverter");
+        protected override IValueConverter GetConverter(PropertyItem propertyItem) => ResourceHelper.GetResource<IValueConverter>("Object2StringConverter");
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
index 479418493..9c1e2512c 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
@@ -14,9 +14,9 @@ public class VerticalAlignmentPropertyEditor : PropertyEditorBase
     {
         public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
         {
-            Style = ResourceHelper.GetResourceInternal<Style>("ComboBoxCapsule"),
+            Style = ResourceHelper.GetResource<Style>("ComboBoxCapsule"),
             ItemsSource = Enum.GetValues(propertyItem.PropertyType),
-            ItemTemplateSelector = ResourceHelper.GetResourceInternal<DataTemplateSelector>("VerticalAlignmentPathTemplateSelector"),
+            ItemTemplateSelector = ResourceHelper.GetResource<DataTemplateSelector>("VerticalAlignmentPathTemplateSelector"),
             HorizontalAlignment = HorizontalAlignment.Left
         };
 
@@ -48,16 +48,16 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
                 switch (verticalAlignment)
                 {
                     case VerticalAlignment.Top:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignTopGeometry"));
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignTopGeometry"));
                         break;
                     case VerticalAlignment.Center:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignVCenterGeometry"));
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignVCenterGeometry"));
                         break;
                     case VerticalAlignment.Bottom:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignBottomGeometry"));
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignBottomGeometry"));
                         break;
                     case VerticalAlignment.Stretch:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignVStretchGeometry"));
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignVStretchGeometry"));
                         break;
                 }
 
diff --git a/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs b/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
index d4d49101a..28ac41595 100644
--- a/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
@@ -188,7 +188,7 @@ public Brush PreviewBrush
 
         public ScreenshotWindow(Screenshot screenshot)
         {
-            Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.Window4ScreenshotStyle);
+            Style = ResourceHelper.GetResource<Style>(ResourceToken.Window4ScreenshotStyle);
             _screenshot = screenshot;
             DataContext = this;
 
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
index 2ca7248ff..d732a5a2c 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
@@ -208,7 +208,7 @@ private void OnMenuChanged(ContextMenu menu)
                 menu.SetBinding(VisibilityProperty, new Binding(ShowContextMenuProperty.Name)
                 {
                     Source = this,
-                    Converter = ResourceHelper.GetResourceInternal<IValueConverter>(ResourceToken.Boolean2VisibilityConverter)
+                    Converter = ResourceHelper.GetResource<IValueConverter>(ResourceToken.Boolean2VisibilityConverter)
                 });
             }
         }
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
index 054b40b04..36c2fadc0 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
@@ -286,8 +286,8 @@ public static MessageBoxResult Success(string messageBoxText, string caption = n
                 messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
                 SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
                 messageBox.ShowImage = true;
-                messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(ResourceToken.SuccessGeometry);
-                messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.SuccessBrush);
+                messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
+                messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
                 SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             }));
@@ -368,8 +368,8 @@ public static MessageBoxResult Fatal(string messageBoxText, string caption = nul
                 messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
                 SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
                 messageBox.ShowImage = true;
-                messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(ResourceToken.FatalGeometry);
-                messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.PrimaryTextBrush);
+                messageBox.Image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
+                messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
                 SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
             }));
@@ -413,13 +413,13 @@ public static MessageBoxResult Show(MessageBoxInfo info)
                 if (!string.IsNullOrEmpty(info.IconKey))
                 {
                     messageBox.ShowImage = true;
-                    messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(info.IconKey);
-                    messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(info.IconBrushKey);
+                    messageBox.Image = ResourceHelper.GetResource<Geometry>(info.IconKey);
+                    messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey);
                 }
 
                 if (info.StyleKey != null)
                 {
-                    messageBox.Style = ResourceHelper.GetResourceInternal<Style>(info.StyleKey);
+                    messageBox.Style = ResourceHelper.GetResource<Style>(info.StyleKey);
                 }
                 SystemSounds.Asterisk.Play();
                 messageBox.ShowDialog();
@@ -523,7 +523,7 @@ private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton mess
                         IsDefault = true,
                         Content = messageBox.ConfirmContent,
                         Command = ControlCommands.Confirm,
-                        Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle")
+                        Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle")
                     };
 
                     break;
@@ -545,15 +545,15 @@ private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton mess
 
                     if (defaultResult == MessageBoxResult.Cancel)
                     {
-                        messageBox._buttonOk.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonOk.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonCancel.Style = ResourceHelper.GetResource<Style>("MessageBoxPrimaryButtonStyle");
                         messageBox._buttonCancel.IsDefault = true;
                     }
                     else
                     {
-                        messageBox._buttonOk.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonOk.Style = ResourceHelper.GetResource<Style>("MessageBoxPrimaryButtonStyle");
                         messageBox._buttonOk.IsDefault = true;
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonCancel.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
                     }
 
                     break;
@@ -574,15 +574,15 @@ private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton mess
 
                     if (defaultResult == MessageBoxResult.No)
                     {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonYes.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonNo.Style = ResourceHelper.GetResource<Style>("MessageBoxPrimaryButtonStyle");
                         messageBox._buttonNo.IsDefault = true;
                     }
                     else
                     {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonYes.Style = ResourceHelper.GetResource<Style>("MessageBoxPrimaryButtonStyle");
                         messageBox._buttonYes.IsDefault = true;
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonNo.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
                     }
 
                     break;
@@ -611,24 +611,24 @@ private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton mess
 
                     if (defaultResult == MessageBoxResult.No)
                     {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonYes.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonNo.Style = ResourceHelper.GetResource<Style>("MessageBoxPrimaryButtonStyle");
                         messageBox._buttonNo.IsDefault = true;
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonCancel.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
                     }
                     else if (defaultResult == MessageBoxResult.Cancel)
                     {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonYes.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonNo.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonCancel.Style = ResourceHelper.GetResource<Style>("MessageBoxPrimaryButtonStyle");
                         messageBox._buttonCancel.IsDefault = true;
                     }
                     else
                     {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                        messageBox._buttonYes.Style = ResourceHelper.GetResource<Style>("MessageBoxPrimaryButtonStyle");
                         messageBox._buttonYes.IsDefault = true;
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonNo.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
+                        messageBox._buttonCancel.Style = ResourceHelper.GetResource<Style>("MessageBoxButtonStyle");
                     }
 
                     break;
@@ -662,8 +662,8 @@ private static void SetImage(MessageBox messageBox, MessageBoxImage messageBoxIm
 
             if (string.IsNullOrEmpty(iconKey)) return;
             messageBox.ShowImage = true;
-            messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(iconKey);
-            messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(iconBrushKey);
+            messageBox.Image = ResourceHelper.GetResource<Geometry>(iconKey);
+            messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(iconBrushKey);
         }
 
         private static bool IsValidMessageBoxButton(MessageBoxButton value)
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
index 0e87786ef..9306c45bf 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
@@ -187,7 +187,7 @@ public static void Show(string message)
                 WindowStyle = WindowStyle.None,
                 ContentStr = message,
                 WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                Background = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.PrimaryBrush)
+                Background = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryBrush)
             };
             window.Show();
         }
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.tt b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.tt
index 292cd060f..80d2f78f3 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.tt
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.tt
@@ -27,7 +27,7 @@ namespace HandyControl.Properties.Langs
 {
     public class LangProvider : INotifyPropertyChanged
     {
-        internal static LangProvider Instance => ResourceHelper.GetResourceInternal<LangProvider>("Langs");
+        internal static LangProvider Instance => ResourceHelper.GetResource<LangProvider>("Langs");
 
         private static string CultureInfoStr;
 
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
index 7877494b2..cb4ae4c3b 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
@@ -11,26 +11,26 @@ public class ButtonGroupItemStyleSelector : StyleSelector
     {
         private static readonly Dictionary<string, Style> StyleDict = new()
         {
-            [ResourceToken.RadioGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemSingle),
-            [ResourceToken.RadioGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemHorizontalFirst),
-            [ResourceToken.RadioGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemHorizontalLast),
-            [ResourceToken.RadioGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemVerticalFirst),
-            [ResourceToken.RadioGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemVerticalLast),
-            [ResourceToken.RadioGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemDefault),
+            [ResourceToken.RadioGroupItemSingle] = ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemSingle),
+            [ResourceToken.RadioGroupItemHorizontalFirst] = ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemHorizontalFirst),
+            [ResourceToken.RadioGroupItemHorizontalLast] = ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemHorizontalLast),
+            [ResourceToken.RadioGroupItemVerticalFirst] = ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemVerticalFirst),
+            [ResourceToken.RadioGroupItemVerticalLast] = ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemVerticalLast),
+            [ResourceToken.RadioGroupItemDefault] = ResourceHelper.GetResource<Style>(ResourceToken.RadioGroupItemDefault),
 
-            [ResourceToken.ButtonGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemSingle),
-            [ResourceToken.ButtonGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemHorizontalFirst),
-            [ResourceToken.ButtonGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemHorizontalLast),
-            [ResourceToken.ButtonGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemVerticalFirst),
-            [ResourceToken.ButtonGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemVerticalLast),
-            [ResourceToken.ButtonGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemDefault),
+            [ResourceToken.ButtonGroupItemSingle] = ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemSingle),
+            [ResourceToken.ButtonGroupItemHorizontalFirst] = ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemHorizontalFirst),
+            [ResourceToken.ButtonGroupItemHorizontalLast] = ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemHorizontalLast),
+            [ResourceToken.ButtonGroupItemVerticalFirst] = ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemVerticalFirst),
+            [ResourceToken.ButtonGroupItemVerticalLast] = ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemVerticalLast),
+            [ResourceToken.ButtonGroupItemDefault] = ResourceHelper.GetResource<Style>(ResourceToken.ButtonGroupItemDefault),
 
-            [ResourceToken.ToggleButtonGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemSingle),
-            [ResourceToken.ToggleButtonGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemHorizontalFirst),
-            [ResourceToken.ToggleButtonGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemHorizontalLast),
-            [ResourceToken.ToggleButtonGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemVerticalFirst),
-            [ResourceToken.ToggleButtonGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemVerticalLast),
-            [ResourceToken.ToggleButtonGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemDefault)
+            [ResourceToken.ToggleButtonGroupItemSingle] = ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemSingle),
+            [ResourceToken.ToggleButtonGroupItemHorizontalFirst] = ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemHorizontalFirst),
+            [ResourceToken.ToggleButtonGroupItemHorizontalLast] = ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemHorizontalLast),
+            [ResourceToken.ToggleButtonGroupItemVerticalFirst] = ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemVerticalFirst),
+            [ResourceToken.ToggleButtonGroupItemVerticalLast] = ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemVerticalLast),
+            [ResourceToken.ToggleButtonGroupItemDefault] = ResourceHelper.GetResource<Style>(ResourceToken.ToggleButtonGroupItemDefault)
         };
 
         public override Style SelectStyle(object item, DependencyObject container)
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
index 6556f73c9..a22ad2d17 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
@@ -13,13 +13,13 @@ public override Style SelectStyle(object item, DependencyObject container)
                 var count = comboBox.Items.Count;
                 if (count == 1)
                 {
-                    return ResourceHelper.GetResourceInternal<Style>(ResourceToken.ComboBoxItemCapsuleSingle);
+                    return ResourceHelper.GetResource<Style>(ResourceToken.ComboBoxItemCapsuleSingle);
                 }
 
                 var index = comboBox.ItemContainerGenerator.IndexFromContainer(comboBoxItem);
                 return index == 0
-                    ? ResourceHelper.GetResourceInternal<Style>(ResourceToken.ComboBoxItemCapsuleHorizontalFirst)
-                    : ResourceHelper.GetResourceInternal<Style>(index == count - 1
+                    ? ResourceHelper.GetResource<Style>(ResourceToken.ComboBoxItemCapsuleHorizontalFirst)
+                    : ResourceHelper.GetResource<Style>(index == count - 1
                         ? ResourceToken.ComboBoxItemCapsuleHorizontalLast
                         : ResourceToken.ComboBoxItemCapsuleDefault);
             }
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
index 2faa96ec0..fbc4fed8d 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
@@ -13,16 +13,16 @@ public override Style SelectStyle(object item, DependencyObject container)
                 var count = tabControl.Items.Count;
                 if (count == 1)
                 {
-                    return ResourceHelper.GetResourceInternal<Style>(ResourceToken.TabItemCapsuleSingle);
+                    return ResourceHelper.GetResource<Style>(ResourceToken.TabItemCapsuleSingle);
                 }
 
                 var index = tabControl.ItemContainerGenerator.IndexFromContainer(tabItem);
                 return index == 0
-                    ? ResourceHelper.GetResourceInternal<Style>(
+                    ? ResourceHelper.GetResource<Style>(
                         tabControl.TabStripPlacement == Dock.Top || tabControl.TabStripPlacement == Dock.Bottom
                             ? ResourceToken.TabItemCapsuleHorizontalFirst
                             : ResourceToken.TabItemCapsuleVerticalFirst)
-                    : ResourceHelper.GetResourceInternal<Style>(index == count - 1
+                    : ResourceHelper.GetResource<Style>(index == count - 1
                         ? tabControl.TabStripPlacement == Dock.Top || tabControl.TabStripPlacement == Dock.Bottom
                             ? ResourceToken.TabItemCapsuleHorizontalLast
                             : ResourceToken.TabItemCapsuleVerticalLast