diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index 97518d9f..ac2485f3 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -19,13 +19,6 @@
     <IsPackable>true</IsPackable>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
   </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="Modules\Admin\ModuleCreator\Templates\**" />
-    <Content Remove="Modules\Admin\ModuleCreator\Templates\**" />
-    <EmbeddedResource Remove="Modules\Admin\ModuleCreator\Templates\**" />
-    <None Remove="Modules\Admin\ModuleCreator\Templates\**" />
-  </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
diff --git a/Oqtane.Client/wwwroot/Themes/Siliqon.TestTheme/Theme.css b/Oqtane.Client/wwwroot/Themes/Siliqon.TestTheme/Theme.css
deleted file mode 100644
index 93d1b672..00000000
--- a/Oqtane.Client/wwwroot/Themes/Siliqon.TestTheme/Theme.css
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Oqtane Styles */
-
-body {
-    padding-top: 7rem;
-}
-
-.controls {
-    z-index: 2000;
-    padding-top: 15px;
-    padding-bottom: 15px;
-    margin-right: 10px;
-}
-
-.app-menu .nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-.app-menu .nav-item a {
-    border-radius: 4px;
-    height: 3rem;
-    display: flex;
-    align-items: center;
-    line-height: 3rem;
-}
-
-.app-menu .nav-item a.active {
-    background-color: rgba(255,255,255,0.25);
-    color: white;
-}
-
-.app-menu .nav-item a:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-.app-menu .nav-link .oi {
-    width: 1.5rem;
-    font-size: 1.1rem;
-    vertical-align: text-top;
-    top: -2px;
-}
-
-.navbar-toggler {
-    background-color: rgba(255, 255, 255, 0.1);
-    margin-left: auto;
-}
-
-div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu {
-    color:#ffffff;
-}
-
-@media (max-width: 767px) {
-
-    .app-menu {
-        width: 100%
-    }
-
-    .navbar {
-        position: fixed;
-        top: 60px;
-        width: 100%;
-    }
-
-    .controls {
-        height: 60px;
-        top: 15px;
-        position: fixed;
-        top: 0px;
-        width: 100%;
-        background-color: rgb(0, 0, 0);
-    }
-
-    .controls-group {
-        float: right;
-        margin-right: 25px;
-    }
-
-    .content {
-        position: relative;
-        top: 60px;
-    }
-}
diff --git a/Oqtane.Client/wwwroot/Themes/Softvision.DemoTheme/Theme.css b/Oqtane.Client/wwwroot/Themes/Softvision.DemoTheme/Theme.css
deleted file mode 100644
index c77bb42e..00000000
--- a/Oqtane.Client/wwwroot/Themes/Softvision.DemoTheme/Theme.css
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Oqtane Styles */
-
-body {
-    padding-top: 7rem;
-}
-
-.controls {
-    z-index: 2000;
-    padding-top: 15px;
-    padding-bottom: 15px;
-    margin-right: 10px;
-}
-
-.app-menu .nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-.app-menu .nav-item a {
-    border-radius: 4px;
-    height: 3rem;
-    display: flex;
-    align-items: center;
-    line-height: 3rem;
-}
-
-.app-menu .nav-item a.active {
-    background-color: rgba(255,255,255,0.25);
-    color: white;
-}
-
-.app-menu .nav-item a:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-.app-menu .nav-link .oi {
-    width: 1.5rem;
-    font-size: 1.1rem;
-    vertical-align: text-top;
-    top: -2px;
-}
-
-.navbar-toggler {
-    background-color: rgba(255, 255, 255, 0.1);
-    margin-left: auto;
-}
-
-div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu {
-    color:#000000;
-}
-
-@media (max-width: 767px) {
-
-    .app-menu {
-        width: 100%
-    }
-
-    .navbar {
-        position: fixed;
-        top: 60px;
-        width: 100%;
-    }
-
-    .controls {
-        height: 60px;
-        top: 15px;
-        position: fixed;
-        top: 0px;
-        width: 100%;
-        background-color: rgb(0, 0, 0);
-    }
-
-    .controls-group {
-        float: right;
-        margin-right: 25px;
-    }
-
-    .content {
-        position: relative;
-        top: 60px;
-    }
-}
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index a4daeef9..480083e6 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -66,9 +66,11 @@
     <UpgradeFiles Include="$(ProjectDir)bin\Release\net5.0\Oqtane.Upgrade.dll" />
     <UpgradeFiles Include="$(ProjectDir)bin\Release\net5.0\Oqtane.Upgrade.pdb" />
     <UpgradeFiles Include="$(ProjectDir)bin\Release\net5.0\Oqtane.Upgrade.runtimeconfig.json" />
-    <TemplateFiles Include="$(ProjectDir)wwwroot\Modules\Templates\**\*.*" />
+    <ModuleTemplateFiles Include="$(ProjectDir)wwwroot\Modules\Templates\**\*.*" />
+    <ThemeTemplateFiles Include="$(ProjectDir)wwwroot\Themes\Templates\**\*.*" />
   </ItemGroup>
   <Target Name="AddPayloadsFolder" AfterTargets="Publish">
     <Copy SourceFiles="@(UpgradeFiles)" DestinationFiles="@(UpgradeFiles->'$(PublishDir)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(PublishDir)wwwroot\Modules\Templates\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="false" />
+    <Copy SourceFiles="@(ModuleTemplateFiles)" DestinationFiles="@(ModuleTemplateFiles->'$(PublishDir)wwwroot\Modules\Templates\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="false" />
+    <Copy SourceFiles="@(ThemeTemplateFiles)" DestinationFiles="@(ThemeTemplateFiles->'$(PublishDir)wwwroot\Themes\Templates\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="false" />
   </Target></Project>