diff --git a/templates/app-nolayers/angular/angular.json b/templates/app-nolayers/angular/angular.json
index d80378679b..0acedfe5c4 100644
--- a/templates/app-nolayers/angular/angular.json
+++ b/templates/app-nolayers/angular/angular.json
@@ -65,9 +65,7 @@
                 "inject": true,
                 "bundleName": "bootstrap-ltr.min"
               },
-              //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
               "node_modules/bootstrap-icons/font/bootstrap-icons.css",
-              //</TEMPLATE-REMOVE>
               "src/styles.scss"
             ],
             "scripts": []
diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json
index 593883faee..eabf7dd288 100644
--- a/templates/app-nolayers/angular/package.json
+++ b/templates/app-nolayers/angular/package.json
@@ -18,12 +18,7 @@
     "@abp/ng.identity": "~5.3.0-rc.3",
     "@abp/ng.setting-management": "~5.3.0-rc.3",
     "@abp/ng.tenant-management": "~5.3.0-rc.3",
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    "@abp/ng.theme.basic": "~5.3.0-rc.3",
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     "@abp/ng.theme.lepton-x": "~1.0.0-beta.2",
-    //</TEMPLATE-REMOVE>
     "@abp/ng.theme.shared": "~5.3.0-rc.3",
     "@angular/animations": "~13.1.1",
     "@angular/common": "~13.1.1",
@@ -36,9 +31,7 @@
     "@angular/router": "~13.1.1",
     "rxjs": "~6.6.0",
     "tslib": "^2.1.0",
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     "bootstrap-icons": "~1.8.3",
-    //</TEMPLATE-REMOVE>
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
diff --git a/templates/app-nolayers/angular/src/app/app.module.ts b/templates/app-nolayers/angular/src/app/app.module.ts
index 60dd139eca..159bc14f4d 100644
--- a/templates/app-nolayers/angular/src/app/app.module.ts
+++ b/templates/app-nolayers/angular/src/app/app.module.ts
@@ -4,13 +4,8 @@ import { registerLocale } from '@abp/ng.core/locale';
 import { IdentityConfigModule } from '@abp/ng.identity/config';
 import { SettingManagementConfigModule } from '@abp/ng.setting-management/config';
 import { TenantManagementConfigModule } from '@abp/ng.tenant-management/config';
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-import { ThemeBasicModule } from '@abp/ng.theme.basic';
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 import { ThemeLeptonXModule } from '@abp/ng.theme.lepton-x';
 import { SideMenuLayoutModule } from '@abp/ng.theme.lepton-x/layouts';
-//</TEMPLATE-REMOVE>
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
@@ -34,13 +29,8 @@ import { APP_ROUTE_PROVIDER } from './route.provider';
     IdentityConfigModule.forRoot(),
     TenantManagementConfigModule.forRoot(),
     SettingManagementConfigModule.forRoot(),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    ThemeBasicModule.forRoot(),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     ThemeLeptonXModule.forRoot(),
     SideMenuLayoutModule.forRoot(),
-    //</TEMPLATE-REMOVE>
   ],
   declarations: [AppComponent],
   providers: [APP_ROUTE_PROVIDER],
diff --git a/templates/app-nolayers/angular/src/styles.scss b/templates/app-nolayers/angular/src/styles.scss
index c452d8d0ba..dbc4332587 100644
--- a/templates/app-nolayers/angular/src/styles.scss
+++ b/templates/app-nolayers/angular/src/styles.scss
@@ -25,10 +25,8 @@
   }
 }
 
-+//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 :root {
   --lpx-logo: url('/assets/images/logo.png');
   --lpx-logo-icon: url('/assets/images/logo-icon.png');
   --lpx-brand: #edae53;
-} 
-//</TEMPLATE-REMOVE>
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
index ddb4576748..78ed324a23 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
@@ -11,10 +11,8 @@
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.4" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
     <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
@@ -71,12 +69,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.MongoDB\Volo.Abp.AuditLogging.MongoDB.csproj" />
   </ItemGroup>
-  <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
-  </ItemGroup>
-  <!--</TEMPLATE-REMOVE>-->
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
   </ItemGroup>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs
index 2cf2a6a58a..5c7a409754 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs
@@ -8,18 +8,10 @@ using MyCompanyName.MyProjectName.Menus;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
 using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
@@ -67,14 +59,8 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAutoMapperModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
 
     // Account module packages
     typeof(AbpAccountApplicationModule),
@@ -178,28 +164,6 @@ public class MyProjectNameModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            // MVC UI
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-
-            //BLAZOR UI
-            options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/blazor-global-styles.css");
-                    //You can remove the following line if you don't use Blazor CSS isolation for components
-                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             // MVC UI
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
@@ -219,7 +183,6 @@ public class MyProjectNameModule : AbpModule
                     bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
     }
 
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Pages/_Host.cshtml b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Pages/_Host.cshtml
index d07b29860f..88b72298ab 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Pages/_Host.cshtml
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Pages/_Host.cshtml
@@ -1,14 +1,8 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
 @using System.Globalization
-@*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
-@*</TEMPLATE-REMOVE>*@
-@*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
 @using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
 @using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
-@*</TEMPLATE-REMOVE>*@
 @using Volo.Abp.Localization
 @{
     Layout = null;
@@ -23,20 +17,11 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
 
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global"/>
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
     <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global"/>
-    @*</TEMPLATE-REMOVE>*@
 </head>
 <body class="abp-application-layout bg-light @rtl">
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <component type="typeof(Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic.App)" render-mode="Server" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
-    <component type="typeof(Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite.App)" render-mode="Server" />
-    @*</TEMPLATE-REMOVE>*@
+
+    <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">
         <environment include="Staging,Production">
@@ -49,11 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
     <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
-    @*</TEMPLATE-REMOVE>*@
 </body>
 </html>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index 0069f3aa1c..d31420a423 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -11,10 +11,8 @@
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.4" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
     <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
@@ -72,12 +70,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.csproj" />
   </ItemGroup>
-  <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
-  </ItemGroup>
-  <!--</TEMPLATE-REMOVE>-->
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
   </ItemGroup>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs
index df47a65f08..f43087b6f6 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs
@@ -8,18 +8,10 @@ using MyCompanyName.MyProjectName.Menus;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
 using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
@@ -68,14 +60,8 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpEntityFrameworkCoreSqlServerModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     
     // Account module packages
     typeof(AbpAccountApplicationModule),
@@ -179,28 +165,6 @@ public class MyProjectNameModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            // MVC UI
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-
-            //BLAZOR UI
-            options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/blazor-global-styles.css");
-                    //You can remove the following line if you don't use Blazor CSS isolation for components
-                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             // MVC UI
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
@@ -220,7 +184,6 @@ public class MyProjectNameModule : AbpModule
                     bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
     }
 
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
index d07b29860f..88b72298ab 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
@@ -1,14 +1,8 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
 @using System.Globalization
-@*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
-@*</TEMPLATE-REMOVE>*@
-@*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
 @using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
 @using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
-@*</TEMPLATE-REMOVE>*@
 @using Volo.Abp.Localization
 @{
     Layout = null;
@@ -23,20 +17,11 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
 
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global"/>
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
     <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global"/>
-    @*</TEMPLATE-REMOVE>*@
 </head>
 <body class="abp-application-layout bg-light @rtl">
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <component type="typeof(Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic.App)" render-mode="Server" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
-    <component type="typeof(Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite.App)" render-mode="Server" />
-    @*</TEMPLATE-REMOVE>*@
+
+    <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">
         <environment include="Staging,Production">
@@ -49,11 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
     <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
-    @*</TEMPLATE-REMOVE>*@
 </body>
 </html>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
index 1b0c58fd03..a0df0cb4f4 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
@@ -9,9 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
@@ -68,11 +66,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.MongoDB\Volo.Abp.AuditLogging.MongoDB.csproj" />
   </ItemGroup>
-  <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-  </ItemGroup>
-  <!--</TEMPLATE-REMOVE>-->
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
   </ItemGroup>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs
index 5be8088d9d..34d53c5814 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs
@@ -9,14 +9,8 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.MongoDB;
@@ -61,12 +55,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAutoMapperModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     
     // Account module packages
     typeof(AbpAccountApplicationModule),
@@ -175,16 +164,6 @@ public class MyProjectNameModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
@@ -192,7 +171,6 @@ public class MyProjectNameModule : AbpModule
                     bundle.AddFiles("/global-styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
     }
 
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
index e08fe4e8dd..c722be51ea 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
@@ -9,9 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
@@ -69,11 +67,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.csproj" />
   </ItemGroup>
-  <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-  </ItemGroup>
-  <!--</TEMPLATE-REMOVE>-->
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
   </ItemGroup>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs
index c87444acc0..e78a1b0f08 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs
@@ -9,14 +9,8 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
@@ -62,12 +56,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpEntityFrameworkCoreSqlServerModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
 
     // Account module packages
     typeof(AbpAccountApplicationModule),
@@ -177,16 +166,6 @@ public class MyProjectNameModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
@@ -194,7 +173,6 @@ public class MyProjectNameModule : AbpModule
                     bundle.AddFiles("/global-styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
     }
 
diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json
index d80378679b..0acedfe5c4 100644
--- a/templates/app/angular/angular.json
+++ b/templates/app/angular/angular.json
@@ -65,9 +65,7 @@
                 "inject": true,
                 "bundleName": "bootstrap-ltr.min"
               },
-              //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
               "node_modules/bootstrap-icons/font/bootstrap-icons.css",
-              //</TEMPLATE-REMOVE>
               "src/styles.scss"
             ],
             "scripts": []
diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json
index 4e33baed11..6a218b669c 100644
--- a/templates/app/angular/package.json
+++ b/templates/app/angular/package.json
@@ -18,12 +18,7 @@
     "@abp/ng.identity": "~5.3.0-rc.3",
     "@abp/ng.setting-management": "~5.3.0-rc.3",
     "@abp/ng.tenant-management": "~5.3.0-rc.3",
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    "@abp/ng.theme.basic": "~5.3.0-rc.3",
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     "@abp/ng.theme.lepton-x": "~1.0.0-beta.2",
-    //</TEMPLATE-REMOVE>
     "@abp/ng.theme.shared": "~5.3.0-rc.3",
     "@angular/animations": "~13.3.3",
     "@angular/common": "~13.3.3",
@@ -36,9 +31,7 @@
     "@angular/router": "~13.3.3",
     "rxjs": "~6.6.0",
     "tslib": "^2.1.0",
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     "bootstrap-icons": "~1.8.3",
-    //</TEMPLATE-REMOVE>
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
diff --git a/templates/app/angular/src/app/app.module.ts b/templates/app/angular/src/app/app.module.ts
index 60dd139eca..159bc14f4d 100644
--- a/templates/app/angular/src/app/app.module.ts
+++ b/templates/app/angular/src/app/app.module.ts
@@ -4,13 +4,8 @@ import { registerLocale } from '@abp/ng.core/locale';
 import { IdentityConfigModule } from '@abp/ng.identity/config';
 import { SettingManagementConfigModule } from '@abp/ng.setting-management/config';
 import { TenantManagementConfigModule } from '@abp/ng.tenant-management/config';
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-import { ThemeBasicModule } from '@abp/ng.theme.basic';
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 import { ThemeLeptonXModule } from '@abp/ng.theme.lepton-x';
 import { SideMenuLayoutModule } from '@abp/ng.theme.lepton-x/layouts';
-//</TEMPLATE-REMOVE>
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
@@ -34,13 +29,8 @@ import { APP_ROUTE_PROVIDER } from './route.provider';
     IdentityConfigModule.forRoot(),
     TenantManagementConfigModule.forRoot(),
     SettingManagementConfigModule.forRoot(),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    ThemeBasicModule.forRoot(),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     ThemeLeptonXModule.forRoot(),
     SideMenuLayoutModule.forRoot(),
-    //</TEMPLATE-REMOVE>
   ],
   declarations: [AppComponent],
   providers: [APP_ROUTE_PROVIDER],
diff --git a/templates/app/angular/src/styles.scss b/templates/app/angular/src/styles.scss
index 546daff149..14d29fc69b 100644
--- a/templates/app/angular/src/styles.scss
+++ b/templates/app/angular/src/styles.scss
@@ -25,10 +25,8 @@
   }
 }
     
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 :root {
   --lpx-logo: url('/assets/images/logo.png');
   --lpx-logo-icon: url('/assets/images/logo-icon.png');
   --lpx-brand: #edae53;
-} 
-//</TEMPLATE-REMOVE>
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
index f85af55de6..1e851ca7e7 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
@@ -34,17 +34,12 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" />
-    <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <!--</TEMPLATE-REMOVE>-->
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Web.OpenIddict\Volo.Abp.Account.Web.OpenIddict.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Application\Volo.Abp.Account.Application.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs
index 050001168e..af4aeb7f57 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs
@@ -17,14 +17,8 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Auditing;
@@ -46,12 +40,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAccountWebOpenIddictModule),
     typeof(AbpAccountApplicationModule),
     typeof(AbpAccountHttpApiModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     typeof(MyProjectNameEntityFrameworkCoreModule),
     typeof(AbpAspNetCoreSerilogModule)
     )]
@@ -106,16 +95,6 @@ public class MyProjectNameAuthServerModule : AbpModule
 
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
@@ -123,7 +102,6 @@ public class MyProjectNameAuthServerModule : AbpModule
                     bundle.AddFiles("/global-styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
 
         Configure<AbpAuditingOptions>(options =>
@@ -141,7 +119,6 @@ public class MyProjectNameAuthServerModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAccountWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAccountWebOpenIddictModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web.OpenIddict", Path.DirectorySeparatorChar)));
                 //</TEMPLATE-REMOVE>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
index 6512d620a9..6cdbe71a1d 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
@@ -18,10 +18,8 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
@@ -30,10 +28,6 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.Client\Volo.Abp.AspNetCore.Mvc.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.Web\Volo.Abp.Http.Client.IdentityModel.Web.csproj" />
-    <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
-    <!--</TEMPLATE-REMOVE>-->
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs
index 5c7345fb73..1287dc2d11 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs
@@ -17,18 +17,10 @@ using MyCompanyName.MyProjectName.MultiTenancy;
 using StackExchange.Redis;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.OpenIdConnect;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
 using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc.Client;
 using Volo.Abp.AspNetCore.Mvc.Localization;
@@ -64,14 +56,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered;
     typeof(AbpAspNetCoreMvcClientModule),
     typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule),
     typeof(AbpHttpClientIdentityModelWebModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     typeof(AbpAutofacModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
@@ -134,28 +120,6 @@ public class MyProjectNameBlazorModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            // MVC UI
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-
-            //BLAZOR UI
-            options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/blazor-global-styles.css");
-                    //You can remove the following line if you don't use Blazor CSS isolation for components
-                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.Tiered.styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             // MVC UI
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
@@ -175,7 +139,6 @@ public class MyProjectNameBlazorModule : AbpModule
                     bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.Tiered.styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
     }
 
@@ -228,7 +191,6 @@ public class MyProjectNameBlazorModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiMultiTenancyModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar)));
                 //options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
                 //options.FileSets.ReplaceEmbeddedByPhysical<AbpFeatureManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar)));
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml
index 7259b3a5bc..99c69585b8 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml
@@ -1,14 +1,8 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered.Pages
 @using System.Globalization
-@*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
-@*</TEMPLATE-REMOVE>*@
-@*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
 @using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
 @using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
-@*</TEMPLATE-REMOVE>*@
 @using Volo.Abp.Localization
 @{
     Layout = null;
@@ -22,21 +16,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
-
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global"/>
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
+    
     <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global"/>
-    @*</TEMPLATE-REMOVE>*@
 </head>
 <body class="abp-application-layout bg-light @rtl">
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <component type="typeof(Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic.App)" render-mode="Server" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
-    <component type="typeof(Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite.App)" render-mode="Server" />
-    @*</TEMPLATE-REMOVE>*@
+
+    <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">
         <environment include="Staging,Production">
@@ -49,11 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
     <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
-    @*</TEMPLATE-REMOVE>*@
 </body>
 </html>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index 7614781aba..34148983e3 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -17,20 +17,14 @@
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.4" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
-    <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
-    <!--</TEMPLATE-REMOVE>-->
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs
index b882032a13..9f2084edb8 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs
@@ -13,18 +13,10 @@ using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
 using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
@@ -57,14 +49,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server;
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpAccountWebOpenIddictModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     typeof(AbpIdentityBlazorServerModule),
     typeof(AbpTenantManagementBlazorServerModule),
     typeof(AbpSettingManagementBlazorServerModule)
@@ -126,28 +112,6 @@ public class MyProjectNameBlazorModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            // MVC UI
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-
-            //BLAZOR UI
-            options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/blazor-global-styles.css");
-                    //You can remove the following line if you don't use Blazor CSS isolation for components
-                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
             // MVC UI
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
@@ -167,7 +131,6 @@ public class MyProjectNameBlazorModule : AbpModule
                     bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
     }
 
@@ -182,7 +145,6 @@ public class MyProjectNameBlazorModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiMultiTenancyModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar)));
                 //options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
                 //options.FileSets.ReplaceEmbeddedByPhysical<AbpFeatureManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar)));
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
index c68c05426b..a61ceaef9a 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
@@ -1,14 +1,8 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
 @using System.Globalization
-@*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
-@*</TEMPLATE-REMOVE>*@
-@*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
 @using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
 @using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
-@*</TEMPLATE-REMOVE>*@
 @using Volo.Abp.Localization
 @{
     Layout = null;
@@ -23,20 +17,11 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
     
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
     <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global" />
-    @*</TEMPLATE-REMOVE>*@
 </head>
 <body class="abp-application-layout bg-light @rtl">
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <component type="typeof(Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic.App)" render-mode="Server" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
-    <component type="typeof(Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite.App)" render-mode="Server" />
-    @*</TEMPLATE-REMOVE>*@
+
+    <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">
         <environment include="Staging,Production">
@@ -49,11 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    @*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
-    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
-    @*</TEMPLATE-REMOVE>*@
-    @*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
     <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
-    @*</TEMPLATE-REMOVE>*@
 </body>
 </html>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
index b0a7975a3f..6e7df9f7aa 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@@ -15,16 +15,11 @@
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj" />
-    <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
index 27b3212532..338ae879b8 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
@@ -8,14 +8,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Blazor.Menus;
 using OpenIddict.Abstractions;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic;
-using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme;
 using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.Autofac.WebAssembly;
 using Volo.Abp.AutoMapper;
@@ -31,12 +25,7 @@ namespace MyCompanyName.MyProjectName.Blazor;
 [DependsOn(
     typeof(AbpAutofacWebAssemblyModule),
     typeof(MyProjectNameHttpApiClientModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     typeof(AbpIdentityBlazorWebAssemblyModule),
     typeof(AbpTenantManagementBlazorWebAssemblyModule),
     typeof(AbpSettingManagementBlazorWebAssemblyModule)
@@ -97,12 +86,7 @@ public class MyProjectNameBlazorModule : AbpModule
 
     private static void ConfigureUI(WebAssemblyHostBuilder builder)
     {
-        //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-        builder.RootComponents.Add<Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic.App>("#ApplicationContainer");
-        //</TEMPLATE-REMOVE>
-        //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
-        builder.RootComponents.Add<Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite.App>("#ApplicationContainer");
-        //</TEMPLATE-REMOVE>
+        builder.RootComponents.Add<App>("#ApplicationContainer");
 
     }
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
index e0452867c4..bf35c4141b 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj
@@ -12,14 +12,9 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-    <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <!--</TEMPLATE-REMOVE>-->
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Web.OpenIddict\Volo.Abp.Account.Web.OpenIddict.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
index 843796c5f3..6067d4a70a 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
@@ -9,14 +9,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MyCompanyName.MyProjectName.EntityFrameworkCore;
 using MyCompanyName.MyProjectName.MultiTenancy;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Microsoft.OpenApi.Models;
 using Volo.Abp;
 using Volo.Abp.Account;
@@ -41,12 +35,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAspNetCoreMultiTenancyModule),
     typeof(MyProjectNameApplicationModule),
     typeof(MyProjectNameEntityFrameworkCoreModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     typeof(AbpAccountWebOpenIddictModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpSwashbuckleModule)
@@ -84,16 +73,6 @@ public class MyProjectNameHttpApiHostModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
@@ -101,7 +80,6 @@ public class MyProjectNameHttpApiHostModule : AbpModule
                     bundle.AddFiles("/global-styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
     }
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
index b6be600958..757ae14fc3 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
@@ -18,9 +18,7 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
@@ -29,9 +27,6 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.Client\Volo.Abp.AspNetCore.Mvc.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.Web\Volo.Abp.Http.Client.Web.csproj" />
-    <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <!--</TEMPLATE-REMOVE>-->
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.Web\Volo.Abp.Http.Client.IdentityModel.Web.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
index 711ed33505..2e3d4d30e4 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
@@ -19,14 +19,8 @@ using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
 using Volo.Abp.AspNetCore.Serilog;
@@ -56,12 +50,7 @@ namespace MyCompanyName.MyProjectName.Web;
     typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule),
     typeof(AbpAspNetCoreMvcClientModule),
     typeof(AbpHttpClientWebModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     typeof(AbpAutofacModule),
     typeof(AbpCachingStackExchangeRedisModule),
     typeof(AbpSettingManagementWebModule),
@@ -107,7 +96,6 @@ public class MyProjectNameWebModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
@@ -115,16 +103,6 @@ public class MyProjectNameWebModule : AbpModule
                     bundle.AddFiles("/global-styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
         });
     }
 
@@ -203,7 +181,6 @@ public class MyProjectNameWebModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpIdentityWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar)));
                 //</TEMPLATE-REMOVE>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
index e0579503cd..62adf04842 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
@@ -33,18 +33,13 @@
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
-    <!--</TEMPLATE-REMOVE>-->
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
-    <!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <!--</TEMPLATE-REMOVE>-->
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
index 332d2bcb75..627754e5e1 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -18,14 +18,8 @@ using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
-//<TEMPLATE-REMOVE IF-NOT='BASIC'>
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
-//</TEMPLATE-REMOVE>
-//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-//</TEMPLATE-REMOVE>
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
@@ -53,12 +47,7 @@ namespace MyCompanyName.MyProjectName.Web;
     typeof(AbpIdentityWebModule),
     typeof(AbpSettingManagementWebModule),
     typeof(AbpAccountWebModule),
-    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    //</TEMPLATE-REMOVE>
-    //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    //</TEMPLATE-REMOVE>
     typeof(AbpTenantManagementWebModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpSwashbuckleModule)
@@ -107,16 +96,6 @@ public class MyProjectNameWebModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
-            options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle =>
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
-            );
-            //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
@@ -124,7 +103,6 @@ public class MyProjectNameWebModule : AbpModule
                     bundle.AddFiles("/global-styles.css");
                 }
             );
-            //</TEMPLATE-REMOVE>
         });
     }
 
@@ -147,7 +125,6 @@ public class MyProjectNameWebModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiMultiTenancyModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpFeatureManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar)));