diff --git a/docs/en/framework/ui/mvc-razor-pages/customization-user-interface.md b/docs/en/framework/ui/mvc-razor-pages/customization-user-interface.md
index 976b3add87..db76542e5c 100644
--- a/docs/en/framework/ui/mvc-razor-pages/customization-user-interface.md
+++ b/docs/en/framework/ui/mvc-razor-pages/customization-user-interface.md
@@ -468,10 +468,10 @@ ABP uses the `ITheme` service to get the layout location by the layout name. You
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentEmptyLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeEmptyLayoutAsync();
 }
 ````
 
-This page will use the empty layout. You use `ThemeManager.GetCurrentEmptyLayoutAsync` extension method as a shortcut.
+This page will use the empty layout. You use `ThemeManager.GetCurrentThemeEmptyLayoutAsync` extension method as a shortcut.
 
 If you want to set the layout for all the pages under a specific folder, then write the code above in a `_ViewStart.cshtml` file under that folder.
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Theming/ThemeExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Theming/ThemeExtensions.cs
index 4814e4e41d..f8c7252b91 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Theming/ThemeExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Theming/ThemeExtensions.cs
@@ -50,22 +50,27 @@ public static class ThemeExtensions
         return await theme.GetLayoutAsync(StandardLayouts.Empty, fallbackToDefault);
     }
 
-    public async static Task<Type> GetCurrentApplicationLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
+    public async static Task<Type> GetCurrentThemeLayoutAsync(this IThemeManager themeManager, string name, bool fallbackToDefault = true)
+    {
+        return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(name, fallbackToDefault);
+    }
+
+    public async static Task<Type> GetCurrentThemeApplicationLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
     {
         return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(StandardLayouts.Application, fallbackToDefault);
     }
 
-    public async static Task<Type> GetCurrentAccountLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
+    public async static Task<Type> GetCurrentThemeAccountLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
     {
         return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(StandardLayouts.Account, fallbackToDefault);
     }
 
-    public async static Task<Type> GetCurrentPublicLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
+    public async static Task<Type> GetCurrentThemePublicLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
     {
         return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(StandardLayouts.Public, fallbackToDefault);
     }
 
-    public async static Task<Type> GetCurrentEmptyLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
+    public async static Task<Type> GetCurrentThemeEmptyLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
     {
         return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(StandardLayouts.Empty, fallbackToDefault);
     }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Areas/_ViewStart.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Areas/_ViewStart.cshtml
index 036947bf38..f5871e6bb8 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Areas/_ViewStart.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Areas/_ViewStart.cshtml
@@ -1,5 +1,5 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentApplicationLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeApplicationLayoutAsync();
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Account/_ViewStart.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Account/_ViewStart.cshtml
index 036947bf38..f5871e6bb8 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Account/_ViewStart.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Account/_ViewStart.cshtml
@@ -1,5 +1,5 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentApplicationLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeApplicationLayoutAsync();
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/_ViewStart.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/_ViewStart.cshtml
index 036947bf38..f5871e6bb8 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/_ViewStart.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/_ViewStart.cshtml
@@ -1,5 +1,5 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentApplicationLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeApplicationLayoutAsync();
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Views/_ViewStart.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Views/_ViewStart.cshtml
index 036947bf38..f5871e6bb8 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Views/_ViewStart.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Views/_ViewStart.cshtml
@@ -1,5 +1,5 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentApplicationLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeApplicationLayoutAsync();
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs
index dae52da796..21991a192d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemeExtensions.cs
@@ -49,22 +49,27 @@ public static class ThemeExtensions
         return await theme.GetLayoutAsync(StandardLayouts.Empty, fallbackToDefault);
     }
 
-    public async static Task<string> GetCurrentApplicationLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
+    public async static Task<string> GetCurrentThemeLayoutAsync(this IThemeManager themeManager, string name, bool fallbackToDefault = true)
+    {
+        return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(name, fallbackToDefault);
+    }
+
+    public async static Task<string> GetCurrentThemeApplicationLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
     {
         return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(StandardLayouts.Application, fallbackToDefault);
     }
 
-    public async static Task<string> GetCurrentAccountLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
+    public async static Task<string> GetCurrentThemeAccountLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
     {
         return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(StandardLayouts.Account, fallbackToDefault);
     }
 
-    public async static Task<string> GetCurrentPublicLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
+    public async static Task<string> GetCurrentThemePublicLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
     {
         return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(StandardLayouts.Public, fallbackToDefault);
     }
 
-    public async static Task<string> GetCurrentEmptyLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
+    public async static Task<string> GetCurrentThemeEmptyLayoutAsync(this IThemeManager themeManager, bool fallbackToDefault = true)
     {
         return await (await themeManager.GetCurrentThemeAsync()).GetLayoutAsync(StandardLayouts.Empty, fallbackToDefault);
     }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml
index e6433d4d4b..7c349a5d51 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml
@@ -7,7 +7,7 @@
 @inject IThemeManager ThemeManager
 @inject IHtmlLocalizer<AccountResource> L
 @{
-    Layout = await ThemeManager.GetCurrentApplicationLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeApplicationLayoutAsync();
 }
 @section scripts {
     <abp-script-bundle name="@typeof(LoggedOutModel).FullName">
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
index 8f88066c46..b94b8728a5 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
@@ -12,7 +12,7 @@
 @inject Volo.Abp.Settings.ISettingProvider SettingProvider
 
 @{
-    Layout = await ThemeManager.GetCurrentAccountLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeAccountLayoutAsync();
 }
 
 @section scripts
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
index 4475a05c07..88232e5ec1 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
@@ -7,7 +7,7 @@
 @inject IHtmlLocalizer<AccountResource> L
 @model ManageModel
 @{
-    Layout = await ThemeManager.GetCurrentApplicationLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeApplicationLayoutAsync();
 }
 @section scripts {
     <abp-script-bundle name="@typeof(ManageModel).FullName"/>
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/_Layout.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/_Layout.cshtml
index e14bc14126..aad4724d56 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/_Layout.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/_Layout.cshtml
@@ -1,7 +1,7 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentAccountLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeAccountLayoutAsync();
 }
 <div class="abp-account-container">
     @RenderBody()
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml
index cab7e65044..2b44666cf7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml
@@ -5,7 +5,7 @@
 
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentEmptyLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeEmptyLayoutAsync();
 }
 
 <div class="mt-3">@await Component.InvokeAsync(typeof(ContentFragmentViewComponent), Model)</div>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/_ViewStart.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/_ViewStart.cshtml
index 7e65309afa..3f478351c3 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/_ViewStart.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/_ViewStart.cshtml
@@ -1,5 +1,5 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentPublicLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemePublicLayoutAsync();
 }
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
index 99630b4318..505980c3d9 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
@@ -29,7 +29,7 @@
 @model IndexModel
 @{
     ViewBag.FluidLayout = true;
-    Layout = await ThemeManager.GetCurrentEmptyLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeEmptyLayoutAsync();
     PageLayout.Content.Title = Model.DocumentPageTitle;
     ViewBag.Description = Model.GetDescription();
     ViewBag.CanonicalUrl = Model.IsLatestVersion ? null : Model.GetFullUrlOfTheLatestDocument(); //issue #12355
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml
index 12a75c8f41..0b008e2bba 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml
@@ -9,7 +9,7 @@
 @inject IPageLayout PageLayout
 @model SearchModel
 @{
-    Layout = await ThemeManager.GetCurrentEmptyLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeEmptyLayoutAsync();
 }
 @section styles {
     <style>
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Views/_ViewStart.cshtml b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Views/_ViewStart.cshtml
index 0c99de2dbe..6bcd27ce42 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Views/_ViewStart.cshtml
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Views/_ViewStart.cshtml
@@ -1,5 +1,5 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @inject IThemeManager ThemeManager
 @{
-    Layout = await ThemeManager.GetCurrentAccountLayoutAsync();
+    Layout = await ThemeManager.GetCurrentThemeAccountLayoutAsync();
 }