diff --git a/docs/en/UI/Blazor/Authentication.md b/docs/en/UI/Blazor/Authentication.md
new file mode 100644
index 0000000000..6c1cdb31f5
--- /dev/null
+++ b/docs/en/UI/Blazor/Authentication.md
@@ -0,0 +1,3 @@
+# Blazor UI: Authentication
+
+TODO
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Customization-Overriding-Components.md b/docs/en/UI/Blazor/Customization-Overriding-Components.md
new file mode 100644
index 0000000000..fda1c2859d
--- /dev/null
+++ b/docs/en/UI/Blazor/Customization-Overriding-Components.md
@@ -0,0 +1,3 @@
+# Blazor UI: Customization / Overriding Components
+
+TODO
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Global-Scripts-Styles.md b/docs/en/UI/Blazor/Global-Scripts-Styles.md
new file mode 100644
index 0000000000..ae473351f0
--- /dev/null
+++ b/docs/en/UI/Blazor/Global-Scripts-Styles.md
@@ -0,0 +1,3 @@
+# Blazor UI: Managing Global Scripts & Styles
+
+TODO
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Localization.md b/docs/en/UI/Blazor/Localization.md
index 23b31a5a24..e6cf761ce3 100644
--- a/docs/en/UI/Blazor/Localization.md
+++ b/docs/en/UI/Blazor/Localization.md
@@ -1,3 +1,3 @@
-# Blazor: Localization
+# Blazor UI: Localization
 
 Blazor applications can reuse the same `IStringLocalizer<T>` service that is explained in the [localization document](../../Localization.md). All the localization resources and texts available in the server side are usable in the Blazor application.
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Navigation-Menu.md b/docs/en/UI/Blazor/Navigation-Menu.md
new file mode 100644
index 0000000000..81fca9f5ec
--- /dev/null
+++ b/docs/en/UI/Blazor/Navigation-Menu.md
@@ -0,0 +1,3 @@
+# Blazor UI: Navigation / Menu
+
+TODO
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Notification.md b/docs/en/UI/Blazor/Notification.md
index ef8945347b..09f4eb93bb 100644
--- a/docs/en/UI/Blazor/Notification.md
+++ b/docs/en/UI/Blazor/Notification.md
@@ -1,3 +1,3 @@
-# Blazor: Notification
+# Blazor UI: Notification Service
 
-`UiNotificationService` is used to show toastr style notifications on the user interface. The documentation is in progress...
\ No newline at end of file
+`IUiNotificationService` is used to show toastr style notifications on the user interface. The documentation is in progress...
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Overall.md b/docs/en/UI/Blazor/Overall.md
index 8af0e2fd0d..2036eb6c49 100644
--- a/docs/en/UI/Blazor/Overall.md
+++ b/docs/en/UI/Blazor/Overall.md
@@ -1,4 +1,4 @@
-# Blazor UI for the ABP Framework
+# Blazor UI: Overall
 
 ## Getting Started
 
diff --git a/docs/en/UI/Blazor/Settings.md b/docs/en/UI/Blazor/Settings.md
index ad03dce5e2..276462c411 100644
--- a/docs/en/UI/Blazor/Settings.md
+++ b/docs/en/UI/Blazor/Settings.md
@@ -1,3 +1,3 @@
-# Blazor: Settings
+# Blazor UI: Settings
 
 Blazor applications can reuse the same `ISettingProvider` service that is explained in the [settings document](../../Settings.md).
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Testing.md b/docs/en/UI/Blazor/Testing.md
deleted file mode 100644
index 32148f316a..0000000000
--- a/docs/en/UI/Blazor/Testing.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Blazor: Testing
-
-TODO
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Theming.md b/docs/en/UI/Blazor/Theming.md
new file mode 100644
index 0000000000..c73c37dfdd
--- /dev/null
+++ b/docs/en/UI/Blazor/Theming.md
@@ -0,0 +1,3 @@
+# Blazor UI: Theming
+
+TODO
\ No newline at end of file
diff --git a/docs/en/UI/Blazor/Toolbars.md b/docs/en/UI/Blazor/Toolbars.md
new file mode 100644
index 0000000000..25c5f077a2
--- /dev/null
+++ b/docs/en/UI/Blazor/Toolbars.md
@@ -0,0 +1,3 @@
+# Blazor UI: Toolbars
+
+TODO
\ No newline at end of file
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index 1f129c2f50..49f438f964 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -567,25 +567,44 @@
               "path": "UI/Blazor/Overall.md"
             },
             {
-              "text": "Services",
-              "items": [
-                {
-                  "text": "Localization",
-                  "path": "UI/Blazor/Localization.md"
-                },
-                {
-                  "text": "Settings",
-                  "path": "UI/Blazor/Settings.md"
-                },
-                {
-                  "text": "Notification",
-                  "path": "UI/Blazor/Notification.md"
-                },
-                {
-                  "text": "Message",
-                  "path": "UI/Blazor/Message.md"
-                }
-              ]
+              "text": "Navigation / Menu",
+              "path": "UI/Blazor/Navigation-Menu.md"
+            },
+            {
+              "text": "Localization",
+              "path": "UI/Blazor/Localization.md"
+            },
+            {
+              "text": "Settings",
+              "path": "UI/Blazor/Settings.md"
+            },
+            {
+              "text": "Notification",
+              "path": "UI/Blazor/Notification.md"
+            },
+            {
+              "text": "Message",
+              "path": "UI/Blazor/Message.md"
+            },
+            {
+              "text": "Theming",
+              "path": "UI/Blazor/Theming.md"
+            },
+            {
+              "text": "Toolbars",
+              "path": "UI/Blazor/Toolbars.md"
+            },
+            {
+              "text": "Customization / Overriding Components",
+              "path": "UI/Blazor/Customization-Overriding-Components.md"
+            },
+            {
+              "text": "Global Scripts & Styles",
+              "path": "UI/Blazor/Global-Scripts-Styles.md"
+            },
+            {
+              "text": "Authentication",
+              "path": "UI/Blazor/Authentication.md"
             }
           ]
         },
diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs
index a4660cd675..57b49409fc 100644
--- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs
@@ -104,12 +104,6 @@ namespace Volo.CmsKit
                 options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
             });
 
-            //Updates AbpClaimTypes to be compatible with identity server claims.
-            AbpClaimTypes.UserId = JwtClaimTypes.Subject;
-            AbpClaimTypes.UserName = JwtClaimTypes.Name;
-            AbpClaimTypes.Role = JwtClaimTypes.Role;
-            AbpClaimTypes.Email = JwtClaimTypes.Email;
-
             context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
                 .AddJwtBearer(options =>
                 {
@@ -172,7 +166,6 @@ namespace Volo.CmsKit
             app.UseRouting();
             app.UseCors(DefaultCorsPolicyName);
             app.UseAuthentication();
-            app.UseAbpClaimsMap();
             if (MultiTenancyConsts.IsEnabled)
             {
                 app.UseMultiTenancy();
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
index abe3a018bd..9dbb9987ed 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
@@ -105,12 +105,6 @@ namespace MyCompanyName.MyProjectName
                 options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
             });
 
-            //Updates AbpClaimTypes to be compatible with identity server claims.
-            AbpClaimTypes.UserId = JwtClaimTypes.Subject;
-            AbpClaimTypes.UserName = JwtClaimTypes.Name;
-            AbpClaimTypes.Role = JwtClaimTypes.Role;
-            AbpClaimTypes.Email = JwtClaimTypes.Email;
-
             context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
                 .AddJwtBearer(options =>
                 {
@@ -173,7 +167,6 @@ namespace MyCompanyName.MyProjectName
             app.UseRouting();
             app.UseCors(DefaultCorsPolicyName);
             app.UseAuthentication();
-            app.UseAbpClaimsMap();
             if (MultiTenancyConsts.IsEnabled)
             {
                 app.UseMultiTenancy();