diff --git a/CHANGELOG.md b/CHANGELOG.md
index aca61cc..95603ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Change `GetRibbonItem` to `GetRibbonItem_Alternative` to fix null when panel is removed.
 - Update `SetImage` to work with `ComboBoxMember`
 - Add `CreateComboBoxMember` to create `ComboBoxMember`.
-- Add `RibbonThemeBitmapUtils` to change theme for `BitmapSource`.
+- Add `RibbonThemeImageUtils` to change theme for `ImageSource`.
+- Update `RibbonThemeImageUtils` with public `GetThemeImageSource`.
 - Add `RibbonThemePanelUtils` to update the theme for itens in the `RibbonPanel`.
 - Update `RibbonPanel` create and remove to update the theme of the itens.
 ### Tests
diff --git a/Directory.Build.props b/Directory.Build.props
index af8d48e..544470a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<Version>0.6.3-beta.2</Version>
+		<Version>0.6.3-beta.3</Version>
 	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/ricaun.Revit.UI/Utils/RibbonThemeBitmapUtils.cs b/ricaun.Revit.UI/Utils/RibbonThemeImageUtils.cs
similarity index 72%
rename from ricaun.Revit.UI/Utils/RibbonThemeBitmapUtils.cs
rename to ricaun.Revit.UI/Utils/RibbonThemeImageUtils.cs
index 2e9389b..323bf4c 100644
--- a/ricaun.Revit.UI/Utils/RibbonThemeBitmapUtils.cs
+++ b/ricaun.Revit.UI/Utils/RibbonThemeImageUtils.cs
@@ -3,12 +3,24 @@
 
 namespace ricaun.Revit.UI.Utils
 {
-    internal static class RibbonThemeBitmapUtils
+    /// <summary>
+    /// RibbonThemeImageUtils
+    /// </summary>
+    public static class RibbonThemeImageUtils
     {
         private const string NAME_DARK = "dark";
         private const string NAME_LIGHT = "light";
 
-        internal static TImageSource GetThemeImageSource<TImageSource>(this TImageSource imageSource, bool isLight = true) where TImageSource : ImageSource
+        /// <summary>
+        /// GetThemeImageSource
+        /// </summary>
+        /// <typeparam name="TImageSource"></typeparam>
+        /// <param name="imageSource"></param>
+        /// <param name="isLight"></param>
+        /// <remarks>
+        /// Replace 'light' to 'dark' or 'dark' to 'light' in the image source name.
+        /// </remarks>
+        public static TImageSource GetThemeImageSource<TImageSource>(this TImageSource imageSource, bool isLight = true) where TImageSource : ImageSource
         {
             if (imageSource.GetSourceName().TryThemeImage(isLight, out string imageTheme))
             {