diff --git a/Oqtane.Shared/Extensions/AssemblyExtensions.cs b/Oqtane.Shared/Extensions/AssemblyExtensions.cs
index e97de64f..4742d368 100644
--- a/Oqtane.Shared/Extensions/AssemblyExtensions.cs
+++ b/Oqtane.Shared/Extensions/AssemblyExtensions.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Oqtane.Modules;
 using Oqtane.Services;
 using Oqtane.Shared;
+using Oqtane.Themes;
 
 // ReSharper disable once CheckNamespace
 namespace System.Reflection
@@ -74,7 +76,7 @@ namespace System.Reflection
         public static IEnumerable<Assembly> GetOqtaneClientAssemblies(this AppDomain appDomain)
         {
             return appDomain.GetOqtaneAssemblies()
-                .Where(a => a.GetTypes<IClientStartup>().Any());
+                .Where(a => a.GetTypes<IModuleControl>().Any() || a.GetTypes<IThemeControl>().Any() || a.GetTypes<IClientStartup>().Any());
         }
     }
 }
diff --git a/Oqtane.Client/Modules/IModuleControl.cs b/Oqtane.Shared/Interfaces/IModuleControl.cs
similarity index 100%
rename from Oqtane.Client/Modules/IModuleControl.cs
rename to Oqtane.Shared/Interfaces/IModuleControl.cs
diff --git a/Oqtane.Client/Themes/IThemeControl.cs b/Oqtane.Shared/Interfaces/IThemeControl.cs
similarity index 100%
rename from Oqtane.Client/Themes/IThemeControl.cs
rename to Oqtane.Shared/Interfaces/IThemeControl.cs