refactor: migrate Blazor project from LeptonXLite theme to MudBlazor theme

framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor

@@ -112,14 +112,7 @@
                                             }
                                             else
                                             {
-                                                if (column.DisplayFormat == null)
+                                                @((MarkupString)GetConvertedFieldValue(propertyValue, column))
-                                                {
-                                                    @(propertyValue)
-                                                }
-                                                else
-                                                {
-                                                    @(string.Format(column.DisplayFormatProvider, column.DisplayFormat, propertyValue))
-                                                }
                                             }
                                         }
                                     }

framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -85,6 +86,43 @@ public partial class AbpMudExtensibleDataGrid<TItem> : ComponentBase
         return convertedValue;
     }
 
+    protected virtual string GetConvertedFieldValue(object? value, TableColumn columnDefinition)
+    {
+        if (value is DateTime dateTime)
+        {
+            var converted = Clock.ConvertToUserTime(dateTime);
+            if (!columnDefinition.DisplayFormat.IsNullOrEmpty())
+            {
+                return string.Format(columnDefinition.DisplayFormatProvider, columnDefinition.DisplayFormat!, converted);
+            }
+
+            return converted.ToString(columnDefinition.DisplayFormatProvider as CultureInfo ?? CultureInfo.CurrentCulture);
+        }
+
+        if (value is DateTimeOffset dateTimeOffset)
+        {
+            var converted = Clock.ConvertToUserTime(dateTimeOffset);
+            if (!columnDefinition.DisplayFormat.IsNullOrEmpty())
+            {
+                return string.Format(columnDefinition.DisplayFormatProvider, columnDefinition.DisplayFormat!, converted);
+            }
+
+            return converted.ToString(columnDefinition.DisplayFormatProvider as CultureInfo ?? CultureInfo.CurrentCulture);
+        }
+
+        if (value == null)
+        {
+            return string.Empty;
+        }
+
+        if (!columnDefinition.DisplayFormat.IsNullOrEmpty())
+        {
+            return string.Format(columnDefinition.DisplayFormatProvider, columnDefinition.DisplayFormat!, value);
+        }
+
+        return value.ToString() ?? string.Empty;
+    }
+
     protected virtual object GetPropertyValue(TItem item, string propertyPath)
     {
         ArgumentNullException.ThrowIfNull(item);

framework/src/Volo.Abp.MudBlazorUI/Components/UiNotificationAlert.razor

@@ -1,3 +1 @@
 @using MudBlazor
-
-<MudSnackbarProvider />

modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor

@@ -36,8 +36,7 @@
                 {
                     <MudForm @ref="@_personalInfoForm" Model="@PersonalInfoModel">
                         <MudTextField @bind-Value="@PersonalInfoModel.UserName"
-                                     Label="@L["DisplayName:UserName"]"
+                                     Label="@L["DisplayName:UserName"]" />
-                                     Disabled="true" />
                         <MudGrid>
                             <MudItem xs="12" sm="6">
                                 <MudTextField @bind-Value="@PersonalInfoModel.Name"

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor

@@ -5,8 +5,10 @@
 @using global::Localization.Resources.AbpUi
 @using Microsoft.AspNetCore.Components.Authorization
 @using Volo.Abp.UI.Navigation
+@implements IDisposable
 @inject ICurrentUser CurrentUser
 @inject ICurrentTenant CurrentTenant
+@inject NavigationManager Navigation
 @inject IStringLocalizer<AbpUiResource> L
 
 <AuthorizeView>
@@ -35,20 +37,3 @@
         <MudButton Variant="Variant.Text" Href="Account/Login">@L["Login"]</MudButton>
     </NotAuthorized>
 </AuthorizeView>
-
-@code {
-    [Inject] protected NavigationManager Navigation { get; set; } = default!;
-    [Inject] protected IMenuManager MenuManager { get; set; } = default!;
-
-    protected ApplicationMenu? Menu { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        Menu = await MenuManager.GetAsync(StandardMenus.User);
-    }
-
-    protected void Logout()
-    {
-        Navigation.NavigateTo("/Account/Logout", forceLoad: true);
-    }
-}

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Routing;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Themes.Basic;
+
+public partial class LoginDisplay : IDisposable
+{
+    [Inject]
+    protected IMenuManager MenuManager { get; set; }
+
+    protected ApplicationMenu Menu { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        Menu = await MenuManager.GetAsync(StandardMenus.User);
+
+        Navigation.LocationChanged += OnLocationChanged;
+    }
+
+    protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e)
+    {
+        InvokeAsync(StateHasChanged);
+    }
+
+    public void Dispose()
+    {
+        Navigation.LocationChanged -= OnLocationChanged;
+    }
+}

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor

@@ -1,30 +0,0 @@
-@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Components
-@using Volo.Abp.Users
-@using MudBlazor
-@using Microsoft.Extensions.Localization
-@using global::Localization.Resources.AbpUi
-@using Volo.Abp.DependencyInjection
-@inject ICurrentUser CurrentUser
-@inject IStringLocalizer<AbpUiResource> L
-
-@if (CurrentUser.IsAuthenticated)
-{
-    <MudMenu Icon="@Icons.Material.Filled.AccountCircle">
-        <MudMenuItem Href="/Account/Manage">@L["MyAccount"]</MudMenuItem>
-        <MudDivider />
-        <MudMenuItem OnClick="@Logout">@L["Logout"]</MudMenuItem>
-    </MudMenu>
-}
-else
-{
-    <MudButton Variant="Variant.Text" Href="/Account/Login">@L["Login"]</MudButton>
-}
-
-@code {
-    [Inject] protected NavigationManager NavigationManager { get; set; } = default!;
-
-    protected void Logout()
-    {
-        NavigationManager.NavigateTo("/Account/Logout", forceLoad: true);
-    }
-}

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor.Bundling\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor.Bundling.csproj" />
     </ItemGroup>
 
 </Project>

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor

@@ -4,9 +4,9 @@
 @using Microsoft.Extensions.Options
 @using Microsoft.JSInterop
 @using Volo.Abp.AspNetCore.Components.Web
-@using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme
 @using Volo.Abp.AspNetCore.Components.Web.Security
 @using Volo.Abp.UI.Navigation
+@implements IDisposable
 @inherits AbpComponentBase
 @inject IJSRuntime JsRuntime
 @inject NavigationManager Navigation
@@ -31,43 +31,14 @@
             {
                 @foreach (var menuItem in Menu.Items)
                 {
-                    <MudMenuItem Href="@menuItem.Url?.TrimStart('/', '~')" Target="@menuItem.Target">@menuItem.DisplayName</MudMenuItem>
+                    <MudMenuItem OnClick="@(() => NavigateToAsync(menuItem.Url, menuItem.Target))">@menuItem.DisplayName</MudMenuItem>
                 }
             }
             <MudDivider />
-            <MudMenuItem OnClick="Logout">@UiLocalizer["Logout"]</MudMenuItem>
+            <MudMenuItem OnClick="BeginSignOut">@UiLocalizer["Logout"]</MudMenuItem>
         </MudMenu>
     </Authorized>
     <NotAuthorized>
         <MudButton Variant="Variant.Text" Href="@AuthenticationOptions.Value.LoginUrl">@UiLocalizer["Login"]</MudButton>
     </NotAuthorized>
 </AuthorizeView>
-
-@code {
-    [Inject] protected IMenuManager MenuManager { get; set; } = default!;
-    [Inject] protected ApplicationConfigurationChangedService ApplicationConfigurationChangedService { get; set; } = default!;
-
-    protected ApplicationMenu? Menu { get; set; }
-
-    protected async override Task OnInitializedAsync()
-    {
-        Menu = await MenuManager.GetAsync(StandardMenus.User);
-        ApplicationConfigurationChangedService.Changed += ApplicationConfigurationChanged;
-    }
-
-    private async void ApplicationConfigurationChanged()
-    {
-        Menu = await MenuManager.GetAsync(StandardMenus.User);
-        await InvokeAsync(StateHasChanged);
-    }
-
-    public void Dispose()
-    {
-        ApplicationConfigurationChangedService.Changed -= ApplicationConfigurationChanged;
-    }
-
-    protected void Logout()
-    {
-        Navigation.NavigateTo("/Account/Logout", forceLoad: true);
-    }
-}

modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using Microsoft.JSInterop;
+using Volo.Abp.AspNetCore.Components.Web.Security;
+using Volo.Abp.UI.Navigation;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Themes.Basic;
+
+public partial class LoginDisplay : IDisposable
+{
+    [Inject]
+    protected IMenuManager MenuManager { get; set; }
+
+    [Inject]
+    protected ApplicationConfigurationChangedService ApplicationConfigurationChangedService { get; set; }
+
+    protected ApplicationMenu Menu { get; set; }
+
+    protected async override Task OnInitializedAsync()
+    {
+        Menu = await MenuManager.GetAsync(StandardMenus.User);
+
+        Navigation.LocationChanged += OnLocationChanged;
+
+        ApplicationConfigurationChangedService.Changed += ApplicationConfigurationChanged;
+    }
+
+    protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e)
+    {
+        InvokeAsync(StateHasChanged);
+    }
+
+    private async void ApplicationConfigurationChanged()
+    {
+        Menu = await MenuManager.GetAsync(StandardMenus.User);
+        await InvokeAsync(StateHasChanged);
+    }
+
+    public void Dispose()
+    {
+        Navigation.LocationChanged -= OnLocationChanged;
+        ApplicationConfigurationChangedService.Changed -= ApplicationConfigurationChanged;
+    }
+
+    private async Task NavigateToAsync(string uri, string target = null)
+    {
+        if (target == "_blank")
+        {
+            await JsRuntime.InvokeVoidAsync("open", uri, target);
+        }
+        else
+        {
+            Navigation.NavigateTo(uri);
+        }
+    }
+
+    private void BeginSignOut()
+    {
+        if (AbpAspNetCoreComponentsWebOptions.Value.IsBlazorWebApp)
+        {
+            Navigation.NavigateTo(AuthenticationOptions.Value.LogoutUrl, forceLoad: true);
+        }
+        else
+        {
+            Navigation.NavigateToLogout(AuthenticationOptions.Value.LogoutUrl);
+        }
+    }
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor

@@ -52,9 +52,9 @@
                                 @foreach (var permission in group.Permissions)
                                 {
                                     var depth = GetPermissionDepthOrDefault(permission.Name);
-                                    <div style="margin-left: @(depth * 20)px;">
+                                    <div style="margin-inline-start: @(depth * 20)px;">
                                         <MudCheckBox
-                                                    TValue="bool" 
+                                                    T="bool" 
                                                     Disabled="@(IsDisabledPermission(permission))"
                                                     Value="@permission.IsGranted"
                                                     ValueChanged="@(async (bool b) => await PermissionChanged(b, group, permission))"

modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs

@@ -30,8 +30,6 @@ public partial class PermissionManagementModal
     protected List<PermissionGroupDto>? _allGroups;
     protected List<PermissionGroupDto>? _groups;
 
-    protected List<PermissionGrantInfoDto> _disabledPermissions = new List<PermissionGrantInfoDto>();
-
     protected int _activeTabIndex = 0;
 
     protected bool _selectAllDisabled;
@@ -110,19 +108,6 @@ public partial class PermissionManagementModal
 
         _selectAllDisabled = _groups.All(IsPermissionGroupDisabled);
 
-        if (checkDisabledPermissions)
-        {
-            _disabledPermissions.Clear();
-        }
-
-        foreach (var permission in _groups.SelectMany(x => x.Permissions))
-        {
-            if (checkDisabledPermissions && permission.IsGranted && permission.GrantedProviders.All(x => x.ProviderName != _providerName))
-            {
-                _disabledPermissions.Add(permission);
-            }
-        }
-
         foreach (var group in _groups)
         {
             SetPermissionDepths(group.Permissions, null, 0);

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor

@@ -4,7 +4,6 @@
 
 @if (EmailSettings != null)
 {
-    <MudForm>
         <MudForm @ref="@_emailFormRef" Model="@EmailSettings">
             <MudGrid>
                 <MudItem xs="12">
@@ -60,6 +59,7 @@
                 @if (HasSendTestEmailPermission)
                 {
                     <MudButton Color="Color.Primary"
+                              Variant="Variant.Outlined"
                               OnClick="@OpenSendTestEmailDialogAsync"
                               Class="me-2">
                         @L["SendTestEmail"]
@@ -72,7 +72,6 @@
                 </MudButton>
             </MudItem>
         </MudGrid>
-    </MudForm>
 
     @if (HasSendTestEmailPermission)
     {

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/App.razor

@@ -1,8 +1,9 @@
 @using Volo.Abp.Localization
 @using System.Globalization
 @using Microsoft.Extensions.Hosting
-@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
+@using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.Theming.Bundling
+@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling
 @inject IHostEnvironment Env
 @{
     var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty;
@@ -17,7 +18,9 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="/" />
 
-    <AbpStyles BundleName="@BlazorLeptonXLiteThemeBundles.Styles.Global" />
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
+    <AbpStyles BundleName="@LeptonXLiteThemeBundles.Styles.Global" />
+    <AbpStyles BundleName="@BlazorMudBlazorBasicThemeBundles.Styles.Global" />
 
     <HeadOutlet @rendermode="InteractiveServer" />
 
@@ -26,7 +29,7 @@
 
     <Routes @rendermode="InteractiveServer" />
 
-    <AbpScripts BundleName="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
+    <AbpScripts BundleName="@BlazorMudBlazorBasicThemeBundles.Scripts.Global" />
 
     <script src="_framework/blazor.web.js"></script>
 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/Routes.razor

@@ -1,5 +1,5 @@
-@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
+@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic
-@using Volo.Abp.AspNetCore.Components.Web.Theming.Routing
+@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing
 @using Microsoft.Extensions.Options
 @inject IOptions<AbpRouterOptions> RouterOptions
 <Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Menus/MyProjectNameMenuContributor.cs

@@ -1,7 +1,7 @@
 using MyCompanyName.MyProjectName.Localization;
-using Volo.Abp.Identity.Blazor;
+using Volo.Abp.Identity.Blazor.MudBlazor;
-using Volo.Abp.SettingManagement.Blazor.Menus;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.Menus;
-using Volo.Abp.TenantManagement.Blazor.Navigation;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.Navigation;
 using Volo.Abp.UI.Navigation;
 
 namespace MyCompanyName.MyProjectName.Menus;

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj

@@ -8,8 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
   </ItemGroup>
@@ -18,11 +16,11 @@
     <!-- <TEMPLATE-REMOVE> -->
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Server.Theming\Volo.Abp.AspNetCore.Components.Server.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.csproj" />
     <!-- </TEMPLATE-REMOVE> -->
+    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme\Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.csproj" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="5.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -45,7 +43,7 @@
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.HttpApi\Volo.Abp.Identity.HttpApi.csproj" />
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.MongoDB\Volo.Abp.Identity.MongoDB.csproj" />
     <ProjectReference Include="..\..\..\..\modules\openiddict\src\Volo.Abp.OpenIddict.MongoDB\Volo.Abp.OpenIddict.MongoDB.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.Server\Volo.Abp.Identity.Blazor.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.MudBlazor.Server\Volo.Abp.Identity.Blazor.MudBlazor.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -59,21 +57,21 @@
     <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Application\Volo.Abp.TenantManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.MongoDB\Volo.Abp.TenantManagement.MongoDB.csproj" />
     <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.HttpApi\Volo.Abp.TenantManagement.HttpApi.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.Server\Volo.Abp.TenantManagement.Blazor.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.MudBlazor.Server\Volo.Abp.TenantManagement.Blazor.MudBlazor.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Application\Volo.Abp.FeatureManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.MongoDB\Volo.Abp.FeatureManagement.MongoDB.csproj" />
     <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.HttpApi\Volo.Abp.FeatureManagement.HttpApi.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Blazor.Server\Volo.Abp.FeatureManagement.Blazor.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Blazor.MudBlazor.Server\Volo.Abp.FeatureManagement.Blazor.MudBlazor.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Application\Volo.Abp.SettingManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.MongoDB\Volo.Abp.SettingManagement.MongoDB.csproj" />
     <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.HttpApi\Volo.Abp.SettingManagement.HttpApi.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.Server\Volo.Abp.SettingManagement.Blazor.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.MudBlazor.Server\Volo.Abp.SettingManagement.Blazor.MudBlazor.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs

@@ -1,5 +1,3 @@
-using Blazorise.Bootstrap5;
-using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -14,10 +12,10 @@ using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Components.Web;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
-using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
+using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
+using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
@@ -28,10 +26,10 @@ using Volo.Abp.Mapperly;
 using Volo.Abp.MongoDB;
 using Volo.Abp.Emailing;
 using Volo.Abp.FeatureManagement;
-using Volo.Abp.FeatureManagement.Blazor.Server;
+using Volo.Abp.FeatureManagement.Blazor.MudBlazor.Server;
 using Volo.Abp.FeatureManagement.MongoDB;
 using Volo.Abp.Identity;
-using Volo.Abp.Identity.Blazor.Server;
+using Volo.Abp.Identity.Blazor.MudBlazor.Server;
 using Volo.Abp.Identity.MongoDB;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
@@ -43,11 +41,11 @@ using Volo.Abp.PermissionManagement.HttpApi;
 using Volo.Abp.PermissionManagement.Identity;
 using Volo.Abp.PermissionManagement.OpenIddict;
 using Volo.Abp.SettingManagement;
-using Volo.Abp.SettingManagement.Blazor.Server;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.Server;
 using Volo.Abp.SettingManagement.MongoDB;
 using Volo.Abp.Swashbuckle;
 using Volo.Abp.TenantManagement;
-using Volo.Abp.TenantManagement.Blazor.Server;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.Server;
 using Volo.Abp.TenantManagement.MongoDB;
 using Volo.Abp.OpenIddict;
 using Volo.Abp.Security.Claims;
@@ -67,7 +65,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreComponentsServerMudBlazorBasicThemeModule),
 
     // Account module packages
     typeof(AbpAccountApplicationModule),
@@ -81,7 +79,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpIdentityHttpApiModule),
     typeof(AbpIdentityMongoDbModule),
     typeof(AbpOpenIddictMongoDbModule),
-    typeof(AbpIdentityBlazorServerModule),
+    typeof(AbpIdentityBlazorMudBlazorServerModule),
 
     // Audit logging module packages
     typeof(AbpAuditLoggingMongoDbModule),
@@ -95,19 +93,19 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpTenantManagementApplicationModule),
     typeof(AbpTenantManagementHttpApiModule),
     typeof(AbpTenantManagementMongoDbModule),
-    typeof(AbpTenantManagementBlazorServerModule),
+    typeof(AbpTenantManagementBlazorMudBlazorServerModule),
 
     // Feature Management module packages
     typeof(AbpFeatureManagementApplicationModule),
     typeof(AbpFeatureManagementMongoDbModule),
     typeof(AbpFeatureManagementHttpApiModule),
-    typeof(AbpFeatureManagementBlazorServerModule),
+    typeof(AbpFeatureManagementBlazorMudBlazorServerModule),
 
     // Setting Management module packages
     typeof(AbpSettingManagementApplicationModule),
     typeof(AbpSettingManagementMongoDbModule),
     typeof(AbpSettingManagementHttpApiModule),
-    typeof(AbpSettingManagementBlazorServerModule)
+    typeof(AbpSettingManagementBlazorMudBlazorServerModule)
 )]
 public class MyProjectNameModule : AbpModule
 {
@@ -181,7 +179,6 @@ public class MyProjectNameModule : AbpModule
         ConfigureSwaggerServices(context.Services);
         ConfigureNavigationServices();
         ConfigureAutoApiControllers();
-        ConfigureBlazorise(context);
         ConfigureRouter(context);
         ConfigureMongoDB(context);
 
@@ -221,7 +218,7 @@ public class MyProjectNameModule : AbpModule
 
             //BLAZOR UI
             options.StyleBundles.Configure(
-                BlazorLeptonXLiteThemeBundles.Styles.Global,
+                BlazorMudBlazorBasicThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/blazor-global-styles.css");
@@ -296,13 +293,6 @@ public class MyProjectNameModule : AbpModule
         );
     }
 
-    private void ConfigureBlazorise(ServiceConfigurationContext context)
-    {
-        context.Services
-            .AddBootstrap5Providers()
-            .AddFontAwesomeIcons();
-    }
-
     private void ConfigureRouter(ServiceConfigurationContext context)
     {
         Configure<AbpRouterOptions>(options =>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/_Imports.razor

@@ -8,7 +8,6 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.JSInterop
 @using MyCompanyName.MyProjectName
-@using Blazorise
+@using global::MudBlazor
-@using Blazorise.DataGrid
+@using Volo.Abp.MudBlazorUI
-@using Volo.Abp.BlazoriseUI
+@using Volo.Abp.MudBlazorUI.Components
-@using Volo.Abp.BlazoriseUI.Components

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/App.razor

@@ -1,8 +1,9 @@
 @using Volo.Abp.Localization
 @using System.Globalization
 @using Microsoft.Extensions.Hosting
-@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
+@using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.Theming.Bundling
+@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling
 @inject IHostEnvironment Env
 @{
     var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty;
@@ -17,7 +18,9 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="/" />
 
-    <AbpStyles BundleName="@BlazorLeptonXLiteThemeBundles.Styles.Global" />
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
+    <AbpStyles BundleName="@LeptonXLiteThemeBundles.Styles.Global" />
+    <AbpStyles BundleName="@BlazorMudBlazorBasicThemeBundles.Styles.Global" />
 
     <HeadOutlet @rendermode="InteractiveServer" />
 
@@ -26,7 +29,7 @@
 
     <Routes @rendermode="InteractiveServer" />
 
-    <AbpScripts BundleName="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
+    <AbpScripts BundleName="@BlazorMudBlazorBasicThemeBundles.Scripts.Global" />
 
     <script src="_framework/blazor.web.js"></script>
 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/Routes.razor

@@ -1,5 +1,5 @@
-@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
+@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic
-@using Volo.Abp.AspNetCore.Components.Web.Theming.Routing
+@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing
 @using Microsoft.Extensions.Options
 @inject IOptions<AbpRouterOptions> RouterOptions
 <Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs

@@ -1,7 +1,7 @@
 using MyCompanyName.MyProjectName.Localization;
-using Volo.Abp.Identity.Blazor;
+using Volo.Abp.Identity.Blazor.MudBlazor;
-using Volo.Abp.SettingManagement.Blazor.Menus;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.Menus;
-using Volo.Abp.TenantManagement.Blazor.Navigation;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.Navigation;
 using Volo.Abp.UI.Navigation;
 
 namespace MyCompanyName.MyProjectName.Menus;

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -8,8 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
   </ItemGroup>
@@ -18,11 +16,11 @@
     <!-- <TEMPLATE-REMOVE> -->
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Server.Theming\Volo.Abp.AspNetCore.Components.Server.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.csproj" />
     <!-- </TEMPLATE-REMOVE> -->
+    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme\Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.csproj" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="5.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -46,7 +44,7 @@
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.HttpApi\Volo.Abp.Identity.HttpApi.csproj" />
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\modules\openiddict\src\Volo.Abp.OpenIddict.EntityFrameworkCore\Volo.Abp.OpenIddict.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.Server\Volo.Abp.Identity.Blazor.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.MudBlazor.Server\Volo.Abp.Identity.Blazor.MudBlazor.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -60,21 +58,21 @@
     <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Application\Volo.Abp.TenantManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.EntityFrameworkCore\Volo.Abp.TenantManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.HttpApi\Volo.Abp.TenantManagement.HttpApi.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.Server\Volo.Abp.TenantManagement.Blazor.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.MudBlazor.Server\Volo.Abp.TenantManagement.Blazor.MudBlazor.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Application\Volo.Abp.FeatureManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.EntityFrameworkCore\Volo.Abp.FeatureManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.HttpApi\Volo.Abp.FeatureManagement.HttpApi.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Blazor.Server\Volo.Abp.FeatureManagement.Blazor.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Blazor.MudBlazor.Server\Volo.Abp.FeatureManagement.Blazor.MudBlazor.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Application\Volo.Abp.SettingManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore\Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.HttpApi\Volo.Abp.SettingManagement.HttpApi.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.Server\Volo.Abp.SettingManagement.Blazor.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.MudBlazor.Server\Volo.Abp.SettingManagement.Blazor.MudBlazor.Server.csproj" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs

@@ -1,5 +1,3 @@
-using Blazorise.Bootstrap5;
-using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -15,10 +13,10 @@ using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Components.Web;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
-using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
+using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
+using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
-using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
@@ -30,10 +28,10 @@ using Volo.Abp.Emailing;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.SqlServer;
 using Volo.Abp.FeatureManagement;
-using Volo.Abp.FeatureManagement.Blazor.Server;
+using Volo.Abp.FeatureManagement.Blazor.MudBlazor.Server;
 using Volo.Abp.FeatureManagement.EntityFrameworkCore;
 using Volo.Abp.Identity;
-using Volo.Abp.Identity.Blazor.Server;
+using Volo.Abp.Identity.Blazor.MudBlazor.Server;
 using Volo.Abp.Identity.EntityFrameworkCore;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
@@ -45,11 +43,11 @@ using Volo.Abp.PermissionManagement.HttpApi;
 using Volo.Abp.PermissionManagement.Identity;
 using Volo.Abp.PermissionManagement.OpenIddict;
 using Volo.Abp.SettingManagement;
-using Volo.Abp.SettingManagement.Blazor.Server;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.Server;
 using Volo.Abp.SettingManagement.EntityFrameworkCore;
 using Volo.Abp.Swashbuckle;
 using Volo.Abp.TenantManagement;
-using Volo.Abp.TenantManagement.Blazor.Server;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.Server;
 using Volo.Abp.TenantManagement.EntityFrameworkCore;
 using Volo.Abp.OpenIddict;
 using Volo.Abp.Security.Claims;
@@ -69,7 +67,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreComponentsServerMudBlazorBasicThemeModule),
 
     // Account module packages
     typeof(AbpAccountApplicationModule),
@@ -83,7 +81,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpIdentityHttpApiModule),
     typeof(AbpIdentityEntityFrameworkCoreModule),
     typeof(AbpOpenIddictEntityFrameworkCoreModule),
-    typeof(AbpIdentityBlazorServerModule),
+    typeof(AbpIdentityBlazorMudBlazorServerModule),
 
     // Audit logging module packages
     typeof(AbpAuditLoggingEntityFrameworkCoreModule),
@@ -97,19 +95,19 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpTenantManagementApplicationModule),
     typeof(AbpTenantManagementHttpApiModule),
     typeof(AbpTenantManagementEntityFrameworkCoreModule),
-    typeof(AbpTenantManagementBlazorServerModule),
+    typeof(AbpTenantManagementBlazorMudBlazorServerModule),
 
     // Feature Management module packages
     typeof(AbpFeatureManagementApplicationModule),
     typeof(AbpFeatureManagementEntityFrameworkCoreModule),
     typeof(AbpFeatureManagementHttpApiModule),
-    typeof(AbpFeatureManagementBlazorServerModule),
+    typeof(AbpFeatureManagementBlazorMudBlazorServerModule),
 
     // Setting Management module packages
     typeof(AbpSettingManagementApplicationModule),
     typeof(AbpSettingManagementEntityFrameworkCoreModule),
     typeof(AbpSettingManagementHttpApiModule),
-    typeof(AbpSettingManagementBlazorServerModule)
+    typeof(AbpSettingManagementBlazorMudBlazorServerModule)
 )]
 public class MyProjectNameModule : AbpModule
 {
@@ -184,7 +182,6 @@ public class MyProjectNameModule : AbpModule
         ConfigureSwaggerServices(context.Services);
         ConfigureNavigationServices();
         ConfigureAutoApiControllers();
-        ConfigureBlazorise(context);
         ConfigureRouter(context);
         ConfigureEfCore(context);
 
@@ -224,7 +221,7 @@ public class MyProjectNameModule : AbpModule
 
             //BLAZOR UI
             options.StyleBundles.Configure(
-                BlazorLeptonXLiteThemeBundles.Styles.Global,
+                BlazorMudBlazorBasicThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/blazor-global-styles.css");
@@ -299,13 +296,6 @@ public class MyProjectNameModule : AbpModule
         );
     }
 
-    private void ConfigureBlazorise(ServiceConfigurationContext context)
-    {
-        context.Services
-            .AddBootstrap5Providers()
-            .AddFontAwesomeIcons();
-    }
-
     private void ConfigureRouter(ServiceConfigurationContext context)
     {
         Configure<AbpRouterOptions>(options =>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/_Imports.razor

@@ -8,7 +8,6 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.JSInterop
 @using MyCompanyName.MyProjectName
-@using Blazorise
+@using global::MudBlazor
-@using Blazorise.DataGrid
+@using Volo.Abp.MudBlazorUI
-@using Volo.Abp.BlazoriseUI
+@using Volo.Abp.MudBlazorUI.Components
-@using Volo.Abp.BlazoriseUI.Components

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Menus/MyProjectNameMenuContributor.cs

@@ -3,9 +3,9 @@ using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp.Account.Localization;
 using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Identity.Blazor;
+using Volo.Abp.Identity.Blazor.MudBlazor;
-using Volo.Abp.SettingManagement.Blazor.Menus;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.Menus;
-using Volo.Abp.TenantManagement.Blazor.Navigation;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.Navigation;
 using Volo.Abp.UI.Navigation;
 
 namespace MyCompanyName.MyProjectName.Menus;

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj

@@ -9,19 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- <TEMPLATE-REMOVE> -->
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.WebAssembly\Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.csproj" />
     <!-- </TEMPLATE-REMOVE> -->
-    <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="5.0.0" />
+    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -29,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.WebAssembly\Volo.Abp.Identity.Blazor.WebAssembly.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.MudBlazor.WebAssembly\Volo.Abp.Identity.Blazor.MudBlazor.WebAssembly.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.WebAssembly\Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.MudBlazor.WebAssembly\Volo.Abp.TenantManagement.Blazor.MudBlazor.WebAssembly.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.WebAssembly\Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.MudBlazor.WebAssembly\Volo.Abp.SettingManagement.Blazor.MudBlazor.WebAssembly.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.HttpApi.Client\Volo.Abp.Account.HttpApi.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.HttpApi.Client\Volo.Abp.PermissionManagement.HttpApi.Client.csproj" />

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyProjectNameBlazorModule.cs

@@ -1,26 +1,22 @@
-using Blazorise.Bootstrap5;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Blazorise.Icons.FontAwesome;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using MyCompanyName.MyProjectName.Menus;
 using MyCompanyName.MyProjectName;
 using OpenIddict.Abstractions;
 using Volo.Abp.Account;
-using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite;
+using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
-using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme;
-using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme;
 using Volo.Abp.Autofac.WebAssembly;
 using Volo.Abp.Mapperly;
 using Volo.Abp.FeatureManagement;
 using Volo.Abp.Identity;
-using Volo.Abp.Identity.Blazor.WebAssembly;
+using Volo.Abp.Identity.Blazor.MudBlazor.WebAssembly;
 using Volo.Abp.Modularity;
 using Volo.Abp.OpenIddict;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.SettingManagement;
-using Volo.Abp.SettingManagement.Blazor.WebAssembly;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.WebAssembly;
 using Volo.Abp.TenantManagement;
-using Volo.Abp.TenantManagement.Blazor.WebAssembly;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.WebAssembly;
 using Volo.Abp.UI.Navigation;
 
 namespace MyCompanyName.MyProjectName;
@@ -30,14 +26,14 @@ namespace MyCompanyName.MyProjectName;
 
     // ABP Framework packages
     typeof(AbpAutofacWebAssemblyModule),
-    typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreComponentsWebAssemblyMudBlazorBasicThemeModule),
 
     // Account module packages
     typeof(AbpAccountHttpApiClientModule),
 
     // Identity module packages
     typeof(AbpIdentityHttpApiClientModule),
-    typeof(AbpIdentityBlazorWebAssemblyModule),
+    typeof(AbpIdentityBlazorMudBlazorWebAssemblyModule),
     typeof(AbpOpenIddictDomainSharedModule),
 
     // Permission Management module packages
@@ -45,14 +41,14 @@ namespace MyCompanyName.MyProjectName;
 
     // Tenant Management module packages
     typeof(AbpTenantManagementHttpApiClientModule),
-    typeof(AbpTenantManagementBlazorWebAssemblyModule),
+    typeof(AbpTenantManagementBlazorMudBlazorWebAssemblyModule),
 
     // Feature Management module packages
     typeof(AbpFeatureManagementHttpApiClientModule),
 
     // Setting Management module packages
     typeof(AbpSettingManagementHttpApiClientModule),
-    typeof(AbpSettingManagementBlazorWebAssemblyModule)
+    typeof(AbpSettingManagementBlazorMudBlazorWebAssemblyModule)
 )]
 public class MyProjectNameBlazorModule : AbpModule
 {
@@ -65,7 +61,6 @@ public class MyProjectNameBlazorModule : AbpModule
 
         ConfigureAuthentication(builder);
         ConfigureHttpClient(context, environment);
-        ConfigureBlazorise(context);
         ConfigureRouter(context);
         ConfigureMenu(context);
         ConfigureHttpClientProxies(context);
@@ -89,13 +84,6 @@ public class MyProjectNameBlazorModule : AbpModule
         });
     }
 
-    private void ConfigureBlazorise(ServiceConfigurationContext context)
-    {
-        context.Services
-            .AddBootstrap5Providers()
-            .AddFontAwesomeIcons();
-    }
-
     private void ConfigureHttpClientProxies(ServiceConfigurationContext context)
     {
         context.Services.AddHttpClientProxies(
@@ -119,12 +107,6 @@ public class MyProjectNameBlazorModule : AbpModule
         });
     }
 
-    private static void ConfigureUI(WebAssemblyHostBuilder builder)
-    {
-        builder.RootComponents.Add<App>("#ApplicationContainer");
-        builder.RootComponents.Add<HeadOutlet>("head::after");
-    }
-
     private static void ConfigureHttpClient(ServiceConfigurationContext context, IWebAssemblyHostEnvironment environment)
     {
         context.Services.AddTransient(sp => new HttpClient

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Routes.razor

@@ -1,5 +1,5 @@
 @using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp
-@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
+@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic
 <Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="WebAppAdditionalAssembliesHelper.GetAssemblies<MyProjectNameBlazorModule>()">
     <Found Context="routeData">
         <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/_Imports.razor

@@ -8,7 +8,6 @@
 @using Microsoft.JSInterop
 @using Volo.Abp.AspNetCore.Components.Web
 @using MyCompanyName.MyProjectName
-@using Blazorise
+@using global::MudBlazor
-@using Blazorise.DataGrid
+@using Volo.Abp.MudBlazorUI
-@using Volo.Abp.BlazoriseUI
+@using Volo.Abp.MudBlazorUI.Components
-@using Volo.Abp.BlazoriseUI.Components

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj

@@ -74,7 +74,7 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
     <!-- </TEMPLATE-REMOVE> -->
      <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="5.0.0" />
-     <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling" Version="5.0.0" />
+     <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling.csproj" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyProjectNameHostModule.cs

@@ -11,7 +11,7 @@ using OpenIddict.Validation.AspNetCore;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
-using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling;
+using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling;
 using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp;
 using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
@@ -60,7 +60,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAutofacModule),
     typeof(AbpMapperlyModule),
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeBundlingModule),
+    typeof(AbpAspNetCoreComponentsWebAssemblyMudBlazorBasicThemeBundlingModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj

@@ -75,7 +75,7 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
     <!-- </TEMPLATE-REMOVE> -->
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="5.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling" Version="5.0.0" />
+    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling.csproj" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs

@@ -11,7 +11,7 @@ using OpenIddict.Validation.AspNetCore;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
-using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling;
+using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling;
 using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp;
 using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
@@ -63,7 +63,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpMapperlyModule),
     typeof(AbpEntityFrameworkCoreSqlServerModule),
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
-    typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeBundlingModule),
+    typeof(AbpAspNetCoreComponentsWebAssemblyMudBlazorBasicThemeBundlingModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
 

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj

@@ -10,22 +10,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Application.Contracts\Volo.Abp.Account.Application.Contracts.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.WebAssembly\Volo.Abp.Identity.Blazor.WebAssembly.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.MudBlazor.WebAssembly\Volo.Abp.Identity.Blazor.MudBlazor.WebAssembly.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.WebAssembly\Volo.Abp.TenantManagement.Blazor.WebAssembly.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.MudBlazor.WebAssembly\Volo.Abp.TenantManagement.Blazor.MudBlazor.WebAssembly.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.WebAssembly\Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.MudBlazor.WebAssembly\Volo.Abp.SettingManagement.Blazor.MudBlazor.WebAssembly.csproj" />
   </ItemGroup>
 
   <ItemGroup>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyProjectNameBlazorHostClientModule.cs

@@ -1,32 +1,30 @@
 using System;
 using System.Net.Http;
-using Blazorise.Bootstrap5;
-using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Blazor.WebAssembly;
 using Volo.Abp.Account;
-using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
-using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
+using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme;
 using Volo.Abp.Autofac.WebAssembly;
 using Volo.Abp.Mapperly;
-using Volo.Abp.Identity.Blazor.WebAssembly;
+using Volo.Abp.Identity.Blazor.MudBlazor.WebAssembly;
 using Volo.Abp.Modularity;
-using Volo.Abp.SettingManagement.Blazor.WebAssembly;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.WebAssembly;
-using Volo.Abp.TenantManagement.Blazor.WebAssembly;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.WebAssembly;
 using Volo.Abp.UI.Navigation;
 
 namespace MyCompanyName.MyProjectName.Blazor.Host.Client;
 
 [DependsOn(
     typeof(AbpAutofacWebAssemblyModule),
-    typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule),
+    typeof(AbpAspNetCoreComponentsWebAssemblyMudBlazorBasicThemeModule),
     typeof(AbpAccountApplicationContractsModule),
-    typeof(AbpIdentityBlazorWebAssemblyModule),
+    typeof(AbpIdentityBlazorMudBlazorWebAssemblyModule),
-    typeof(AbpTenantManagementBlazorWebAssemblyModule),
+    typeof(AbpTenantManagementBlazorMudBlazorWebAssemblyModule),
-    typeof(AbpSettingManagementBlazorWebAssemblyModule),
+    typeof(AbpSettingManagementBlazorMudBlazorWebAssemblyModule),
     typeof(MyProjectNameBlazorWebAssemblyModule)
 )]
 public class MyProjectNameBlazorHostClientModule : AbpModule
@@ -38,7 +36,6 @@ public class MyProjectNameBlazorHostClientModule : AbpModule
 
         ConfigureAuthentication(builder);
         ConfigureHttpClient(context, environment);
-        ConfigureBlazorise(context);
         ConfigureRouter(context);
         ConfigureMenu(context);
 
@@ -61,13 +58,6 @@ public class MyProjectNameBlazorHostClientModule : AbpModule
         });
     }
 
-    private void ConfigureBlazorise(ServiceConfigurationContext context)
-    {
-        context.Services
-            .AddBootstrap5Providers()
-            .AddFontAwesomeIcons();
-    }
-
     private static void ConfigureAuthentication(WebAssemblyHostBuilder builder)
     {
         builder.Services.AddOidcAuthentication(options =>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/Routes.razor

@@ -1,5 +1,5 @@
 @using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic
 <Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="WebAppAdditionalAssembliesHelper.GetAssemblies<MyProjectNameBlazorHostClientModule>()">
     <Found Context="routeData">
         <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/_Imports.razor

@@ -7,5 +7,6 @@
 @using Microsoft.JSInterop
 @using Volo.Abp.AspNetCore.Components.WebAssembly
 @using MyCompanyName.MyProjectName.Blazor
-@using Blazorise
+@using MudBlazor
-@using Blazorise.DataGrid
+@using Volo.Abp.MudBlazorUI
+@using Volo.Abp.MudBlazorUI.Components

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj

@@ -16,7 +16,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" />
         <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
         <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj" />
-        <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Bundling\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Bundling.csproj" />
+        <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling\Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling.csproj" />
         <ProjectReference Include="..\MyCompanyName.MyProjectName.Blazor.Host.Client\MyCompanyName.MyProjectName.Blazor.Host.Client.csproj" />
     </ItemGroup>
 

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/App.razor

@@ -1,8 +1,8 @@
 @using Volo.Abp.Localization
 @using System.Globalization
 @using Microsoft.Extensions.Hosting
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
+@using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.Theming.Bundling
+@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling
 @inject IHostEnvironment Env
 @{
     var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty;
@@ -17,7 +17,8 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="/" />
 
-    <AbpStyles BundleName="@BlazorBasicThemeBundles.Styles.Global" />
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
+    <AbpStyles BundleName="@BlazorMudBlazorBasicThemeBundles.Styles.Global" />
 
     <HeadOutlet @rendermode="InteractiveServer" />
 
@@ -26,7 +27,7 @@
 
     <Routes @rendermode="InteractiveServer" />
 
-    <AbpScripts BundleName="@BlazorBasicThemeBundles.Scripts.Global" />
+    <AbpScripts BundleName="@BlazorMudBlazorBasicThemeBundles.Scripts.Global" />
 
     <script src="_framework/blazor.web.js"></script>
 

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/Routes.razor

@@ -1,6 +1,6 @@
-@using Volo.Abp.AspNetCore.Components.Web.Theming.Routing
+@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing
 @using Microsoft.Extensions.Options
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic
 @inject IOptions<AbpRouterOptions> RouterOptions
 <Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">
     <Found Context="routeData">

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Menus/MyProjectNameMenuContributor.cs

@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using MyCompanyName.MyProjectName.MultiTenancy;
-using Volo.Abp.Identity.Blazor;
+using Volo.Abp.Identity.Blazor.MudBlazor;
-using Volo.Abp.SettingManagement.Blazor.Menus;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.Menus;
-using Volo.Abp.TenantManagement.Blazor.Navigation;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.Navigation;
 using Volo.Abp.UI.Navigation;
 
 namespace MyCompanyName.MyProjectName.Blazor.Server.Host.Menus;

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj

@@ -13,8 +13,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
-        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2" />
@@ -27,20 +25,20 @@
         <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" />
-        <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
+        <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme\Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.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" />
         <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.HttpApi\Volo.Abp.Account.HttpApi.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.EntityFrameworkCore\Volo.Abp.FeatureManagement.EntityFrameworkCore.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Application\Volo.Abp.FeatureManagement.Application.csproj" />
-        <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.Server\Volo.Abp.Identity.Blazor.Server.csproj" />
+        <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.MudBlazor.Server\Volo.Abp.Identity.Blazor.MudBlazor.Server.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Application\Volo.Abp.Identity.Application.csproj" />
-        <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.Server\Volo.Abp.TenantManagement.Blazor.Server.csproj" />
+        <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.MudBlazor.Server\Volo.Abp.TenantManagement.Blazor.MudBlazor.Server.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.EntityFrameworkCore\Volo.Abp.TenantManagement.EntityFrameworkCore.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Application\Volo.Abp.TenantManagement.Application.csproj" />
-        <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.Server\Volo.Abp.SettingManagement.Blazor.Server.csproj" />
+        <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.MudBlazor.Server\Volo.Abp.SettingManagement.Blazor.MudBlazor.Server.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore\Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Application\Volo.Abp.SettingManagement.Application.csproj" />
         <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.Application\Volo.Abp.PermissionManagement.Application.csproj" />

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs

@@ -1,8 +1,6 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Blazorise.Bootstrap5;
-using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
@@ -20,9 +18,9 @@ using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Components.Web;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
+using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
+using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling;
-using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
@@ -36,7 +34,7 @@ using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.FeatureManagement;
 using Volo.Abp.FeatureManagement.EntityFrameworkCore;
 using Volo.Abp.Identity;
-using Volo.Abp.Identity.Blazor.Server;
+using Volo.Abp.Identity.Blazor.MudBlazor.Server;
 using Volo.Abp.Identity.EntityFrameworkCore;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
@@ -45,11 +43,11 @@ using Volo.Abp.PermissionManagement;
 using Volo.Abp.PermissionManagement.EntityFrameworkCore;
 using Volo.Abp.PermissionManagement.Identity;
 using Volo.Abp.SettingManagement;
-using Volo.Abp.SettingManagement.Blazor.Server;
+using Volo.Abp.SettingManagement.Blazor.MudBlazor.Server;
 using Volo.Abp.SettingManagement.EntityFrameworkCore;
 using Volo.Abp.Swashbuckle;
 using Volo.Abp.TenantManagement;
-using Volo.Abp.TenantManagement.Blazor.Server;
+using Volo.Abp.TenantManagement.Blazor.MudBlazor.Server;
 using Volo.Abp.TenantManagement.EntityFrameworkCore;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.UI.Navigation.Urls;
@@ -68,20 +66,20 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Host;
     typeof(AbpAccountWebOpenIddictModule),
     typeof(AbpAccountApplicationModule),
     typeof(AbpAccountHttpApiModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
+    typeof(AbpAspNetCoreComponentsServerMudBlazorBasicThemeModule),
     typeof(AbpIdentityApplicationModule),
     typeof(AbpIdentityEntityFrameworkCoreModule),
     typeof(AbpAuditLoggingEntityFrameworkCoreModule),
-    typeof(AbpIdentityBlazorServerModule),
+    typeof(AbpIdentityBlazorMudBlazorServerModule),
     typeof(AbpFeatureManagementApplicationModule),
     typeof(AbpFeatureManagementEntityFrameworkCoreModule),
-    typeof(AbpTenantManagementBlazorServerModule),
+    typeof(AbpTenantManagementBlazorMudBlazorServerModule),
     typeof(AbpTenantManagementApplicationModule),
     typeof(AbpTenantManagementEntityFrameworkCoreModule),
     typeof(AbpPermissionManagementEntityFrameworkCoreModule),
     typeof(AbpPermissionManagementDomainIdentityModule),
     typeof(AbpPermissionManagementApplicationModule),
-    typeof(AbpSettingManagementBlazorServerModule),
+    typeof(AbpSettingManagementBlazorMudBlazorServerModule),
     typeof(AbpSettingManagementApplicationModule),
     typeof(AbpSettingManagementEntityFrameworkCoreModule),
     typeof(MyProjectNameBlazorServerModule)
@@ -152,7 +150,7 @@ public class MyProjectNameBlazorHostModule : AbpModule
 
                 //BLAZOR UI
                 options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
+                BlazorMudBlazorBasicThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/blazor-global-styles.css");
@@ -210,10 +208,6 @@ public class MyProjectNameBlazorHostModule : AbpModule
             options.IsEnabled = MultiTenancyConsts.IsEnabled;
         });
 
-        context.Services
-            .AddBootstrap5Providers()
-            .AddFontAwesomeIcons();
-
         Configure<AbpNavigationOptions>(options =>
         {
             options.MenuContributors.Add(new MyProjectNameMenuContributor());

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/_Imports.razor

@@ -8,7 +8,6 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.JSInterop
 @using MyCompanyName.MyProjectName.Blazor.Server
-@using Blazorise
+@using MudBlazor
-@using Blazorise.DataGrid
+@using Volo.Abp.MudBlazorUI
-@using Volo.Abp.BlazoriseUI
+@using Volo.Abp.MudBlazorUI.Components
-@using Volo.Abp.BlazoriseUI.Components

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Server.Theming\Volo.Abp.AspNetCore.Components.Server.Theming.csproj"/>
+        <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor.csproj"/>
     </ItemGroup>
 
     <ItemGroup>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs

@@ -1,10 +1,10 @@
-using Volo.Abp.AspNetCore.Components.Server.Theming;
+using Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor;
 using Volo.Abp.Modularity;
 
 namespace MyCompanyName.MyProjectName.Blazor.Server;
 
 [DependsOn(
-    typeof(AbpAspNetCoreComponentsServerThemingModule),
+    typeof(AbpAspNetCoreComponentsServerThemingMudBlazorModule),
     typeof(MyProjectNameBlazorModule)
     )]
 public class MyProjectNameBlazorServerModule : AbpModule

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj"/>
+        <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor.csproj"/>
     </ItemGroup>
 
     <ItemGroup>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs

@@ -1,4 +1,4 @@
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor;
 using Volo.Abp.Modularity;
 
 namespace MyCompanyName.MyProjectName.Blazor.WebAssembly;
@@ -6,7 +6,7 @@ namespace MyCompanyName.MyProjectName.Blazor.WebAssembly;
 [DependsOn(
     typeof(MyProjectNameBlazorModule),
     typeof(MyProjectNameHttpApiClientModule),
-    typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule)
+    typeof(AbpAspNetCoreComponentsWebAssemblyThemingMudBlazorModule)
     )]
 public class MyProjectNameBlazorWebAssemblyModule : AbpModule
 {

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj

@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj" />
-        <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
+        <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.csproj" />
     </ItemGroup>
 
     <ItemGroup>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Blazor.Menus;
-using Volo.Abp.AspNetCore.Components.Web.Theming;
+using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor;
-using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
 using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@@ -10,7 +10,7 @@ namespace MyCompanyName.MyProjectName.Blazor;
 
 [DependsOn(
     typeof(MyProjectNameApplicationContractsModule),
-    typeof(AbpAspNetCoreComponentsWebThemingModule),
+    typeof(AbpAspNetCoreComponentsWebThemingMudBlazorModule),
     typeof(AbpMapperlyModule)
     )]
 public class MyProjectNameBlazorModule : AbpModule

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor

@@ -1,5 +1,4 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Volo.Abp.AspNetCore.Components.Web
-@using Volo.Abp.BlazoriseUI
+@using Volo.Abp.MudBlazorUI
-@using Blazorise
+@using global::MudBlazor
-@using Blazorise.DataGrid