diff --git a/modules/setting-management/Volo.Abp.SettingManagement.sln b/modules/setting-management/Volo.Abp.SettingManagement.sln
index b7b5725614..57a34cf8ac 100644
--- a/modules/setting-management/Volo.Abp.SettingManagement.sln
+++ b/modules/setting-management/Volo.Abp.SettingManagement.sln
@@ -39,6 +39,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{D3222BEC-EDC
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.SettingManagement.DemoApp", "app\Volo.Abp.SettingManagement.DemoApp\Volo.Abp.SettingManagement.DemoApp.csproj", "{8488F380-83DD-4209-80B7-87ACAB83A052}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.SettingManagement.Blazor.Server", "src\Volo.Abp.SettingManagement.Blazor.Server\Volo.Abp.SettingManagement.Blazor.Server.csproj", "{54825027-5569-456A-81D3-0F425FEE4712}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.SettingManagement.Blazor.WebAssembly", "src\Volo.Abp.SettingManagement.Blazor.WebAssembly\Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj", "{9C65F145-6A74-48E4-8950-9E4F83953FDB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -105,6 +109,14 @@ Global
 		{8488F380-83DD-4209-80B7-87ACAB83A052}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8488F380-83DD-4209-80B7-87ACAB83A052}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8488F380-83DD-4209-80B7-87ACAB83A052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54825027-5569-456A-81D3-0F425FEE4712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54825027-5569-456A-81D3-0F425FEE4712}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54825027-5569-456A-81D3-0F425FEE4712}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54825027-5569-456A-81D3-0F425FEE4712}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C65F145-6A74-48E4-8950-9E4F83953FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C65F145-6A74-48E4-8950-9E4F83953FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C65F145-6A74-48E4-8950-9E4F83953FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C65F145-6A74-48E4-8950-9E4F83953FDB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -125,6 +137,8 @@ Global
 		{BCE3E834-B90B-469A-B274-74D401FAFD6E} = {F1BE945B-F0CF-4712-BC2B-9AF8C02059EA}
 		{F3126FDD-A574-4940-AE06-78898E2DE98F} = {F1BE945B-F0CF-4712-BC2B-9AF8C02059EA}
 		{8488F380-83DD-4209-80B7-87ACAB83A052} = {D3222BEC-EDCE-4509-9A19-36C43C9A59FB}
+		{54825027-5569-456A-81D3-0F425FEE4712} = {F1BE945B-F0CF-4712-BC2B-9AF8C02059EA}
+		{9C65F145-6A74-48E4-8950-9E4F83953FDB} = {F1BE945B-F0CF-4712-BC2B-9AF8C02059EA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {24B3A486-E7CA-4AA5-B76F-27D351A97E59}
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/AbpSettingManagementBlazorServerModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/AbpSettingManagementBlazorServerModule.cs
new file mode 100644
index 0000000000..77a5688a67
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/AbpSettingManagementBlazorServerModule.cs
@@ -0,0 +1,13 @@
+using Volo.Abp.AspNetCore.Components.Server.Theming;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.SettingManagement.Blazor.Server
+{
+    [DependsOn(
+        typeof(AbpSettingManagementBlazorModule),
+        typeof(AbpAspNetCoreComponentsServerThemingModule)
+    )]
+    public class AbpSettingManagementBlazorServerModule : AbpModule
+    {
+    }
+}
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xml b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xsd b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj
new file mode 100644
index 0000000000..a1c32a6e73
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.Server/Volo.Abp.SettingManagement.Blazor.Server.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Server.Theming\Volo.Abp.AspNetCore.Components.Server.Theming.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Volo.Abp.SettingManagement.Blazor\Volo.Abp.SettingManagement.Blazor.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs
new file mode 100644
index 0000000000..7cc7a0ff35
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/AbpSettingManagementBlazorWebAssemblyModule.cs
@@ -0,0 +1,13 @@
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.SettingManagement.Blazor.WebAssembly
+{
+    [DependsOn(
+        typeof(AbpSettingManagementBlazorModule),
+        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule)
+    )]
+    public class AbpSettingManagementBlazorWebAssemblyModule : AbpModule
+    {
+    }
+}
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xml b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xml
new file mode 100644
index 0000000000..bc5a74a236
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xsd b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj
new file mode 100644
index 0000000000..15154e4dc8
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.WebAssembly/Volo.Abp.SettingManagement.Blazor.WebAssembly.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+    <Import Project="..\..\..\..\configureawait.props" />
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Volo.Abp.SettingManagement.Blazor\Volo.Abp.SettingManagement.Blazor.csproj" />
+    </ItemGroup>
+
+</Project>