diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index 0b5a2b9b..3412d959 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -123,7 +123,7 @@ else
 
     private void CreateComponent(RenderTreeBuilder builder, Module module, int key)
     {
-        builder.OpenComponent(0, Type.GetType(Constants.ContainerComponent));
+        builder.OpenComponent(0, typeof(ContainerBuilder));
         builder.AddAttribute(1, "ModuleState", module);
         if (key != -1)
         {
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index d8ac51e9..bc3da991 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -55,7 +55,7 @@
         {
             if (PageState != null)
             {
-                builder.OpenComponent(0, Type.GetType(Constants.PageComponent));
+                builder.OpenComponent(0, typeof(ThemeBuilder));
                 builder.CloseComponent();
             }
         };
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 0b38b07b..795e2d81 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -14,9 +14,6 @@ namespace Oqtane.Shared
         public const string DataDirectory = "DataDirectory";
         public const string DefaultDBType = "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer";
 
-        public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client";
-        public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client";
-
         public const string DefaultTheme = "Oqtane.Themes.OqtaneTheme.Default, Oqtane.Client";
         public const string DefaultContainer = "Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client";
         public const string DefaultAdminContainer = "Oqtane.Themes.AdminContainer, Oqtane.Client";
@@ -35,7 +32,6 @@ namespace Oqtane.Shared
         public const string AdminDashboardModule = "Oqtane.Modules.Admin.Dashboard, Oqtane.Client";
         public const string PageManagementModule = "Oqtane.Modules.Admin.Pages, Oqtane.Client";
         public const string ErrorModule = "Oqtane.Modules.Admin.Error.{Action}, Oqtane.Client";
-        public const string ModuleMessageComponent = "Oqtane.Modules.Controls.ModuleMessage, Oqtane.Client";
 
         public const string DefaultSiteTemplate = "Oqtane.SiteTemplates.DefaultSiteTemplate, Oqtane.Server";