diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Shared/LanguageSwitch.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
similarity index 100%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Shared/LanguageSwitch.razor
rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Shared/MainLayout.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
similarity index 100%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Shared/MainLayout.razor
rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Shared/NavMenu.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor
similarity index 100%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Shared/NavMenu.razor
rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Shared/RedirectToLogin.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/RedirectToLogin.razor
similarity index 100%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Shared/RedirectToLogin.razor
rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/RedirectToLogin.razor
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
index 9cf591c13a..0c90610aef 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
@@ -1,8 +1,8 @@
 @using Volo.Abp.Identity.Blazor
+@using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
 <CascadingAuthenticationState>
-    <Router 
-        AppAssembly="@typeof(Program).Assembly" 
-        AdditionalAssemblies="new []{ typeof(AbpIdentityBlazorModule).Assembly }">
+    <Router AppAssembly="@typeof(Program).Assembly"
+            AdditionalAssemblies="new []{ typeof(AbpIdentityBlazorModule).Assembly }">
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <NotAuthorized>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
index dfd31588f3..b1ade9c628 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
@@ -7,6 +7,5 @@
 @using Microsoft.JSInterop
 @using Volo.Abp.AspNetCore.Components.WebAssembly
 @using MyCompanyName.MyProjectName.Blazor
-@using MyCompanyName.MyProjectName.Blazor.Shared
 @using Blazorise
 @using Blazorise.DataGrid