diff --git a/BootstrapAdmin.sln b/BootstrapAdmin.sln
index 5a0e0e22..3e8c9bf3 100644
--- a/BootstrapAdmin.sln
+++ b/BootstrapAdmin.sln
@@ -155,6 +155,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapClient.Web.Shared"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapClient.Web", "src\blazor\client\BootstrapClient.Web\BootstrapClient.Web.csproj", "{6CD7A35B-93A8-4DB2-B078-EE5A81F40032}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapAdmin.Extensions", "src\blazor\admin\BootstrapAdmin.Extensions\BootstrapAdmin.Extensions.csproj", "{EED6219B-91BA-4D97-83B7-2E26EBBB31E8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -221,6 +223,10 @@ Global
 		{6CD7A35B-93A8-4DB2-B078-EE5A81F40032}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6CD7A35B-93A8-4DB2-B078-EE5A81F40032}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6CD7A35B-93A8-4DB2-B078-EE5A81F40032}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EED6219B-91BA-4D97-83B7-2E26EBBB31E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EED6219B-91BA-4D97-83B7-2E26EBBB31E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EED6219B-91BA-4D97-83B7-2E26EBBB31E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EED6219B-91BA-4D97-83B7-2E26EBBB31E8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -258,6 +264,7 @@ Global
 		{640F598B-6586-4AD6-B544-78CFF2602DFB} = {55A2459A-6BDE-4493-B2C0-5BE1673E99EE}
 		{93770088-3463-427B-9CD8-88B8D7945C83} = {55A2459A-6BDE-4493-B2C0-5BE1673E99EE}
 		{6CD7A35B-93A8-4DB2-B078-EE5A81F40032} = {55A2459A-6BDE-4493-B2C0-5BE1673E99EE}
+		{EED6219B-91BA-4D97-83B7-2E26EBBB31E8} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {221EAE38-5F75-4391-9A48-E462A9F3B8FC}
diff --git a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
index 5e0efe20..d2b3b70d 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
+++ b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\BootstrapAdmin.DataAccess.EFCore\BootstrapAdmin.DataAccess.EFCore.csproj" />
+    <ProjectReference Include="..\BootstrapAdmin.Extensions\BootstrapAdmin.Extensions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs
index 6d4ea987..ad93958b 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs
@@ -1,6 +1,6 @@
 using Bootstrap.Security.Blazor;
+using BootstrapAdmin.Extensions;
 using BootstrapAdmin.Web.Core;
-using BootstrapAdmin.Web.Extensions;
 using BootstrapAdmin.Web.Services;
 using Microsoft.AspNetCore.Components.Authorization;
 
diff --git a/src/blazor/client/BootstrapClient.Shared/BootstrapClient.Web.Shared.csproj b/src/blazor/client/BootstrapClient.Shared/BootstrapClient.Web.Shared.csproj
index 186cd90c..c6687454 100644
--- a/src/blazor/client/BootstrapClient.Shared/BootstrapClient.Web.Shared.csproj
+++ b/src/blazor/client/BootstrapClient.Shared/BootstrapClient.Web.Shared.csproj
@@ -10,6 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\admin\BootstrapAdmin.Extensions\BootstrapAdmin.Extensions.csproj" />
     <ProjectReference Include="..\BootstrapClient.DataAccess\BootstrapClient.Web.DataAccess.csproj" />
   </ItemGroup>
 
diff --git a/src/blazor/client/BootstrapClient.Shared/Shared/MainLayout.razor.cs b/src/blazor/client/BootstrapClient.Shared/Shared/MainLayout.razor.cs
index a14b8673..148577d1 100644
--- a/src/blazor/client/BootstrapClient.Shared/Shared/MainLayout.razor.cs
+++ b/src/blazor/client/BootstrapClient.Shared/Shared/MainLayout.razor.cs
@@ -1,11 +1,10 @@
 using Bootstrap.Security.Blazor;
+using BootstrapAdmin.Extensions;
 using BootstrapAdmin.Web.Core;
-using BootstrapAdmin.Web.Extensions;
 using BootstrapBlazor.Components;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace BootstrapClient.Web.Shared.Shared