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 0a7e7306cd..ddb4576748 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,6 +11,10 @@
     <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>
@@ -67,12 +71,12 @@
   <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 714141e25a..2cf2a6a58a 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,14 +8,22 @@ 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;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.MongoDB;
 using Volo.Abp.Autofac;
@@ -59,8 +67,14 @@ 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),
@@ -164,6 +178,7 @@ public class MyProjectNameModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
+            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
             // MVC UI
             options.StyleBundles.Configure(
                 BasicThemeBundles.Styles.Global,
@@ -183,6 +198,28 @@ public class MyProjectNameModule : AbpModule
                     bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
                 }
             );
+            //</TEMPLATE-REMOVE>
+            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
+            // MVC UI
+            options.StyleBundles.Configure(
+                LeptonXLiteThemeBundles.Styles.Global,
+                bundle =>
+                {
+                    bundle.AddFiles("/global-styles.css");
+                }
+            );
+
+            //BLAZOR UI
+            options.StyleBundles.Configure(
+                BlazorLeptonXLiteThemeBundles.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>
         });
     }
 
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 f72161d5d4..d07b29860f 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,8 +1,14 @@
 @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;
@@ -17,10 +23,20 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
 
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
+    @*<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">
-    <component type="typeof(App)" render-mode="Server" />
+    @*<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>*@
 
     <div id="blazor-error-ui">
         <environment include="Staging,Production">
@@ -33,6 +49,11 @@
         <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.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json
index 4e18681ce6..63e0faa480 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json
@@ -3,7 +3,9 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
+    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
     "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0-rc.3",
     "@abp/aspnetcore.components.server.basictheme": "^5.3.0-rc.3"
+    //</TEMPLATE-REMOVE>
   }
 }
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 ee53dbd329..0069f3aa1c 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,6 +11,10 @@
     <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>
@@ -68,12 +72,12 @@
   <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 68f79c9fad..df47a65f08 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,14 +8,22 @@ 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;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
@@ -60,9 +68,15 @@ 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),
     typeof(AbpAccountHttpApiModule),
@@ -165,6 +179,7 @@ public class MyProjectNameModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
+            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
             // MVC UI
             options.StyleBundles.Configure(
                 BasicThemeBundles.Styles.Global,
@@ -184,6 +199,28 @@ public class MyProjectNameModule : AbpModule
                     bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
                 }
             );
+            //</TEMPLATE-REMOVE>
+            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
+            // MVC UI
+            options.StyleBundles.Configure(
+                LeptonXLiteThemeBundles.Styles.Global,
+                bundle =>
+                {
+                    bundle.AddFiles("/global-styles.css");
+                }
+            );
+
+            //BLAZOR UI
+            options.StyleBundles.Configure(
+                BlazorLeptonXLiteThemeBundles.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>
         });
     }
 
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 f72161d5d4..d07b29860f 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,8 +1,14 @@
 @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;
@@ -17,10 +23,20 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
 
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
+    @*<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">
-    <component type="typeof(App)" render-mode="Server" />
+    @*<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>*@
 
     <div id="blazor-error-ui">
         <environment include="Staging,Production">
@@ -33,6 +49,11 @@
         <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/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json
index 4e18681ce6..63e0faa480 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json
@@ -3,7 +3,9 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
+    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
     "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0-rc.3",
     "@abp/aspnetcore.components.server.basictheme": "^5.3.0-rc.3"
+    //</TEMPLATE-REMOVE>
   }
 }
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 acc37e1b83..1b0c58fd03 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,6 +9,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>-->
   </ItemGroup>
 
   <ItemGroup>
@@ -65,11 +68,11 @@
   <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 6a8a0d533a..5be8088d9d 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,8 +9,14 @@ 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;
@@ -55,8 +61,13 @@ 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),
     typeof(AbpAccountHttpApiModule),
@@ -164,6 +175,7 @@ public class MyProjectNameModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
+            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
             options.StyleBundles.Configure(
                 BasicThemeBundles.Styles.Global,
                 bundle =>
@@ -171,6 +183,16 @@ public class MyProjectNameModule : AbpModule
                     bundle.AddFiles("/global-styles.css");
                 }
             );
+            //</TEMPLATE-REMOVE>
+            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
+            options.StyleBundles.Configure(
+                LeptonXLiteThemeBundles.Styles.Global,
+                bundle =>
+                {
+                    bundle.AddFiles("/global-styles.css");
+                }
+            );
+            //</TEMPLATE-REMOVE>
         });
     }
 
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json
index 275f57d06b..263833a245 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json
@@ -3,6 +3,8 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
+    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
     "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.0-rc.3"
+    //</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 1d584562a0..e08fe4e8dd 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,6 +9,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>-->
   </ItemGroup>
 
   <ItemGroup>
@@ -66,11 +69,11 @@
   <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 03833bdbf8..c87444acc0 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs
@@ -9,8 +9,14 @@ 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;
@@ -56,7 +62,12 @@ 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),
@@ -166,6 +177,7 @@ public class MyProjectNameModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
+            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
             options.StyleBundles.Configure(
                 BasicThemeBundles.Styles.Global,
                 bundle =>
@@ -173,6 +185,16 @@ public class MyProjectNameModule : AbpModule
                     bundle.AddFiles("/global-styles.css");
                 }
             );
+            //</TEMPLATE-REMOVE>
+            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
+            options.StyleBundles.Configure(
+                LeptonXLiteThemeBundles.Styles.Global,
+                bundle =>
+                {
+                    bundle.AddFiles("/global-styles.css");
+                }
+            );
+            //</TEMPLATE-REMOVE>
         });
     }
 
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json
index 275f57d06b..263833a245 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json
@@ -3,6 +3,8 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
+    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
     "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.0-rc.3"
+    //</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 38f6ce05f3..6512d620a9 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
@@ -20,6 +20,7 @@
     <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>
 
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 7ae065886c..5c7345fb73 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
@@ -26,6 +26,8 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 //<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;
@@ -68,6 +70,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered;
     //</TEMPLATE-REMOVE>
     //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     //</TEMPLATE-REMOVE>
     typeof(AbpAutofacModule),
     typeof(AbpSwashbuckleModule),
@@ -155,7 +158,7 @@ public class MyProjectNameBlazorModule : AbpModule
             //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             // MVC UI
             options.StyleBundles.Configure(
-                BlazorLeptonXLiteThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json
index 4e18681ce6..63e0faa480 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json
@@ -3,7 +3,9 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
+    //<TEMPLATE-REMOVE IF-NOT='BASIC'>
     "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0-rc.3",
     "@abp/aspnetcore.components.server.basictheme": "^5.3.0-rc.3"
+    //</TEMPLATE-REMOVE>
   }
 }
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 f9b570e968..7614781aba 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
@@ -19,6 +19,7 @@
     <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>
 
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 82de8b4236..778cf63d72 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
@@ -22,6 +22,8 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 //<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;
@@ -61,6 +63,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server;
     //</TEMPLATE-REMOVE>
     //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
     typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     //</TEMPLATE-REMOVE>
     typeof(AbpIdentityBlazorServerModule),
     typeof(AbpTenantManagementBlazorServerModule),
@@ -147,7 +150,7 @@ public class MyProjectNameBlazorModule : AbpModule
             //<TEMPLATE-REMOVE IF-NOT='BASIC'>
             // MVC UI
             options.StyleBundles.Configure(
-                BlazorLeptonXLiteThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
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 43b2a82c42..332d2bcb75 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -107,18 +107,18 @@ public class MyProjectNameWebModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
+            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
             options.StyleBundles.Configure(
-                LeptonXLiteThemeBundles.Styles.Global,
+                BasicThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
                 }
             );
             //</TEMPLATE-REMOVE>
-            //<TEMPLATE-REMOVE IF-NOT='BASIC'>
+            //<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");