diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
index 91b327ce..0723e1e7 100644
--- a/Oqtane.Client/App.razor
+++ b/Oqtane.Client/App.razor
@@ -1,7 +1,4 @@
-@using Microsoft.AspNetCore.Components.Authorization
-@using Oqtane.Shared
-@using Oqtane.Services
-@inject IInstallationService InstallationService
+@inject IInstallationService InstallationService
 
 @if (Initialized)
 {
diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
index ec2be216..b7084f19 100644
--- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Routing
-@using Oqtane.Modules
-@using Oqtane.Services
-@using Oqtane.Models;
-@using Oqtane.Security
-@namespace Oqtane.Modules.Admin.Dashboard
+@namespace Oqtane.Modules.Admin.Dashboard
 @inherits ModuleBase
 @inject IPageService PageService
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 06157646..21e66851 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -1,13 +1,4 @@
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Routing
-@using Oqtane.Modules
-@using Microsoft.JSInterop
-@using Oqtane.Models
-@using Oqtane.Services
-@using Oqtane.Providers
-@using Oqtane.Shared
-@namespace Oqtane.Modules.Admin.Login
+@namespace Oqtane.Modules.Admin.Login
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJSRuntime jsRuntime
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index b9a6ea41..d5a7cdfe 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.Controls
-@using Oqtane.Modules
-@using Oqtane.Services
-@using Oqtane.Shared
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index d14c0647..461d7bd5 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -1,12 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.Controls
-@using Oqtane.Models
-@using Oqtane.Services
-@using Oqtane.Modules
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject NavigationManager NavigationManager
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index 5bc1eac1..db5b8c54 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -1,9 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using Oqtane.Modules.Controls
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject IModuleDefinitionService ModuleDefinitionService
 
diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
index 469c9499..0ad49710 100644
--- a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
@@ -1,12 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using Oqtane.Shared
-@using Oqtane.Security
-@using Oqtane.Modules.Controls
-@namespace Oqtane.Modules.Admin.ModuleSettings
+@namespace Oqtane.Modules.Admin.ModuleSettings
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IThemeService ThemeService
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 36e6a20d..0e413bec 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -1,12 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.Controls
-@using Oqtane.Models
-@using Oqtane.Services
-@using Oqtane.Modules
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
index 7a4fc272..1372a997 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
@@ -1,12 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.Controls
-@using Oqtane.Models
-@using Oqtane.Services
-@using Oqtane.Modules
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index a7b52c2b..0eb64d17 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -1,12 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.Controls
-@using Oqtane.Models
-@using Oqtane.Services
-@using Oqtane.Modules
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index ce6c13ca..fcb98b6a 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.Controls
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using Oqtane.Shared
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 
 @if (PageState.Pages != null)
diff --git a/Oqtane.Client/Modules/Admin/Profile/Index.razor b/Oqtane.Client/Modules/Admin/Profile/Index.razor
index dc89e517..52bc2fe3 100644
--- a/Oqtane.Client/Modules/Admin/Profile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profile/Index.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.Controls
-@using Oqtane.Modules
-@using Oqtane.Models
-@using Oqtane.Services
-@namespace Oqtane.Modules.Admin.Profile
+@namespace Oqtane.Modules.Admin.Profile
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index 54e5640e..caceddfc 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -1,9 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules
-@using Oqtane.Models
-@using Oqtane.Services
-@namespace Oqtane.Modules.Admin.Register
+@namespace Oqtane.Modules.Admin.Register
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index ac5deb59..e3b65f3e 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -1,9 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using Oqtane.Modules.Controls
-@namespace Oqtane.Modules.Admin.Roles
+@namespace Oqtane.Modules.Admin.Roles
 @inherits ModuleBase
 @inject IRoleService RoleService
 
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index 62cec359..159753a3 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -1,11 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Models
-@using Oqtane.Services
-@using Oqtane.Modules
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Modules.Admin.Sites
+@namespace Oqtane.Modules.Admin.Sites
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index aa75fb4c..214497c4 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -1,9 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using Oqtane.Modules.Controls
-@namespace Oqtane.Modules.Admin.Sites
+@namespace Oqtane.Modules.Admin.Sites
 @inherits ModuleBase
 
 @inject ISiteService SiteService
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Add.razor b/Oqtane.Client/Modules/Admin/Tenants/Add.razor
index 50a2e0bd..9178d2b5 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Add.razor
@@ -1,11 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Models
-@using Oqtane.Services
-@using Oqtane.Modules
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Modules.Admin.Tenants
+@namespace Oqtane.Modules.Admin.Tenants
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
index 1f1f618e..e173788c 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
@@ -1,9 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using Oqtane.Modules.Controls
-@namespace Oqtane.Modules.Admin.Tenants
+@namespace Oqtane.Modules.Admin.Tenants
 @inherits ModuleBase
 @inject ITenantService TenantService
 
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 6e9d80c5..03093f16 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.Controls
-@using Oqtane.Modules
-@using Oqtane.Services
-@using Oqtane.Shared
-@namespace Oqtane.Modules.Admin.Themes
+@namespace Oqtane.Modules.Admin.Themes
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index d1c188fb..47849695 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -1,9 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using Oqtane.Modules.Controls
-@namespace Oqtane.Modules.Admin.Themes
+@namespace Oqtane.Modules.Admin.Themes
 @inherits ModuleBase
 @inject IThemeService ThemeService
 
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index bc0cf117..77b2d7bc 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using Oqtane.Modules.Controls
-@using Oqtane.Shared
-@namespace Oqtane.Modules.Admin.Users
+@namespace Oqtane.Modules.Admin.Users
 @inherits ModuleBase
 @inject IUserRoleService UserRoleService
 
diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 498ea8e7..1d5b6edd 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules
-@using Oqtane.Services
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 @inject IUserService UserService
 
diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor
index f83705a7..4840dc54 100644
--- a/Oqtane.Client/Modules/Controls/AuditInfo.razor
+++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor
@@ -1,6 +1,4 @@
-@using Oqtane.Modules
-@using Microsoft.AspNetCore.Components.Web
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 
 @if (text != "")
diff --git a/Oqtane.Client/Modules/Controls/FileUpload.razor b/Oqtane.Client/Modules/Controls/FileUpload.razor
index 626673a2..6f19a0f5 100644
--- a/Oqtane.Client/Modules/Controls/FileUpload.razor
+++ b/Oqtane.Client/Modules/Controls/FileUpload.razor
@@ -1,5 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 
 @if (multiple)
 {
diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index 5b088b43..283b890a 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -1,6 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 
 @if (Message != "")
diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index aec5efb3..82396626 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -1,6 +1,4 @@
-@using Oqtane.Modules
-@using Microsoft.AspNetCore.Components.Web
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 @typeparam TableItem
 
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index 2395bf98..2345eb37 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Modules
-@using Oqtane.Models
-@using Oqtane.Security
-@using Oqtane.Shared
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 @inject IRoleService RoleService
 @inject IUserService UserService
diff --git a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
index b411d723..c8881f3f 100644
--- a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
+++ b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
@@ -1,5 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 
 <img src="@src" title="@title" disabled=@Disabled @onclick="SetValue" />
 
diff --git a/Oqtane.Client/Modules/Counter/Index.razor b/Oqtane.Client/Modules/Counter/Index.razor
index 9b8dd4b3..b511cfc0 100644
--- a/Oqtane.Client/Modules/Counter/Index.razor
+++ b/Oqtane.Client/Modules/Counter/Index.razor
@@ -1,5 +1,3 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules
 @namespace Oqtane.Modules.Counter
 @inherits ModuleBase
 Current count: @currentCount
diff --git a/Oqtane.Client/Modules/Counter/Module.cs b/Oqtane.Client/Modules/Counter/Module.cs
index 972e366f..5f509ae2 100644
--- a/Oqtane.Client/Modules/Counter/Module.cs
+++ b/Oqtane.Client/Modules/Counter/Module.cs
@@ -1,5 +1,4 @@
-using Oqtane.Modules;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Oqtane.Modules.Counter
 {
diff --git a/Oqtane.Client/Modules/HelloWorld/Index.razor b/Oqtane.Client/Modules/HelloWorld/Index.razor
deleted file mode 100644
index 8c115251..00000000
--- a/Oqtane.Client/Modules/HelloWorld/Index.razor
+++ /dev/null
@@ -1,42 +0,0 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules
-@using Oqtane.Services
-@namespace Oqtane.Modules.HelloWorld
-@inherits ModuleBase
-@inject ISettingService  SettingService
-
-<div class="container">
-    <div>
-        <label for="Url" class="control-label">Image Url: </label>
-    </div>
-    <div>
-        <input type="text" name="Url" class="form-control" placeholder="Image Url" @bind="@url" />
-    </div>
-    <button type="button" class="btn btn-primary" @onclick="Save">Save</button>
-    <div>
-        @if (!string.IsNullOrEmpty(url))
-        {   
-            <br />
-            <img src="@url" />
-        }
-    </div>
-</div>
-
-@code {
-    string url = "";
-
-    protected override async Task OnInitializedAsync()
-    {
-        Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-        url = SettingService.GetSetting(settings, "url", "");
-    }
-
-    private async Task Save()
-    {
-        Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-        SettingService.SetSetting(settings, "url", url);
-        await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-        StateHasChanged();
-    }
-
-}
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index aa3a20ae..f8a993b6 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -1,11 +1,5 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules
-@using Oqtane.Modules.Controls
-@using Oqtane.Modules.HtmlText.Services
+@using Oqtane.Modules.HtmlText.Services
 @using Oqtane.Modules.HtmlText.Models
-@using System.Net.Http;
-@using Oqtane.Shared;
 @namespace Oqtane.Modules.HtmlText
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index 1d64725e..24639b22 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -1,10 +1,5 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules.HtmlText.Services
-@using Oqtane.Modules
+@using Oqtane.Modules.HtmlText.Services
 @using Oqtane.Modules.HtmlText.Models
-@using System.Net.Http;
-@using Oqtane.Modules.Controls
-@using Oqtane.Shared;
 @namespace Oqtane.Modules.HtmlText
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
diff --git a/Oqtane.Client/Modules/HtmlText/Module.cs b/Oqtane.Client/Modules/HtmlText/Module.cs
index 2928d111..38682a92 100644
--- a/Oqtane.Client/Modules/HtmlText/Module.cs
+++ b/Oqtane.Client/Modules/HtmlText/Module.cs
@@ -1,5 +1,4 @@
-using Oqtane.Modules;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Oqtane.Modules.HtmlText
 {
diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor
index e410592e..88e346f8 100644
--- a/Oqtane.Client/Modules/Weather/Index.razor
+++ b/Oqtane.Client/Modules/Weather/Index.razor
@@ -1,5 +1,3 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Modules
 @using Oqtane.Modules.Weather.Services
 @namespace Oqtane.Modules.Weather
 @inherits ModuleBase
diff --git a/Oqtane.Client/Modules/Weather/Module.cs b/Oqtane.Client/Modules/Weather/Module.cs
index 04286cba..65d719d8 100644
--- a/Oqtane.Client/Modules/Weather/Module.cs
+++ b/Oqtane.Client/Modules/Weather/Module.cs
@@ -1,5 +1,4 @@
-using Oqtane.Modules;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Oqtane.Modules.Weather
 {
diff --git a/Oqtane.Client/Shared/ContainerBuilder.razor b/Oqtane.Client/Shared/ContainerBuilder.razor
index 10e30bf7..09106a68 100644
--- a/Oqtane.Client/Shared/ContainerBuilder.razor
+++ b/Oqtane.Client/Shared/ContainerBuilder.razor
@@ -1,7 +1,4 @@
-@using Oqtane.Models
-@using Oqtane.Shared
-@using Oqtane.Modules
-@namespace Oqtane.Shared
+@namespace Oqtane.Shared
 
 <CascadingValue Value="@ModuleState">
     @DynamicComponent
diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor
index 3b278a54..479211f7 100644
--- a/Oqtane.Client/Shared/Installer.razor
+++ b/Oqtane.Client/Shared/Installer.razor
@@ -1,8 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Shared
-@namespace Oqtane.Shared
+@namespace Oqtane.Shared
 @inject NavigationManager NavigationManager
 @inject IInstallationService InstallationService
 @inject ISiteService SiteService
diff --git a/Oqtane.Client/Shared/Interop.cs b/Oqtane.Client/Shared/Interop.cs
index 8987e650..16a0096f 100644
--- a/Oqtane.Client/Shared/Interop.cs
+++ b/Oqtane.Client/Shared/Interop.cs
@@ -1,5 +1,4 @@
 using Microsoft.JSInterop;
-using System;
 using System.Threading.Tasks;
 
 namespace Oqtane.Shared
diff --git a/Oqtane.Client/Shared/ModuleInstance.razor b/Oqtane.Client/Shared/ModuleInstance.razor
index 2b67de38..3e31897a 100644
--- a/Oqtane.Client/Shared/ModuleInstance.razor
+++ b/Oqtane.Client/Shared/ModuleInstance.razor
@@ -1,7 +1,4 @@
-@using Oqtane.Models
-@using Oqtane.Shared
-@using Oqtane.Modules
-@namespace Oqtane.Shared
+@namespace Oqtane.Shared
 
 @DynamicComponent
 
diff --git a/Oqtane.Client/Shared/Pane.razor b/Oqtane.Client/Shared/Pane.razor
index cb66c01e..f55e9881 100644
--- a/Oqtane.Client/Shared/Pane.razor
+++ b/Oqtane.Client/Shared/Pane.razor
@@ -1,11 +1,4 @@
-@using System
-@using Oqtane.Services
-@using Oqtane.Modules
-@using Oqtane.Models
-@using Oqtane.Shared
-@using Oqtane.Security
-@using System.Linq
-@namespace Oqtane.Shared
+@namespace Oqtane.Shared
 @inject IUserService UserService
 @inject IModuleService ModuleService
 @inject IModuleDefinitionService ModuleDefinitionService
diff --git a/Oqtane.Client/Shared/PaneLayout.razor b/Oqtane.Client/Shared/PaneLayout.razor
index 71366a87..9841a568 100644
--- a/Oqtane.Client/Shared/PaneLayout.razor
+++ b/Oqtane.Client/Shared/PaneLayout.razor
@@ -1,6 +1,4 @@
-@using System
-@using Oqtane.Shared
-@namespace Oqtane.Shared
+@namespace Oqtane.Shared
 
 @DynamicComponent
 
diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor
index 3f4c06ce..ab32578e 100644
--- a/Oqtane.Client/Shared/SiteRouter.razor
+++ b/Oqtane.Client/Shared/SiteRouter.razor
@@ -1,14 +1,4 @@
-@using System
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Modules
-@using System.Linq
-@using System.Collections.Generic
-@using Oqtane.Shared
-@using Oqtane.Security
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Routing
-@namespace Oqtane.Shared
+@namespace Oqtane.Shared
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject SiteState SiteState
 @inject NavigationManager NavigationManager
diff --git a/Oqtane.Client/Shared/ThemeBuilder.razor b/Oqtane.Client/Shared/ThemeBuilder.razor
index c9fa26a0..c4734e89 100644
--- a/Oqtane.Client/Shared/ThemeBuilder.razor
+++ b/Oqtane.Client/Shared/ThemeBuilder.razor
@@ -1,7 +1,4 @@
-@using Oqtane.Shared
-@using Oqtane.Modules
-@using Microsoft.JSInterop
-@namespace Oqtane.Shared
+@namespace Oqtane.Shared
 @inject IJSRuntime jsRuntime
 
 @DynamicComponent
diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor
index c7380739..721dcb44 100644
--- a/Oqtane.Client/Themes/AdminContainer.razor
+++ b/Oqtane.Client/Themes/AdminContainer.razor
@@ -1,6 +1,4 @@
-@using Oqtane.Shared
-@using Oqtane.Themes.Controls
-@namespace Oqtane.Themes
+@namespace Oqtane.Themes
 @inherits ContainerBase
 <div id="modal" class="modal" style="display: block">
     <div class="modal-content">
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index e19ebbfc..a48e7ab4 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -1,11 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Themes
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor
index b8b1d788..5fff0e68 100644
--- a/Oqtane.Client/Themes/Controls/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Login.razor
@@ -1,11 +1,4 @@
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Themes
-@using Oqtane.Services
-@using Oqtane.Providers
-@using Oqtane.Shared
-@using Microsoft.JSInterop
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
diff --git a/Oqtane.Client/Themes/Controls/Logo.razor b/Oqtane.Client/Themes/Controls/Logo.razor
index 549660b8..616569fb 100644
--- a/Oqtane.Client/Themes/Controls/Logo.razor
+++ b/Oqtane.Client/Themes/Controls/Logo.razor
@@ -1,6 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Themes
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
 
 @((MarkupString)logo)
diff --git a/Oqtane.Client/Themes/Controls/Menu.razor b/Oqtane.Client/Themes/Controls/Menu.razor
index 00cf792f..fe380160 100644
--- a/Oqtane.Client/Themes/Controls/Menu.razor
+++ b/Oqtane.Client/Themes/Controls/Menu.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Themes
-@using Oqtane.Services
-@using Oqtane.Models;
-@using Oqtane.Security
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
 @inject IUserService UserService
 
diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor
index eb8b698e..1d1236d9 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActions.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor
@@ -1,10 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Themes
-@using Oqtane.Services
-@using Oqtane.Models
-@using Oqtane.Shared
-@using Oqtane.Security
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ContainerBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
diff --git a/Oqtane.Client/Themes/Controls/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
index fed0f0b1..8e394d21 100644
--- a/Oqtane.Client/Themes/Controls/ModuleTitle.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
@@ -1,6 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Themes
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ContainerBase
 
 @title
diff --git a/Oqtane.Client/Themes/Controls/Profile.razor b/Oqtane.Client/Themes/Controls/UserProfile.razor
similarity index 81%
rename from Oqtane.Client/Themes/Controls/Profile.razor
rename to Oqtane.Client/Themes/Controls/UserProfile.razor
index 012a77c4..f43f3747 100644
--- a/Oqtane.Client/Themes/Controls/Profile.razor
+++ b/Oqtane.Client/Themes/Controls/UserProfile.razor
@@ -1,7 +1,4 @@
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Oqtane.Themes
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
 @inject NavigationManager NavigationManager
 
diff --git a/Oqtane.Client/Themes/DefaultContainer.razor b/Oqtane.Client/Themes/DefaultContainer.razor
index 29b2e8c3..027c97aa 100644
--- a/Oqtane.Client/Themes/DefaultContainer.razor
+++ b/Oqtane.Client/Themes/DefaultContainer.razor
@@ -1,6 +1,4 @@
-@using Oqtane.Themes.Controls
-@using Oqtane.Shared
-@namespace Oqtane.Themes
+@namespace Oqtane.Themes
 @inherits ContainerBase
 <div class="container">
     <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme1/Container1.razor b/Oqtane.Client/Themes/Theme1/Container1.razor
index cfd1b006..7929314d 100644
--- a/Oqtane.Client/Themes/Theme1/Container1.razor
+++ b/Oqtane.Client/Themes/Theme1/Container1.razor
@@ -1,7 +1,4 @@
-@using Oqtane.Themes
-@using Oqtane.Themes.Controls
-@using Oqtane.Shared
-@namespace Oqtane.Themes.Theme1
+@namespace Oqtane.Themes.Theme1
 @inherits ContainerBase
 <div class="container">
     <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme1/Theme1.razor b/Oqtane.Client/Themes/Theme1/Theme1.razor
index 7b27e713..9021eef8 100644
--- a/Oqtane.Client/Themes/Theme1/Theme1.razor
+++ b/Oqtane.Client/Themes/Theme1/Theme1.razor
@@ -1,7 +1,4 @@
-@using Oqtane.Themes
-@using Oqtane.Themes.Controls
-@using Oqtane.Shared
-@namespace Oqtane.Themes.Theme1
+@namespace Oqtane.Themes.Theme1
 @inherits ThemeBase
 
 <div class="sidebar">
@@ -11,7 +8,7 @@
 
 <div class="main">
     <div class="top-row px-4">
-        <h1>@PageState.Page.Name - Theme #1</h1> <div class="ml-md-auto"><Profile /> <Login /> <ControlPanel /></div>
+        <h1>@PageState.Page.Name - Theme #1</h1> <div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div>
     </div>
     <div class="container">
         <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme2/Container2.razor b/Oqtane.Client/Themes/Theme2/Container2.razor
index da1280f8..45163ad6 100644
--- a/Oqtane.Client/Themes/Theme2/Container2.razor
+++ b/Oqtane.Client/Themes/Theme2/Container2.razor
@@ -1,7 +1,4 @@
-@using Oqtane.Themes
-@using Oqtane.Themes.Controls
-@using Oqtane.Shared
-@namespace Oqtane.Themes.Theme2
+@namespace Oqtane.Themes.Theme2
 @inherits ContainerBase
 <div class="container">
     <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme2/Theme2.razor b/Oqtane.Client/Themes/Theme2/Theme2.razor
index b450b927..32c8b8f7 100644
--- a/Oqtane.Client/Themes/Theme2/Theme2.razor
+++ b/Oqtane.Client/Themes/Theme2/Theme2.razor
@@ -1,7 +1,4 @@
-@using Oqtane.Themes
-@using Oqtane.Themes.Controls
-@using Oqtane.Shared
-@namespace Oqtane.Themes.Theme2
+@namespace Oqtane.Themes.Theme2
 @inherits ThemeBase
 
 <div class="sidebar">
@@ -11,7 +8,7 @@
 
 <div class="main">
     <div class="top-row px-4">
-        <h1>@PageState.Page.Name - Theme #2</h1> <div class="ml-md-auto"><Profile /> <Login /> <ControlPanel /></div>
+        <h1>@PageState.Page.Name - Theme #2</h1> <div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div>
     </div>
     <div class="container">
         <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor b/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
index bf00b8c2..937b7238 100644
--- a/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
+++ b/Oqtane.Client/Themes/Theme3/HorizontalLayout.razor
@@ -1,6 +1,4 @@
-@using Oqtane.Themes
-@using Oqtane.Shared
-@namespace Oqtane.Themes.Theme3
+@namespace Oqtane.Themes.Theme3
 @inherits ThemeBase
 
 <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Theme3/Theme3.razor b/Oqtane.Client/Themes/Theme3/Theme3.razor
index f10abf4e..e9d5a4bf 100644
--- a/Oqtane.Client/Themes/Theme3/Theme3.razor
+++ b/Oqtane.Client/Themes/Theme3/Theme3.razor
@@ -1,7 +1,4 @@
-@using Oqtane.Themes
-@using Oqtane.Themes.Controls
-@using Oqtane.Shared
-@namespace Oqtane.Themes.Theme3
+@namespace Oqtane.Themes.Theme3
 @inherits ThemeBase
 
 <div class="sidebar">
@@ -11,7 +8,7 @@
 
 <div class="main">
     <div class="top-row px-4">
-        <h1>@PageState.Page.Name - Theme #3</h1> <div class="ml-md-auto"><Profile /> <Login /> <ControlPanel /></div>
+        <h1>@PageState.Page.Name - Theme #3</h1> <div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div>
     </div>
     <div class="container">
         <PaneLayout />
diff --git a/Oqtane.Client/Themes/Theme3/VerticalLayout.razor b/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
index a17afc3f..46a81562 100644
--- a/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
+++ b/Oqtane.Client/Themes/Theme3/VerticalLayout.razor
@@ -1,6 +1,4 @@
-@using Oqtane.Themes
-@using Oqtane.Shared
-@namespace Oqtane.Themes.Theme3
+@namespace Oqtane.Themes.Theme3
 @inherits ThemeBase
 
 <div class="row px-4">
diff --git a/Oqtane.Client/_Imports.razor b/Oqtane.Client/_Imports.razor
new file mode 100644
index 00000000..cba766ad
--- /dev/null
+++ b/Oqtane.Client/_Imports.razor
@@ -0,0 +1,19 @@
+@using System
+@using System.Linq
+@using System.Collections.Generic
+@using System.Net.Http
+
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.JSInterop
+
+@using Oqtane.Models
+@using Oqtane.Modules
+@using Oqtane.Modules.Controls
+@using Oqtane.Providers
+@using Oqtane.Security
+@using Oqtane.Services
+@using Oqtane.Shared
+@using Oqtane.Themes
+@using Oqtane.Themes.Controls
\ No newline at end of file
diff --git a/Oqtane.Client/wwwroot/css/site.css b/Oqtane.Client/wwwroot/css/site.css
index 193ec6f0..ac8d08a8 100644
--- a/Oqtane.Client/wwwroot/css/site.css
+++ b/Oqtane.Client/wwwroot/css/site.css
@@ -146,13 +146,12 @@ app {
 
 /* Control Panel */
 .overlay {
-    /* Height & width depends on how you want to reveal the overlay (see JS below) */
     height: 100%;
     width: 0;
     position: fixed; /* Stay in place */
     z-index: 1; /* Sit on top */
-    left: 0;
-    top: 0;
+    right: 0; /* Position at right side of screen */
+    top: 0; /* Position at top of screen */
     background-color: rgb(0,0,0); /* Black fallback color */
     background-color: rgba(0,0,0, 0.9); /* Black w/opacity */
     overflow-x: hidden; /* Disable horizontal scroll */
diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs
index 0b12b6d7..8fb37ffb 100644
--- a/Oqtane.Server/Repository/Context/DBContextBase.cs
+++ b/Oqtane.Server/Repository/Context/DBContextBase.cs
@@ -46,7 +46,7 @@ namespace Oqtane.Repository
             {
                 username = accessor.HttpContext.User.Identity.Name;
             }
-            DateTime date = DateTime.Now;
+            DateTime date = DateTime.UtcNow;
 
             var created = ChangeTracker.Entries()
                 .Where(x => x.State == EntityState.Added);
diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index 49d46798..260e0403 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -43,6 +43,10 @@ namespace Oqtane.Repository
                     db.ModuleDefinition.Add(moduledef);
                     db.SaveChanges();
                 }
+                else
+                {
+                    moduledefs.Remove(moduledef); // remove module definition from list 
+                }
                 moduledefinition.ModuleDefinitionId = moduledef.ModuleDefinitionId;
                 moduledefinition.SiteId = SiteId;
                 moduledefinition.Permissions = Permissions.EncodePermissions(moduledefinition.ModuleDefinitionId, permissions);
@@ -52,6 +56,12 @@ namespace Oqtane.Repository
                 moduledefinition.ModifiedOn = moduledef.ModifiedOn;
             }
 
+            // any remaining module definitions are orphans
+            foreach (ModuleDefinition moduledefinition in moduledefs)
+            {
+                db.ModuleDefinition.Remove(moduledefinition); // delete
+            }
+
             return ModuleDefinitions;
         }
 
diff --git a/Oqtane.Server/wwwroot/css/site.css b/Oqtane.Server/wwwroot/css/site.css
index 193ec6f0..a628c570 100644
--- a/Oqtane.Server/wwwroot/css/site.css
+++ b/Oqtane.Server/wwwroot/css/site.css
@@ -151,7 +151,7 @@ app {
     width: 0;
     position: fixed; /* Stay in place */
     z-index: 1; /* Sit on top */
-    left: 0;
+    right: 0;
     top: 0;
     background-color: rgb(0,0,0); /* Black fallback color */
     background-color: rgba(0,0,0, 0.9); /* Black w/opacity */